Skip to content

ORC-2177: Fix array conversion with empty first batch #2638

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

Open
cxzl25 wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −5
Open

ORC-2177: Fix array conversion with empty first batch #2638

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
12 changes: 7 additions & 5 deletions java/core/src/java/org/apache/orc/impl/ConvertTreeReaderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,13 @@ public void convertVector(ColumnVector fromColVector,
resultColVector.reset();
if (fromColVector.isRepeating) {
resultColVector.isRepeating = true;
if (fromColVector.noNulls || !fromColVector.isNull[0]) {
setConvertVectorElement(0);
} else {
resultColVector.noNulls = false;
resultColVector.isNull[0] = true;
if (batchSize > 0) {
if (fromColVector.noNulls || !fromColVector.isNull[0]) {
setConvertVectorElement(0);
} else {
resultColVector.noNulls = false;
resultColVector.isNull[0] = true;
}
}
} else if (fromColVector.noNulls) {
for (int i = 0; i < batchSize; i++) {
Expand Down
34 changes: 34 additions & 0 deletions java/core/src/test/org/apache/orc/impl/TestConvertTreeReaderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,4 +746,38 @@ private void testDecimalConvertToDecimalInNullStripe() throws Exception {
readDecimalInNullStripe("decimal(18,2)", DecimalColumnVector.class,
new String[]{"null", "1024", "1"});
}

@Test
public void testIntArrayToStringArrayFirstBatchAllEmpty() throws Exception {
TypeDescription fileSchema = TypeDescription.fromString("struct<col1:array<int>>");
TypeDescription readerSchema = TypeDescription.fromString("struct<col1:array<string>>");

try (Writer w = OrcFile.createWriter(testFilePath,
OrcFile.writerOptions(conf).setSchema(fileSchema))) {
VectorizedRowBatch b = fileSchema.createRowBatch(3);
ListColumnVector lc = (ListColumnVector) b.cols[0];
for (int i = 0; i < 3; i++) {
lc.offsets[i] = 0;
lc.lengths[i] = 0;
}
lc.childCount = 0;
b.size = 3;
w.addRowBatch(b);
}

try (Reader reader = OrcFile.createReader(testFilePath, OrcFile.readerOptions(conf));
RecordReader rows = reader.rows(reader.options().schema(readerSchema))) {
VectorizedRowBatch rb = readerSchema.createRowBatch(3);
assertTrue(rows.nextBatch(rb));
ListColumnVector r = (ListColumnVector) rb.cols[0];
// Cast verifies schema evolution took effect (would be LongColumnVector without evolution)
BytesColumnVector child = (BytesColumnVector) r.child;
assertEquals(0, r.childCount);
for (int i = 0; i < 3; i++) {
assertEquals(0, r.lengths[i], "row " + i + " should be empty array");
}
} finally {
fs.delete(testFilePath, false);
}
}
}
Loading