You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jd...@apache.org on 2017/08/03 00:20:31 UTC

hive git commit: HIVE-17217: SMB Join : Assert if paths are different in TezGroupedSplit in KeyValueInputMerger (Deepak Jaiswal, reviewed by gopalv)

Repository: hive
Updated Branches:
  refs/heads/master 2c2a19a0a -> e5cad8968


HIVE-17217: SMB Join : Assert if paths are different in TezGroupedSplit in KeyValueInputMerger (Deepak Jaiswal, reviewed by gopalv)


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

Branch: refs/heads/master
Commit: e5cad896853969701933e450a147b565d9472c6a
Parents: 2c2a19a0
Author: Jason Dere <jd...@hortonworks.com>
Authored: Wed Aug 2 17:19:33 2017 -0700
Committer: Jason Dere <jd...@hortonworks.com>
Committed: Wed Aug 2 17:19:33 2017 -0700

----------------------------------------------------------------------
 .../hadoop/hive/ql/exec/tez/tools/KeyValueInputMerger.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/e5cad896/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/tools/KeyValueInputMerger.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/tools/KeyValueInputMerger.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/tools/KeyValueInputMerger.java
index f5591d1..22aa848 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/tools/KeyValueInputMerger.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/tools/KeyValueInputMerger.java
@@ -91,10 +91,11 @@ public class KeyValueInputMerger extends KeyValueReader {
       List<InputSplit> splits = split.getGroupedSplits();
       // There maybe more than 1 splits in the group, however, they all have 1 unique path.
       // Assert that.
-      Path path = ((HiveInputFormat.HiveInputSplit) splits.get(0)).getPath();
-      Path pathFromMap = kvReaderPathMap.putIfAbsent(input, path);
-      if (pathFromMap != null) {
-        assert pathFromMap.equals(path);
+      Path path0 = ((HiveInputFormat.HiveInputSplit) splits.get(0)).getPath();
+      kvReaderPathMap.put(input, path0);
+      for (int i = 1; i < splits.size(); i++) {
+        Path path = ((HiveInputFormat.HiveInputSplit) splits.get(i)).getPath();
+        assert path0.equals(path);
       }
       addToQueue(input);
     }