HPCC4J-569 Correct EOS character handling #671
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@rpastrana please review |
rpastrana
reviewed
Jan 26, 2024
| @@ -475,10 +475,13 @@ else if (fd.getDataLen() == 8) | |||
| case STRING: | |||
| { | |||
| String value = fieldValue != null ? (String) fieldValue : ""; | |||
| int eosIdx = value.indexOf('\0'); | |||
| if (eosIdx > -1) | |||
| if (fd.getFieldType() == FieldType.VAR_STRING) | |||
There was a problem hiding this comment.
minor: why not introduce nullByte (from L:614) earlier or as static final and use that throughout instead of the literal '\0'
| || data[data.length - 1] != nullByte | ||
| || data[data.length - 2] != nullByte; | ||
| if (needsNullAdded) { | ||
| this.buffer.put(nullByte); |
| boolean needsNullAdded = data.length < 2 | ||
| || data[data.length - 1] != nullByte | ||
| || data[data.length - 2] != nullByte; | ||
| if (needsNullAdded) { |
| @@ -88,6 +88,93 @@ public void readWithForcedTimeoutTest() throws Exception | |||
| assertEquals("Not all records loaded",expectedCounts[0], records.size()); | |||
| } | |||
|
|
|||
| @Test | |||
| public void allCharsNullTest() throws Exception | |||
There was a problem hiding this comment.
minor but name implies this is testing a value w/ all nulls, I think nullCharTests might be a little more accurate?
rpastrana
approved these changes
Jan 29, 2024
- Modified BinaryRecordWriter to only truncate strings at EOS in var strings - Added unit test that verifies read / write all of Unicode chars and mid EOS Signed-off-by: James McMullan [email protected]
|
@rpastrana squashed, merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: James McMullan [email protected]
Type of change:
Checklist:
Testing: