http://git-wip-us.apache.org/repos/asf/hive/blob/0dd4621f/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java b/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java index adb52f0..a52b3ef 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java @@ -151,12 +151,11 @@ public class TestVectorizedORCReader { OrcFile.readerOptions(conf)); RecordReaderImpl vrr = (RecordReaderImpl) vreader.rows(); RecordReaderImpl rr = (RecordReaderImpl) reader.rows(); - VectorizedRowBatch batch = null; + VectorizedRowBatch batch = reader.getSchema().createRowBatch(); OrcStruct row = null; // Check Vectorized ORC reader against ORC row reader - while (vrr.hasNext()) { - batch = vrr.nextBatch(batch); + while (vrr.nextBatch(batch)) { for (int i = 0; i < batch.size; i++) { row = (OrcStruct) rr.next(row); for (int j = 0; j < batch.cols.length; j++) { @@ -239,6 +238,6 @@ public class TestVectorizedORCReader { Assert.assertEquals(false, batch.cols[8].noNulls); Assert.assertEquals(false, batch.cols[9].noNulls); } - Assert.assertEquals(false, rr.hasNext()); + Assert.assertEquals(false, rr.nextBatch(batch)); } }
http://git-wip-us.apache.org/repos/asf/hive/blob/0dd4621f/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/BytesColumnVector.java ---------------------------------------------------------------------- diff --git a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/BytesColumnVector.java b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/BytesColumnVector.java index 99744cd..f915a7e 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/BytesColumnVector.java +++ b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/BytesColumnVector.java @@ -338,6 +338,17 @@ public class BytesColumnVector extends ColumnVector { initBuffer(0); } + public String toString(int row) { + if (isRepeating) { + row = 0; + } + if (noNulls || !isNull[row]) { + return new String(vector[row], start[row], length[row]); + } else { + return null; + } + } + @Override public void stringifyValue(StringBuilder buffer, int row) { if (isRepeating) { http://git-wip-us.apache.org/repos/asf/hive/blob/0dd4621f/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java ---------------------------------------------------------------------- diff --git a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java index c0dd5ed..d971339 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java +++ b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java @@ -392,4 +392,4 @@ public class TimestampColumnVector extends ColumnVector { buffer.append("null"); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hive/blob/0dd4621f/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/UnionColumnVector.java ---------------------------------------------------------------------- diff --git a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/UnionColumnVector.java b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/UnionColumnVector.java index 298d588..0c61243 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/UnionColumnVector.java +++ b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/UnionColumnVector.java @@ -18,8 +18,6 @@ package org.apache.hadoop.hive.ql.exec.vector; -import java.util.Arrays; - /** * The representation of a vectorized column of struct objects. *
