Repository: hive Updated Branches: refs/heads/master 40e0c3807 -> d559b3475
http://git-wip-us.apache.org/repos/asf/hive/blob/d559b347/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 a52b3ef..adb52f0 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,11 +151,12 @@ public class TestVectorizedORCReader { OrcFile.readerOptions(conf)); RecordReaderImpl vrr = (RecordReaderImpl) vreader.rows(); RecordReaderImpl rr = (RecordReaderImpl) reader.rows(); - VectorizedRowBatch batch = reader.getSchema().createRowBatch(); + VectorizedRowBatch batch = null; OrcStruct row = null; // Check Vectorized ORC reader against ORC row reader - while (vrr.nextBatch(batch)) { + while (vrr.hasNext()) { + batch = 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++) { @@ -238,6 +239,6 @@ public class TestVectorizedORCReader { Assert.assertEquals(false, batch.cols[8].noNulls); Assert.assertEquals(false, batch.cols[9].noNulls); } - Assert.assertEquals(false, rr.nextBatch(batch)); + Assert.assertEquals(false, rr.hasNext()); } } http://git-wip-us.apache.org/repos/asf/hive/blob/d559b347/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 f915a7e..99744cd 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,17 +338,6 @@ 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/d559b347/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 d971339..c0dd5ed 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/d559b347/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 0c61243..298d588 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,6 +18,8 @@ package org.apache.hadoop.hive.ql.exec.vector; +import java.util.Arrays; + /** * The representation of a vectorized column of struct objects. *
