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 2014/09/09 07:13:31 UTC
svn commit: r1623638 - in /hive/trunk:
common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
Author: hashutosh
Date: Tue Sep 9 05:13:30 2014
New Revision: 1623638
URL: http://svn.apache.org/r1623638
Log:
HIVE-1879 : Remove hive.metastore.metadb.dir property from hive-default.xml and HiveConf (Lars Francke via Ashutosh Chauhan)
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1623638&r1=1623637&r2=1623638&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Tue Sep 9 05:13:30 2014
@@ -103,7 +103,6 @@ public class HiveConf extends Configurat
* be recreated so that the change will take effect.
*/
public static final HiveConf.ConfVars[] metaVars = {
- HiveConf.ConfVars.METASTOREDIRECTORY,
HiveConf.ConfVars.METASTOREWAREHOUSE,
HiveConf.ConfVars.METASTOREURIS,
HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES,
@@ -346,9 +345,7 @@ public class HiveConf extends Configurat
MAPREDSETUPCLEANUPNEEDED(ShimLoader.getHadoopShims().getHadoopConfNames().get("MAPREDSETUPCLEANUPNEEDED"), false, "", true),
MAPREDTASKCLEANUPNEEDED(ShimLoader.getHadoopShims().getHadoopConfNames().get("MAPREDTASKCLEANUPNEEDED"), false, "", true),
- // Metastore stuff. Be sure to update HiveConf.metaVars when you add
- // something here!
- METASTOREDIRECTORY("hive.metastore.metadb.dir", "", ""),
+ // Metastore stuff. Be sure to update HiveConf.metaVars when you add something here!
METASTOREWAREHOUSE("hive.metastore.warehouse.dir", "/user/hive/warehouse",
"location of default database for the warehouse"),
METASTOREURIS("hive.metastore.uris", "",
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java?rev=1623638&r1=1623637&r2=1623638&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java Tue Sep 9 05:13:30 2014
@@ -210,14 +210,6 @@ public class HiveMetaStoreClient impleme
} catch (Exception e) {
MetaStoreUtils.logAndThrowMetaException(e);
}
- } else if (conf.getVar(HiveConf.ConfVars.METASTOREDIRECTORY) != null) {
- metastoreUris = new URI[1];
- try {
- metastoreUris[0] = new URI(conf
- .getVar(HiveConf.ConfVars.METASTOREDIRECTORY));
- } catch (URISyntaxException e) {
- MetaStoreUtils.logAndThrowMetaException(e);
- }
} else {
LOG.error("NOT getting uris from conf");
throw new MetaException("MetaStoreURIs not found in conf file");
@@ -1289,7 +1281,7 @@ public class HiveMetaStoreClient impleme
InvalidInputException{
return client.update_partition_column_statistics(statsObj);
}
-
+
/** {@inheritDoc} */
public boolean setPartitionColumnStatistics(SetPartitionsStatsRequest request)
throws NoSuchObjectException, InvalidObjectException, MetaException, TException,