svn commit: r1655901 - in /hive/branches/branch-1.1: ./ metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java

[brock]

Author: brock
Date: Fri Jan 30 01:48:30 2015
New Revision: 1655901

URL: http://svn.apache.org/r1655901
Log:
HIVE-9514 : schematool is broken in hive 1.0.0

Modified:
    hive/branches/branch-1.1/   (props changed)
    
hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java

Propchange: hive/branches/branch-1.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 30 01:48:30 2015
@@ -3,4 +3,4 @@
 /hive/branches/spark:1608589-1654414
 /hive/branches/tez:1494760-1622766
 /hive/branches/vectorization:1466908-1527856
-/hive/trunk:1655202,1655210,1655213,1655436,1655460
+/hive/trunk:1655202,1655210,1655213,1655436,1655460,1655894

Modified: 
hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
URL: 
http://svn.apache.org/viewvc/hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java?rev=1655901&r1=1655900&r2=1655901&view=diff
==============================================================================
--- 
hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
 (original)
+++ 
hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
 Fri Jan 30 01:48:30 2015
@@ -43,10 +43,12 @@ public class MetaStoreSchemaInfo {
   private final HiveConf hiveConf;
   private final String hiveHome;
 
-  // Minor version upgrades often don't change schema. So they are equivalent 
to a version
+  // Some version upgrades often don't change schema. So they are equivalent to
+  // a version
   // that has a corresponding schema. eg "0.13.1" is equivalent to "0.13.0"
   private static final Map<String, String> EQUIVALENT_VERSIONS =
-      ImmutableMap.of("0.13.1", "0.13.0");
+      ImmutableMap.of("0.13.1", "0.13.0",
+          "1.0.0", "0.14.0");
 
   public MetaStoreSchemaInfo(String hiveHome, HiveConf hiveConf, String 
dbType) throws HiveMetaException {
     this.hiveHome = hiveHome;