This is an automated email from the ASF dual-hosted git repository.
jenniferdai pushed a commit to branch orc
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/orc by this push:
new 7f6263b fixing unit test
7f6263b is described below
commit 7f6263be0737951dbafbe77e50c0fecd3398e2bc
Author: Jennifer Dai <[email protected]>
AuthorDate: Wed Mar 20 17:27:36 2019 -0700
fixing unit test
---
.../java/org/apache/pinot/orc/data/readers/ORCRecordReader.java | 6 ++++--
.../java/org/apache/pinot/orc/data/readers/ORCRecordReaderTest.java | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git
a/pinot-orc/src/main/java/org/apache/pinot/orc/data/readers/ORCRecordReader.java
b/pinot-orc/src/main/java/org/apache/pinot/orc/data/readers/ORCRecordReader.java
index 02dac23..3c4c586 100644
---
a/pinot-orc/src/main/java/org/apache/pinot/orc/data/readers/ORCRecordReader.java
+++
b/pinot-orc/src/main/java/org/apache/pinot/orc/data/readers/ORCRecordReader.java
@@ -135,9 +135,11 @@ public class ORCRecordReader implements RecordReader {
continue;
}
int currColRowIndex = currColumn.getId();
- ColumnVector vector = rowBatch.cols[currColRowIndex];
+ // Struct is top level, so the id of the struct is 0. However, the
children start from 1+, etc, so we need to
+ // subtract one since the row batch we get has only children column
vectors
+ ColumnVector vector = rowBatch.cols[currColRowIndex - 1];
// Previous value set to null, not used except to save allocation
memory in OrcMapredRecordReader
- WritableComparable writableComparable =
OrcMapredRecordReader.nextValue(vector, currColRowIndex, currColumn, null);
+ WritableComparable writableComparable =
OrcMapredRecordReader.nextValue(vector, 0, currColumn, null);
genericRow.putField(currColumnName, getBaseObject(writableComparable));
}
} else {
diff --git
a/pinot-orc/src/test/java/org/apache/pinot/orc/data/readers/ORCRecordReaderTest.java
b/pinot-orc/src/test/java/org/apache/pinot/orc/data/readers/ORCRecordReaderTest.java
index 6bea742..c96e55d 100644
---
a/pinot-orc/src/test/java/org/apache/pinot/orc/data/readers/ORCRecordReaderTest.java
+++
b/pinot-orc/src/test/java/org/apache/pinot/orc/data/readers/ORCRecordReaderTest.java
@@ -54,6 +54,7 @@ public class ORCRecordReaderTest {
FileUtils.deleteQuietly(TEMP_DIR);
TypeDescription schema =
TypeDescription.fromString("struct<x:int,y:string>");
+
Writer writer = OrcFile.createWriter(new Path(ORC_FILE.getAbsolutePath()),
OrcFile.writerOptions(new Configuration())
.setSchema(schema));
@@ -103,7 +104,7 @@ public class ORCRecordReaderTest {
for (int i = 0; i < genericRows.size(); i++) {
Assert.assertEquals(genericRows.get(i).getValue("x"), i);
- Assert.assertEquals(genericRows.get(i).getValue("y"), ("Last-" + (i *
3)).getBytes(StandardCharsets.UTF_8));
+ Assert.assertEquals(genericRows.get(i).getValue("y"), "Last-" + (i * 3));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
