diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 31aeba9..dbb5173 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -103,7 +103,6 @@ * 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 @@ 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", "", diff --git metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java index 87d029c..8765d53 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java @@ -210,14 +210,6 @@ public HiveMetaStoreClient(HiveConf conf, HiveMetaHookLoader hookLoader) } 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 boolean updatePartitionColumnStatistics(ColumnStatistics statsObj) InvalidInputException{ return client.update_partition_column_statistics(statsObj); } - + /** {@inheritDoc} */ public boolean setPartitionColumnStatistics(SetPartitionsStatsRequest request) throws NoSuchObjectException, InvalidObjectException, MetaException, TException,