Index: conf/hive-default.xml.template =================================================================== --- conf/hive-default.xml.template (revision 1598944) +++ conf/hive-default.xml.template (working copy) @@ -611,7 +611,7 @@ hive.smbjoin.cache.rows 10000 - How many rows with the same key value should be cached in memory per smb joined table. + How many rows with the same key value should be cached in memory per SMB joined table. @@ -857,7 +857,7 @@ hive.auto.convert.join - false + true Whether Hive enables the optimization about converting common join into mapjoin based on the input file size @@ -1244,8 +1244,11 @@ hive.stats.dbclass - counter - The storage that stores temporary Hive statistics. Currently, jdbc, hbase, counter and custom type are supported. + fs + The storage that stores temporary Hive statistics. Supported values are + fs (filesystem), jdbc(:.*), hbase, counter, and custom. In FS based statistics collection, + each task writes statistics it has collected in a file on the filesystem, which will be + aggregated after the job has finished. @@ -2245,7 +2248,7 @@ hive.server2.authentication.spnego.principal and hive.server2.authentication.spnego.keytab - are specified + are specified. @@ -2253,7 +2256,7 @@ hive.server2.authentication.ldap.url - LDAP connection URL + LDAP connection URL. @@ -2261,11 +2264,19 @@ hive.server2.authentication.ldap.baseDN - LDAP base DN + LDAP base DN (distinguished name). + hive.server2.authentication.ldap.Domain + + + LDAP domain. + + + + hive.server2.enable.doAs true @@ -2278,7 +2289,7 @@ hive.execution.engine mr - Chooses execution engine. Options are: mr (Map reduce, default) or tez (hadoop 2 only) + Chooses execution engine. Options are mr (MapReduce, default) or Tez (Hadoop 2 only). @@ -2286,7 +2297,7 @@ hive.prewarm.enabled false - Enables container prewarm for tez (hadoop 2 only) + Enables container prewarm for Tez (Hadoop 2 only). @@ -2294,7 +2305,7 @@ hive.prewarm.numcontainers 10 - Controls the number of containers to prewarm for tez (hadoop 2 only) + Controls the number of containers to prewarm for Tez (Hadoop 2 only). @@ -2310,13 +2321,24 @@ + hive.server2.session.hook + + + Session-level hook for HiveServer2. + + + + hive.server2.thrift.sasl.qop auth - Sasl QOP value; Set it to one of following values to enable higher levels of + Sasl QOP value; set it to one of the following values to enable higher levels of protection for HiveServer2 communication with clients. "auth" - authentication only (default) "auth-int" - authentication plus integrity protection "auth-conf" - authentication plus integrity and confidentiality protection + Note that hadoop.rpc.protection being set to a higher level than HiveServer2 does not + make sense in most situations. HiveServer2 ignores hadoop.rpc.protection in favor of + hive.server2.thrift.sasl.qop. This is applicable only if HiveServer2 is configured to use Kerberos authentication. @@ -2383,11 +2405,11 @@ hive.metastore.integral.jdo.pushdown false - Allow JDO query pushdown for integral partition columns in metastore. Off by default. This - improves metastore perf for integral columns, especially if there's a large number of partitions. - However, it doesn't work correctly with integral values that are not normalized (e.g. have - leading zeroes, like 0012). If metastore direct SQL is enabled and works, this optimization - is also irrelevant. + Allow JDO query pushdown for integral partition columns in the metastore. Off by default. + This improves metastore performance for integral columns, especially with a large number of + partitions. However, it doesn't work correctly for integral values that are not normalized + (for example, if they have leading zeroes like 0012). If metastore direct SQL is enabled and + works (hive.metastore.try.direct.sql), this optimization is also irrelevant. @@ -2437,8 +2459,8 @@ hive.jar.directory - This is the location hive in tez mode will look for to find a site wide - installed hive instance. If not set, the directory under hive.user.install.directory + This is the location Hive in Tez mode will look for to find a site wide + installed Hive instance. If not set, the directory under hive.user.install.directory corresponding to current user name will be used. @@ -2447,8 +2469,8 @@ hive.user.install.directory hdfs:///user/ - If hive (in tez mode only) cannot find a usable hive jar in "hive.jar.directory", - it will upload the hive jar to <hive.user.install.directory>/<user name> + If Hive (in Tez mode only) cannot find a usable Hive jar in "hive.jar.directory", + it will upload the Hive jar to <hive.user.install.directory>/<user name> and use it to run queries. @@ -2456,13 +2478,13 @@ hive.tez.container.size -1 - By default tez will spawn containers of the size of a mapper. This can be used to overwrite. + By default Tez will spawn containers of the size of a mapper. This can be used to overwrite. hive.tez.java.opts - By default tez will use the java opts from map tasks. This can be used to overwrite. + By default Tez will use the Java options from map tasks. This can be used to overwrite. @@ -2470,7 +2492,7 @@ INFO The log level to use for tasks executing as part of the DAG. - Used only if hive.tez.java.opts is used to configure java opts. + Used only if hive.tez.java.opts is used to configure Java options. @@ -2478,9 +2500,9 @@ hive.server2.tez.default.queues - A list of comma separated values corresponding to yarn queues of the same name. - When hive server 2 is launched in tez mode, this configuration needs to be set - for multiple tez sessions to run in parallel on the cluster. + A list of comma separated values corresponding to YARN queues of the same name. + When HiveServer2 is launched in Tez mode, this configuration needs to be set + for multiple Tez sessions to run in parallel on the cluster. @@ -2488,7 +2510,7 @@ hive.server2.tez.sessions.per.default.queue 1 - A positive integer that determines the number of tez sessions that should be + A positive integer that determines the number of Tez sessions that should be launched on each of the queues specified by "hive.server2.tez.default.queues". Determines the parallelism on each queue. @@ -2498,9 +2520,9 @@ hive.server2.tez.initialize.default.sessions false - This flag is used in hive server 2 to enable a user to use hive server 2 without - turning on tez for hive server 2. The user could potentially want to run queries - over tez without the pool of sessions. + This flag is used in HiveServer2 to enable a user to use HiveServer2 without + turning on Tez for HiveServer2. The user could potentially want to run queries + over Tez without the pool of sessions. @@ -2556,18 +2578,6 @@ - hive.metastore.integral.jdo.pushdown - false - - Whether to enable JDO pushdown for integral types. Off by default. Irrelevant if - hive.metastore.try.direct.sql is enabled. Otherwise, filter pushdown in metastore can improve - performance, but for partition columns storing integers in non-canonical form, (e.g. '012'), - it can produce incorrect results. - - - - - hive.mapjoin.optimized.keys true @@ -2631,8 +2641,9 @@ hive.server2.authentication.pam.services - List of the underlying pam services that should be used when auth type is PAM. - A file with the same name must exist in /etc/pam.d + List of the underlying PAM services that should be used when authentication + type is PAM (hive.server2.authentication). A file with the same name must exist in + /etc/pam.d