hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pxi...@apache.org
Subject [1/2] hive git commit: HIVE-14054: TestHiveMetaStoreChecker fails on master (Pengcheng Xiong, reviewed by Ashutosh Chauhan, Rajesh Balamohan)
Date Mon, 20 Jun 2016 17:33:16 GMT
Repository: hive
Updated Branches:
  refs/heads/branch-2.1 0ed105050 -> 8ada8eafa


HIVE-14054: TestHiveMetaStoreChecker fails on master (Pengcheng Xiong, reviewed by Ashutosh
Chauhan, Rajesh Balamohan)


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

Branch: refs/heads/branch-2.1
Commit: a38745a41719c82a537976bf154dc3c7d375302f
Parents: 0ed1050
Author: Pengcheng Xiong <pxiong@apache.org>
Authored: Mon Jun 20 10:18:25 2016 -0700
Committer: Pengcheng Xiong <pxiong@apache.org>
Committed: Mon Jun 20 10:32:48 2016 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/a38745a4/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
index 293b0a7..a164b12 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
@@ -376,6 +376,7 @@ public class HiveMetaStoreChecker {
     ConcurrentLinkedQueue<Path> basePaths = new ConcurrentLinkedQueue<>();
     basePaths.add(basePath);
     // we only use the keySet of ConcurrentHashMap
+    // Neither the key nor the value can be null.
     Map<Path, Object> dirSet = new ConcurrentHashMap<>();
     // Here we just reuse the THREAD_COUNT configuration for
     // HIVE_MOVE_FILES_THREAD_COUNT
@@ -410,7 +411,8 @@ public class HiveMetaStoreChecker {
         }
 
         if (!directoryFound) {
-          allDirs.put(path, null);
+          // true is just a boolean object place holder because neither the key nor the value
can be null.
+          allDirs.put(path, true);
         }
         if (!nextLevel.isEmpty()) {
           getAllLeafDirs(pool, nextLevel, allDirs, fs);
@@ -433,7 +435,7 @@ public class HiveMetaStoreChecker {
             }
 
             if (!directoryFound) {
-              allDirs.put(path, null);
+              allDirs.put(path, true);
             }
             return null;
           }


Mime
View raw message