hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ser...@apache.org
Subject [21/22] hive git commit: HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin)
Date Tue, 11 Oct 2016 23:10:16 GMT
HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7d50a151
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7d50a151
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7d50a151

Branch: refs/heads/hive-14535
Commit: 7d50a1515434e1abf50970965649c3cc9a6ebb08
Parents: 0ce24b9 9feed2f
Author: Sergey Shelukhin <sershe@apache.org>
Authored: Tue Oct 11 16:08:03 2016 -0700
Committer: Sergey Shelukhin <sershe@apache.org>
Committed: Tue Oct 11 16:08:03 2016 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hive/conf/HiveConf.java   |    5 +-
 .../hive/common/util/HiveStringUtils.java       |   23 +-
 data/scripts/q_test_cleanup_compare.sql         |    1 +
 data/scripts/q_test_cleanup_contrib.sql         |    2 +
 data/scripts/q_test_cleanup_for_encryption.sql  |    1 -
 data/scripts/q_test_cleanup_src.sql             |    1 +
 data/scripts/q_test_cleanup_tez.sql             |    4 +
 data/scripts/q_test_init_compare.sql            |   26 +
 data/scripts/q_test_init_contrib.sql            |   29 +
 data/scripts/q_test_init_for_encryption.sql     |    5 -
 data/scripts/q_test_init_src.sql                |    5 +
 data/scripts/q_test_init_src_with_stats.sql     |    9 +
 data/scripts/q_test_init_tez.sql                |   78 +
 .../apache/hadoop/hive/ql/TestMTQueries.java    |    3 +-
 .../hadoop/hive/cli/control/CliConfigs.java     |   36 +-
 .../org/apache/hadoop/hive/ql/QTestUtil.java    |    6 +-
 .../hive/metastore/IExtrapolatePartStatus.java  |    1 +
 .../hive/metastore/StatObjectConverter.java     |   29 +
 .../java/org/apache/hadoop/hive/ql/Context.java |    7 +-
 .../org/apache/hadoop/hive/ql/exec/DDLTask.java |   41 +-
 .../hadoop/hive/ql/exec/FunctionRegistry.java   |   18 +-
 .../hadoop/hive/ql/exec/mr/MapRedTask.java      |   17 +-
 .../expressions/VectorUDFDayOfWeekDate.java     |   39 +
 .../expressions/VectorUDFDayOfWeekString.java   |   61 +
 .../VectorUDFDayOfWeekTimestamp.java            |   39 +
 .../formatting/MetaDataFormatUtils.java         |  156 +-
 .../formatting/TextMetaDataFormatter.java       |    5 +-
 .../hive/ql/optimizer/GenMRTableScan1.java      |    4 +-
 .../hive/ql/optimizer/physical/Vectorizer.java  |    2 +
 .../hadoop/hive/ql/parse/FromClauseParser.g     |    2 +-
 .../org/apache/hadoop/hive/ql/parse/HiveLexer.g |    1 +
 .../apache/hadoop/hive/ql/parse/HiveParser.g    |  104 +-
 .../hadoop/hive/ql/parse/IdentifiersParser.g    |    5 +-
 .../hadoop/hive/ql/processors/SetProcessor.java |   33 +-
 .../hadoop/hive/ql/session/SessionState.java    |   11 +-
 .../apache/hadoop/hive/ql/udf/UDFDayOfWeek.java |  105 +
 .../hive/ql/processors/TestSetProcessor.java    |  114 +-
 .../ptf_negative_AmbiguousWindowDefn.q          |    6 +-
 .../clientnegative/ptf_negative_NoWindowDefn.q  |    4 +-
 .../clientnegative/windowing_after_orderby.q    |    7 +
 .../test/queries/clientpositive/acid_mapjoin.q  |    3 +-
 .../clientpositive/alter_merge_stats_orc.q      |    4 +-
 .../clientpositive/archive_excludeHadoop20.q    |    5 +-
 .../clientpositive/auto_sortmerge_join_8.q      |    4 +-
 ql/src/test/queries/clientpositive/ctas.q       |    2 +-
 .../test/queries/clientpositive/ctas_hadoop20.q |   63 -
 .../queries/clientpositive/escape_comments.q    |   20 +
 .../queries/clientpositive/explainanalyze_2.q   |  162 -
 ql/src/test/queries/clientpositive/extract.q    |    3 +
 .../extrapolate_part_stats_date.q               |   14 +
 .../test/queries/clientpositive/nonmr_fetch.q   |    4 +-
 .../test/queries/clientpositive/orc_analyze.q   |    4 +-
 ql/src/test/queries/clientpositive/sample10.q   |    4 +-
 .../clientpositive/sample_islocalmode_hook.q    |    4 +-
 .../sample_islocalmode_hook_use_metadata.q      |    6 +-
 .../test/queries/clientpositive/union_paren.q   |   54 +
 .../clientpositive/vectorized_date_funcs.q      |    8 +-
 .../queries/clientpositive/vectorized_parquet.q |    4 +-
 .../alter_view_as_select_with_partition.q.out   |   10 +-
 .../create_or_replace_view6.q.out               |    2 +-
 .../results/clientnegative/unionClusterBy.q.out |    2 +-
 .../clientnegative/unionDistributeBy.q.out      |    2 +-
 .../results/clientnegative/unionLimit.q.out     |    2 +-
 .../results/clientnegative/unionOrderBy.q.out   |    2 +-
 .../results/clientnegative/unionSortBy.q.out    |    2 +-
 .../windowing_after_orderby.q.out               |    9 +
 .../results/clientpositive/acid_mapjoin.q.out   |   30 +-
 .../alter_table_invalidate_column_stats.q.out   |   24 +-
 .../clientpositive/alter_view_as_select.q.out   |   14 +-
 .../clientpositive/cbo_rp_lineage2.q.out        |    2 +-
 .../columnstats_part_coltype.q.out              |   16 +-
 .../results/clientpositive/complex_alias.q.out  |    4 +-
 .../clientpositive/constant_prop_1.q.out        |   12 +-
 .../results/clientpositive/create_like.q.out    |   46 +-
 .../results/clientpositive/create_view.q.out    |   72 +-
 .../create_view_partitioned.q.out               |   20 +-
 .../clientpositive/create_view_translate.q.out  |    8 +-
 .../create_with_constraints.q.out               |   36 +-
 ql/src/test/results/clientpositive/ctas.q.out   |  118 +-
 .../results/clientpositive/ctas_hadoop20.q.out  |  945 -----
 .../describe_comment_indent.q.out               |   15 +-
 .../clientpositive/escape_comments.q.out        |  213 +
 .../test/results/clientpositive/extract.q.out   |   11 +
 .../extrapolate_part_stats_date.q.out           |  302 ++
 .../results/clientpositive/input_part7.q.out    |    4 +-
 .../test/results/clientpositive/llap/ctas.q.out |   81 +-
 .../clientpositive/llap/explainuser_2.q.out     |  442 +-
 .../llap/vectorized_date_funcs.q.out            |  846 ++--
 .../clientpositive/optimize_nullscan.q.out      |    8 +-
 .../results/clientpositive/show_functions.q.out |    1 +
 .../results/clientpositive/spark/ctas.q.out     |   81 +-
 .../clientpositive/tez/explainanalyze_2.q.out   | 3790 +++---------------
 .../clientpositive/tez/explainuser_3.q.out      |    6 +-
 .../results/clientpositive/union_offcbo.q.out   |  112 +-
 .../results/clientpositive/union_paren.q.out    |  260 ++
 .../test/results/clientpositive/union_ppr.q.out |    4 +-
 .../vector_join_part_col_char.q.out             |    6 +-
 .../clientpositive/vectorized_date_funcs.q.out  |  846 ++--
 .../service/cli/thrift/ThriftHttpServlet.java   |    2 +-
 .../auth/TestLdapAtnProviderWithMiniDS.java     |  349 +-
 .../src/test/resources/ldap/example.com.ldif    |   96 +
 101 files changed, 3964 insertions(+), 6302 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/7d50a151/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --cc common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index ca47e47,5ea9751..1bd3c30
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@@ -3117,26 -3114,11 +3117,27 @@@ public class HiveConf extends Configura
          "Log tracing id that can be used by upstream clients for tracking respective logs.
" +
          "Truncated to " + LOG_PREFIX_LENGTH + " characters. Defaults to use auto-generated
session id."),
  
 +    HIVE_METASTORE_MM_THREAD_SCAN_INTERVAL("hive.metastore.mm.thread.scan.interval", "900s",
 +        new TimeValidator(TimeUnit.SECONDS),
 +        "MM table housekeeping thread interval in this metastore instance. 0 to disable."),
 +
 +    HIVE_METASTORE_MM_HEARTBEAT_TIMEOUT("hive.metastore.mm.heartbeat.timeout", "1800s",
 +        new TimeValidator(TimeUnit.SECONDS),
 +        "MM write ID times out after this long if a heartbeat is not send. Currently disabled."),
// TODO# heartbeating not implemented
 +
 +    HIVE_METASTORE_MM_ABSOLUTE_TIMEOUT("hive.metastore.mm.absolute.timeout", "7d",
 +        new TimeValidator(TimeUnit.SECONDS),
 +        "MM write ID cannot be outstanding for more than this long."),
 +
 +    HIVE_METASTORE_MM_ABORTED_GRACE_PERIOD("hive.metastore.mm.aborted.grace.period", "1d",
 +        new TimeValidator(TimeUnit.SECONDS),
 +        "MM write ID will not be removed up for that long after it has been aborted;\n"
+
 +        "this is to work around potential races e.g. with FS visibility, when deleting files."),
  
      HIVE_CONF_RESTRICTED_LIST("hive.conf.restricted.list",
-         "hive.security.authenticator.manager,hive.security.authorization.manager,hive.users.in.admin.role,"
+
-         "hive.server2.xsrf.filter.enabled",
+         "hive.security.authenticator.manager,hive.security.authorization.manager," +
+         "hive.security.metastore.authorization.manager,hive.security.metastore.authenticator.manager,"
+
+         "hive.users.in.admin.role,hive.server2.xsrf.filter.enabled,hive.security.authorization.enabled",
          "Comma separated list of configuration options which are immutable at runtime"),
      HIVE_CONF_HIDDEN_LIST("hive.conf.hidden.list",
          METASTOREPWD.varname + "," + HIVE_SERVER2_SSL_KEYSTORE_PASSWORD.varname

http://git-wip-us.apache.org/repos/asf/hive/blob/7d50a151/ql/src/java/org/apache/hadoop/hive/ql/Context.java
----------------------------------------------------------------------


Mime
View raw message