Index: common/src/java/org/apache/hadoop/hive/conf/HiveConf.java =================================================================== --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (revision 1143012) +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (working copy) @@ -86,6 +86,19 @@ HiveConf.ConfVars.METASTORE_IDENTIFIER_FACTORY, HiveConf.ConfVars.METASTORE_PLUGIN_REGISTRY_BUNDLE_CHECK, HiveConf.ConfVars.METASTORE_AUTHORIZATION_STORAGE_AUTH_CHECKS, + HiveConf.ConfVars.METASTOREMULTITHREADED, + 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.NEWTABLEDEFAULTPARA, + HiveConf.ConfVars.METASTORE_LOCAL, + HiveConf.ConfVars.METASTORE_CONNECTION_DRIVER_NAME, + HiveConf.ConfVars.METASTORE_PERSISTENCE_MANAGER_FACTORYCLASS, + HiveConf.ConfVars.METASTORE_DETACH_ALL_ON_COMMIT, + HiveConf.ConfVars.METASTORE_NON_TRANSACTIONAL_READ, + HiveConf.ConfVars.METASTORE_CONNECTION_USERNAME, + HiveConf.ConfVars.METASTORE_RAW_STORE_IMPL, }; /** @@ -222,7 +235,16 @@ 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_CONNECTION_DRIVER_NAME("javax.jdo.option.ConnectionDriverName","org.apache.derby.jdbc.EmbeddedDriver"), + METASTORE_PERSISTENCE_MANAGER_FACTORYCLASS("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_USERNAME("javax.jdo.option.ConnectionUserName","APP"), + METASTORE_RAW_STORE_IMPL("hive.metastore.rawstore.impl","org.apache.hadoop.hive.metastore.ObjectStore"), + + // CLI CLIIGNOREERRORS("hive.cli.errors.ignore", false), @@ -348,6 +370,10 @@ HIVEHASHTABLEFOLLOWBYGBYMAXMEMORYUSAGE("hive.mapjoin.followby.gby.localtask.max.memory.usage", (float) 0.55), HIVEHASHTABLEMAXMEMORYUSAGE("hive.mapjoin.localtask.max.memory.usage", (float) 0.90), HIVEHASHTABLESCALE("hive.mapjoin.check.memory.rows", (long)100000), + HIVE_MAPJOIN_HASHTABLE_INITIALCAPACITY("hive.mapjoin.hashtable.initialCapacity",100000L), + HIVE_MAPJOIN_HASHTABLE_LOAD_FACTOR("hive.mapjoin.hashtable.loadfactor",(float)0.75), + HIVE_MAPJOIN_SMALL_TABLE_FILESIZE("hive.mapjoin.smalltable.filesize",25000000L), + HIVE_OPTIMIZE_PRUNER("hive.optimize.pruner",true), HIVEDEBUGLOCALTASK("hive.debug.localtask",false), @@ -403,6 +429,7 @@ 3000), // # milliseconds to wait before the next retry HIVE_STATS_COLLECT_RAWDATASIZE("hive.stats.collect.rawdatasize", true), // should the raw data size be collected when analayzing tables + HIVE_STATS_JDBC_ATOMIC("hive.stats.jdbc.atomic",false), // Concurrency @@ -411,6 +438,7 @@ HIVE_LOCK_NUMRETRIES("hive.lock.numretries", 100), HIVE_LOCK_SLEEP_BETWEEN_RETRIES("hive.lock.sleep.between.retries", 60), HIVE_LOCK_MAPRED_ONLY("hive.lock.mapred.only.operation", false), + HIVE_CONCURRENCY_MANAGER("hive.concurrency.manager","org.apache.hadoop.hive.ql.lockmgr.ZooKeeperLockMgr"), HIVE_ZOOKEEPER_QUORUM("hive.zookeeper.quorum", ""), HIVE_ZOOKEEPER_CLIENT_PORT("hive.zookeeper.client.port", ""), @@ -456,6 +484,8 @@ 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), + FS_HAR_IMPL("fs.har.impl","org.apache.hadoop.hive.shims.HiveHarFileSystem"), + HIVE_IO_EXCEPTION_HANDLERS("hive.io.exception.handlers",""), ; public final String varname;