You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2009/10/27 20:04:47 UTC
svn commit: r830292 - in /hadoop/hive/trunk: CHANGES.txt
ql/src/java/org/apache/hadoop/hive/ql/metadata/CheckResult.java
ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
Author: namit
Date: Tue Oct 27 19:04:47 2009
New Revision: 830292
URL: http://svn.apache.org/viewvc?rev=830292&view=rev
Log:
HIVE-903. msck: output not deterministic
(Cyrus Katrak via namit)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/CheckResult.java
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=830292&r1=830291&r2=830292&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Tue Oct 27 19:04:47 2009
@@ -217,6 +217,9 @@
HIVE-883. URISyntaxException when partition value contains special chars.
(Zheng Shao via namit)
+ HIVE-903. msck: output not deterministic
+ (Cyrus Katrak via namit)
+
Release 0.4.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/CheckResult.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/CheckResult.java?rev=830292&r1=830291&r2=830292&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/CheckResult.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/CheckResult.java Tue Oct 27 19:04:47 2009
@@ -73,7 +73,7 @@
* A basic description of a partition that is
* missing from either the fs or the ms.
*/
- public static class PartitionResult {
+ public static class PartitionResult implements Comparable<PartitionResult> {
private String partitionName;
private String tableName;
@@ -108,6 +108,11 @@
public String toString() {
return tableName + ":" + partitionName;
}
+
+ public int compareTo(PartitionResult o) {
+ int ret = tableName.compareTo(o.tableName);
+ return ret != 0 ? ret : partitionName.compareTo(o.partitionName);
+ }
}
}
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java?rev=830292&r1=830291&r2=830292&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java Tue Oct 27 19:04:47 2009
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -79,6 +80,10 @@
// check the specified partitions
checkTable(dbName, tableName, partitions, result);
}
+ Collections.sort(result.getPartitionsNotInMs());
+ Collections.sort(result.getPartitionsNotOnFs());
+ Collections.sort(result.getTablesNotInMs());
+ Collections.sort(result.getTablesNotOnFs());
} catch (MetaException e) {
throw new HiveException(e);
} catch (TException e) {