orc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject [8/8] orc git commit: HIVE-13872. Fix cross-product reduce sink serialization.
Date Fri, 01 Jul 2016 17:56:23 GMT
HIVE-13872. Fix cross-product reduce sink serialization.

Signed-off-by: Owen O'Malley <omalley@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/f9bd5944
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/f9bd5944
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/f9bd5944

Branch: refs/heads/branch-1.1
Commit: f9bd59444eb97f32b63895048160370f7a9c02bc
Parents: 41208a7
Author: Owen O'Malley <omalley@apache.org>
Authored: Thu Jun 30 10:41:48 2016 -0700
Committer: Owen O'Malley <omalley@apache.org>
Committed: Fri Jul 1 09:33:14 2016 -0700

----------------------------------------------------------------------
 .../src/java/org/apache/orc/impl/TreeReaderFactory.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/orc/blob/f9bd5944/java/core/src/java/org/apache/orc/impl/TreeReaderFactory.java
----------------------------------------------------------------------
diff --git a/java/core/src/java/org/apache/orc/impl/TreeReaderFactory.java b/java/core/src/java/org/apache/orc/impl/TreeReaderFactory.java
index 3371e1e..bbba932 100644
--- a/java/core/src/java/org/apache/orc/impl/TreeReaderFactory.java
+++ b/java/core/src/java/org/apache/orc/impl/TreeReaderFactory.java
@@ -1734,9 +1734,12 @@ public class TreeReaderFactory {
                           int batchSize) throws IOException {
       for(int i=0; i < fields.length &&
           (vectorColumnCount == -1 || i < vectorColumnCount); ++i) {
-        batch.cols[i].reset();
-        batch.cols[i].ensureSize((int) batchSize, false);
-        fields[i].nextVector(batch.cols[i], null, batchSize);
+        ColumnVector colVector = batch.cols[i];
+        if (colVector != null) {
+          colVector.reset();
+          colVector.ensureSize((int) batchSize, false);
+          fields[i].nextVector(colVector, null, batchSize);
+        }
       }
     }
 


Mime
View raw message