You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2016/07/31 05:25:38 UTC

hive git commit: HIVE-14363: bucketmap inner join query fails due to NullPointerException in some cases (Hari Subramaniyan, reviewed by Matt McCline)

Repository: hive
Updated Branches:
  refs/heads/master 034c9821b -> 4f1cd26ce


HIVE-14363: bucketmap inner join query fails due to NullPointerException in some cases (Hari Subramaniyan, reviewed by Matt McCline)


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

Branch: refs/heads/master
Commit: 4f1cd26ce3eb4d95efb8a0dc2bec7e03b360202c
Parents: 034c982
Author: Hari Subramaniyan <ha...@apache.org>
Authored: Sat Jul 30 22:25:29 2016 -0700
Committer: Hari Subramaniyan <ha...@apache.org>
Committed: Sat Jul 30 22:25:29 2016 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/4f1cd26c/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java
index e8ccbc4..0886c0e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java
@@ -369,9 +369,10 @@ public class MapRecordProcessor extends RecordProcessor {
     // this sets up the map operator contexts correctly
     mapOp.initializeContexts();
     Deserializer deserializer = mapOp.getCurrentDeserializer();
+    // deserializer is null in case of VectorMapOperator
     KeyValueReader reader =
       new KeyValueInputMerger(kvReaderList, deserializer,
-          new ObjectInspector[] { deserializer.getObjectInspector() }, mapOp
+          new ObjectInspector[] { deserializer == null ? null : deserializer.getObjectInspector() }, mapOp
           .getConf()
           .getSortCols());
     return reader;