Index: common/src/java/org/apache/hadoop/hive/conf/HiveConf.java =================================================================== --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (revision 1158213) +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (working copy) @@ -86,6 +86,12 @@ HiveConf.ConfVars.METASTORE_IDENTIFIER_FACTORY, HiveConf.ConfVars.METASTORE_PLUGIN_REGISTRY_BUNDLE_CHECK, HiveConf.ConfVars.METASTORE_AUTHORIZATION_STORAGE_AUTH_CHECKS, + HiveConf.ConfVars.METASTORE_BATCH_RETRIEVE_MAX, + HiveConf.ConfVars.METASTORE_EVENT_LISTENERS, + HiveConf.ConfVars.METASTORE_EVENT_CLEAN_FREQ, + HiveConf.ConfVars.METASTORE_EVENT_EXPIRY_DURATION, + HiveConf.ConfVars.METASTORE_LOCAL, + HiveConf.ConfVars.METASTORE_RAW_STORE_IMPL, }; /** @@ -225,7 +231,15 @@ METASTORE_EVENT_EXPIRY_DURATION("hive.metastore.event.expiry.duration",0L), // Default parameters for creating tables NEWTABLEDEFAULTPARA("hive.table.parameters.default",""), + METASTORE_LOCAL("hive.metastore.local",true), + METASTORE_RAW_STORE_IMPL("hive.metastore.rawstore.impl","org.apache.hadoop.hive.metastore.ObjectStore"), + METASTORE_CONNECTION_DRIVER("javax.jdo.option.ConnectionDriverName","org.apache.derby.jdbc.EmbeddedDriver"), + METASTORE_MANAGER_FACTORY_CLASS("javax.jdo.PersistenceManagerFactoryClass","org.datanucleus.jdo.JDOPersistenceManagerFactory"), + METASTORE_DETACH_ALL_ON_COMMIT("javax.jdo.option.DetachAllOnCommit", true), + METASTORE_NON_TRANSACTIONAL_READ("javax.jdo.option.NonTransactionalRead", true), + METASTORE_CONNECTION_USER_NAME("javax.jdo.option.ConnectionUserName", "APP"), + // CLI CLIIGNOREERRORS("hive.cli.errors.ignore", false), @@ -460,6 +474,7 @@ HIVE_MAPPER_CANNOT_SPAN_MULTIPLE_PARTITIONS("hive.mapper.cannot.span.multiple.partitions", false), HIVE_REWORK_MAPREDWORK("hive.rework.mapredwork", false), HIVE_CONCATENATE_CHECK_INDEX ("hive.exec.concatenate.check.index", true), + HIVE_IO_EXCEPTION_HANDLERS("hive.io.exception.handlers", ""), //prefix used to auto generated column aliases HIVE_AUTOGEN_COLUMNALIAS_PREFIX_LABEL("hive.autogen.columnalias.prefix.label", "_c"), @@ -469,6 +484,7 @@ // The class responsible for logging client side performance metrics // Must be a subclass of org.apache.hadoop.hive.ql.log.PerfLogger HIVE_PERF_LOGGER("hive.exec.perf.logger", "org.apache.hadoop.hive.ql.log.PerfLogger"), + HIVE_FS_HAR_IMPL("fs.har.impl", "org.apache.hadoop.hive.shims.HiveHarFileSystem"), ; public final String varname; Index: conf/hive-default.xml =================================================================== --- conf/hive-default.xml (revision 1158213) +++ conf/hive-default.xml (working copy) @@ -361,13 +361,6 @@ - hive.optimize.pruner - true - Whether to enable the new partition pruner which depends on predicate pushdown. If this is disabled, - the old partition pruner which is based on AST will be enabled. - - - hive.optimize.groupby true Whether to enable the bucketed group by from bucketed partitions/tables. @@ -574,26 +567,7 @@ When the average output file size of a job is less than this number, Hive will start an additional map-reduce job to merge the output files into bigger files. This is only done for map-only jobs if hive.merge.mapfiles is true, and for map-reduce jobs if hive.merge.mapredfiles is true. - - hive.mapjoin.hashtable.initialCapacity - 100000 - In the process of Mapjoin, the key/value will be hold in the hashtable. This value means the initialCapacity of the in-memory hashtable - - - - hive.mapjoin.hashtable.loadfactor - 0.75 - In the process of Mapjoin, the key/value will be hold in the hashtable. This value means the load factor for the in-memory hashtable - - - - hive.mapjoin.smalltable.filesize - 25000000 - The threshold for the input file size of the small tables; if the file size is smaller than this threshold, it will try to convert the common join into map join - - - hive.mapjoin.localtask.max.memory.usage 0.90 This number means how much memory the local task can take to hold the key/value into in-memory hash table; If the local task's memory usage is more than this number, the local task will be abort by themself. It means the data of small table is too large to be hold in the memory. @@ -823,12 +797,6 @@ - hive.stats.jdbc.atomic - false - If this is set to true then the metastore stats will be updated only if all types of stats (# of rows, # of files, # of bytes etc.) are available. Otherwise metastore stats are updated in a best effort fashion with whatever are available. - - - hive.stats.retries.max 0 Maximum number of retries when stats publisher/aggregator got an exception updating intermediate database. Default is no tries on failures. @@ -847,12 +815,6 @@ - hive.concurrency.manager - org.apache.hadoop.hive.ql.lockmgr.ZooKeeperLockMgr - The concurrency manager for hive. - - - hive.lock.numretries 100 The number of times you want to try to get all the locks Index: metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java =================================================================== --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (revision 1158213) +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (working copy) @@ -239,7 +239,7 @@ } private boolean init() throws MetaException { - rawStoreClassName = hiveConf.get("hive.metastore.rawstore.impl"); + rawStoreClassName = hiveConf.getVar(HiveConf.ConfVars.METASTORE_RAW_STORE_IMPL); checkForDefaultDb = hiveConf.getBoolean( "hive.metastore.checkForDefaultDb", true); String alterHandlerName = hiveConf.get("hive.metastore.alter.impl", Index: metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java =================================================================== --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (revision 1158213) +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (working copy) @@ -102,8 +102,7 @@ conf = new HiveConf(HiveMetaStoreClient.class); } this.conf = conf; - - localMetaStore = conf.getBoolean("hive.metastore.local", false); + localMetaStore = conf.getBoolVar(HiveConf.ConfVars.METASTORE_LOCAL); if (localMetaStore) { // instantiate the metastore server handler directly instead of connecting // through the network Index: metastore/src/test/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java =================================================================== --- metastore/src/test/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java (revision 1158213) +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java (working copy) @@ -41,7 +41,7 @@ Thread t = new Thread(new RunMS()); t.setDaemon(true); t.start(); - hiveConf.set("hive.metastore.local", "false"); + hiveConf.setBoolVar(HiveConf.ConfVars.METASTORE_LOCAL, false); hiveConf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://localhost:29111"); hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTRETRIES, 3); Thread.sleep(30000); Index: metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreAuthorization.java =================================================================== --- metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreAuthorization.java (revision 1158213) +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreAuthorization.java (working copy) @@ -39,7 +39,7 @@ public void setup() throws Exception { System.setProperty(HiveConf.ConfVars.METASTORE_AUTHORIZATION_STORAGE_AUTH_CHECKS.varname, "true"); - conf.set("hive.metastore.local", "false"); + conf.setBoolVar(HiveConf.ConfVars.METASTORE_LOCAL, false); conf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://localhost:" + port); conf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTRETRIES, 3); conf.setIntVar(ConfVars.METASTORE_CLIENT_CONNECT_RETRY_DELAY, 60); Index: metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java =================================================================== --- metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java (revision 1158213) +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java (working copy) @@ -78,7 +78,7 @@ t.start(); Thread.sleep(40000); hiveConf = new HiveConf(this.getClass()); - hiveConf.set("hive.metastore.local", "false"); + hiveConf.setBoolVar(HiveConf.ConfVars.METASTORE_LOCAL, false); hiveConf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://localhost:" + msPort); hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTRETRIES, 3); hiveConf.set(HiveConf.ConfVars.PREEXECHOOKS.varname, ""); Index: metastore/src/test/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java =================================================================== --- metastore/src/test/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java (revision 1158213) +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java (working copy) @@ -64,7 +64,7 @@ Thread.sleep(5000); // hive.metastore.local should be defined in HiveConf - hiveConf.set("hive.metastore.local", "false"); + hiveConf.setBoolVar(HiveConf.ConfVars.METASTORE_LOCAL, false); hiveConf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://localhost:" + METASTORE_PORT); hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTRETRIES, 3); hiveConf.setIntVar(ConfVars.METASTORE_CLIENT_CONNECT_RETRY_DELAY, 60); Index: shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java =================================================================== --- shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java (revision 1158213) +++ shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerChain.java (working copy) @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.hadoop.mapred.InputFormat; +import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.RecordReader; import org.apache.hadoop.util.ReflectionUtils; @@ -35,13 +35,11 @@ */ public class HiveIOExceptionHandlerChain { - public static String HIVE_IO_EXCEPTION_HANDLE_CHAIN = "hive.io.exception.handlers"; - @SuppressWarnings("unchecked") public static HiveIOExceptionHandlerChain getHiveIOExceptionHandlerChain( JobConf conf) { HiveIOExceptionHandlerChain chain = new HiveIOExceptionHandlerChain(); - String exceptionHandlerStr = conf.get(HIVE_IO_EXCEPTION_HANDLE_CHAIN); + String exceptionHandlerStr = conf.get(HiveConf.ConfVars.HIVE_IO_EXCEPTION_HANDLERS.toString()); List handlerChain = new ArrayList(); if (exceptionHandlerStr != null && !exceptionHandlerStr.trim().equals("")) { String[] handlerArr = exceptionHandlerStr.split(","); Index: shims/src/test/org/apache/hadoop/hive/thrift/TestHadoop20SAuthBridge.java =================================================================== --- shims/src/test/org/apache/hadoop/hive/thrift/TestHadoop20SAuthBridge.java (revision 1158213) +++ shims/src/test/org/apache/hadoop/hive/thrift/TestHadoop20SAuthBridge.java (working copy) @@ -117,7 +117,7 @@ System.setProperty(HiveConf.ConfVars.METASTOREWAREHOUSE.varname, new Path( System.getProperty("test.build.data", "/tmp")).toString()); conf = new HiveConf(TestHadoop20SAuthBridge.class); - conf.setBoolean("hive.metastore.local", false); + conf.setBoolVar(HiveConf.ConfVars.METASTORE_LOCAL,false); MetaStoreUtils.startMetaStore(port, new MyHadoopThriftAuthBridge20S()); }