Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport] Fix String Frame Readers to read String Arrays correctly #17103

Merged
merged 1 commit into from
Sep 19, 2024
Merged

[Backport] Fix String Frame Readers to read String Arrays correctly #17103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions processing/src/main/java/org/apache/druid/frame/field/StringFieldReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,9 +480,8 @@ public int numRows()
public boolean isNull(int rowNum)
{
final long fieldPosition = coach.computeFieldPosition(rowNum);
byte[] nullBytes = new byte[3];
dataRegion.getByteArray(fieldPosition, nullBytes, 0, 3);
return Arrays.equals(nullBytes, EXPECTED_BYTES_FOR_NULL);
return dataRegion.getByte(fieldPosition) == StringFieldWriter.NULL_ROW
&& dataRegion.getByte(fieldPosition + 1) == StringFieldWriter.ROW_TERMINATOR;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions processing/src/main/java/org/apache/druid/frame/read/columnar/FrameColumnReaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ public static FrameColumnReader create(
return new DoubleFrameColumnReader(columnNumber);

case STRING:
return new StringFrameColumnReader(columnNumber, false);
return new StringFrameColumnReader(columnNumber);

case COMPLEX:
return new ComplexFrameColumnReader(columnNumber);

case ARRAY:
switch (columnType.getElementType().getType()) {
case STRING:
return new StringFrameColumnReader(columnNumber, true);
return new StringArrayFrameColumnReader(columnNumber);
case LONG:
return new LongArrayFrameColumnReader(columnNumber);
case FLOAT:
Expand Down
Loading
Loading