You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/09/08 06:36:06 UTC

[74/74] [abbrv] hive git commit: HIVE-14671 : merge master into hive-14535 (Wei Zheng)

HIVE-14671 : merge master into hive-14535 (Wei Zheng)


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

Branch: refs/heads/hive-14535
Commit: 18d133857b7930242538b49f33b3ca517b2e287d
Parents: 42a3857 8482c5f
Author: Wei Zheng <we...@apache.org>
Authored: Thu Sep 7 23:34:23 2017 -0700
Committer: Wei Zheng <we...@apache.org>
Committed: Thu Sep 7 23:34:23 2017 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hive/conf/HiveConf.java   |   23 +-
 .../apache/hadoop/hive/conf/TestHiveConf.java   |    4 +
 .../hive/conf/TestHiveConfRestrictList.java     |    2 +-
 dev-support/checkstyle_YETUS-484.sh             |  406 --
 dev-support/findbugs_YETUS-471.sh               |  488 --
 dev-support/maven_YETUS-506.sh                  |  687 ---
 dev-support/yetus-wrapper.sh                    |   11 +-
 errata.txt                                      |    1 +
 .../mapjoin/MapJoinMultiKeyBench.java           |   94 +-
 .../mapjoin/MapJoinOneLongKeyBench.java         |   94 +-
 .../mapjoin/MapJoinOneStringKeyBench.java       |   94 +-
 .../hive/ql/parse/TestReplicationScenarios.java |  145 +
 .../apache/hive/jdbc/TestJdbcWithMiniLlap.java  |   27 +-
 .../test/resources/testconfiguration.properties |    2 +
 .../apache/hive/beeline/QFileBeeLineClient.java |    6 +-
 .../org/apache/hive/jdbc/HiveStatement.java     |    2 +-
 .../hive/llap/registry/LlapServiceInstance.java |   59 +
 .../llap/registry/LlapServiceInstanceSet.java   |   34 +
 .../hive/llap/registry/ServiceInstance.java     |   86 -
 .../hive/llap/registry/ServiceInstanceSet.java  |   69 -
 .../ServiceInstanceStateChangeListener.java     |   42 -
 .../hive/llap/registry/ServiceRegistry.java     |    8 +-
 .../registry/impl/InactiveServiceInstance.java  |    4 +-
 .../registry/impl/LlapFixedRegistryImpl.java    |   41 +-
 .../llap/registry/impl/LlapRegistryService.java |   18 +-
 .../impl/LlapZookeeperRegistryImpl.java         |  800 +---
 .../hive/llap/security/LlapTokenClient.java     |   18 +-
 .../hive/llap/tez/LlapProtocolClientProxy.java  |   25 +-
 .../hadoop/hive/registry/ServiceInstance.java   |   47 +
 .../hive/registry/ServiceInstanceSet.java       |   61 +
 .../ServiceInstanceStateChangeListener.java     |   42 +
 .../hive/registry/impl/ServiceInstanceBase.java |   93 +
 .../hive/registry/impl/ZkRegistryBase.java      |  549 +++
 .../hive/registry/impl/ZookeeperUtils.java      |  116 +
 llap-common/pom.xml                             |    5 +
 .../plugin/rpc/LlapPluginProtocolProtos.java    | 1273 ++++++
 .../org/apache/hadoop/hive/llap/LlapUtil.java   |   70 +-
 .../llap/impl/LlapPluginProtocolClientImpl.java |   46 +
 .../hadoop/hive/llap/impl/ProtobufProxy.java    |   76 +
 .../llap/protocol/LlapPluginProtocolPB.java     |   27 +
 .../src/protobuf/LlapPluginProtocol.proto       |   36 +
 .../hadoop/hive/llap/LlapBaseInputFormat.java   |  141 +-
 .../hive/llap/cli/LlapStatusServiceDriver.java  |    6 +-
 .../hive/llap/daemon/impl/AMReporter.java       |   75 +-
 .../daemon/impl/LlapProtocolServerImpl.java     |   67 +-
 .../daemon/services/impl/LlapWebServices.java   |    4 +-
 .../daemon/impl/comparator/TestAMReporter.java  |   87 +
 .../llap/tezplugins/LlapTaskCommunicator.java   |   69 +-
 .../tezplugins/LlapTaskSchedulerService.java    |  734 ++-
 .../endpoint/LlapPluginPolicyProvider.java      |   34 +
 .../endpoint/LlapPluginSecurityInfo.java        |   62 +
 .../endpoint/LlapPluginServerImpl.java          |   80 +
 .../org.apache.hadoop.security.SecurityInfo     |   14 +
 .../TestLlapTaskSchedulerService.java           |  567 ++-
 .../TestDataSourceProviderFactory.java          |    6 +
 pom.xml                                         |    8 +-
 .../org/apache/hadoop/hive/ql/exec/DDLTask.java |   15 +
 .../hadoop/hive/ql/exec/OperatorUtils.java      |   31 +
 .../hadoop/hive/ql/exec/repl/ReplDumpTask.java  |   36 +-
 .../hive/ql/exec/spark/SparkUtilities.java      |    4 +-
 .../apache/hadoop/hive/ql/exec/tez/Utils.java   |    6 +-
 .../hadoop/hive/ql/log/LogDivertAppender.java   |   25 +-
 .../hive/ql/log/LogDivertAppenderForTest.java   |   18 +-
 .../ql/optimizer/calcite/RelOptHiveTable.java   |   93 +-
 .../physical/LlapClusterStateForCompile.java    |    8 +-
 .../SparkDynamicPartitionPruningResolver.java   |  146 +
 .../physical/SparkMapJoinResolver.java          |   35 +-
 .../spark/SparkPartitionPruningSinkDesc.java    |   13 +-
 .../spark/SparkSkewJoinProcFactory.java         |    6 +-
 .../stats/annotation/StatsRulesProcFactory.java |   12 +-
 .../hive/ql/parse/BaseSemanticAnalyzer.java     |   26 +-
 .../hive/ql/parse/DDLSemanticAnalyzer.java      |    7 +-
 .../apache/hadoop/hive/ql/parse/EximUtil.java   |   14 +
 .../hive/ql/parse/ImportSemanticAnalyzer.java   |    4 +
 .../hive/ql/parse/SemiJoinBranchInfo.java       |   18 +
 .../hadoop/hive/ql/parse/TezCompiler.java       |  105 +-
 .../dump/BootStrapReplicationSpecFunction.java  |    1 -
 .../hive/ql/parse/repl/dump/HiveWrapper.java    |    5 +
 .../hadoop/hive/ql/parse/repl/dump/Utils.java   |   67 +
 .../hive/ql/parse/spark/GenSparkUtils.java      |    2 +-
 .../hive/ql/parse/spark/SparkCompiler.java      |   18 +-
 .../hadoop/hive/ql/plan/ColStatistics.java      |   12 +
 .../hadoop/hive/ql/session/OperationLog.java    |    4 +-
 .../apache/hadoop/hive/ql/stats/StatsUtils.java |  208 +-
 .../clientpositive/dynamic_semijoin_reduction.q |   10 +
 .../clientpositive/join_reordering_no_stats.q   |   63 +
 ...ynamic_partition_pruning_recursive_mapjoin.q |  147 +
 ...spark_vectorized_dynamic_partition_pruning.q |   43 +-
 .../clientpositive/annotate_stats_filter.q.out  |   12 +-
 .../clientpositive/annotate_stats_groupby.q.out |    4 +-
 .../clientpositive/annotate_stats_part.q.out    |   42 +-
 .../clientpositive/annotate_stats_select.q.out  |    4 +-
 .../clientpositive/annotate_stats_table.q.out   |   12 +-
 .../auto_join_reordering_values.q.out           |    8 +-
 .../clientpositive/auto_join_stats.q.out        |   30 +-
 .../clientpositive/auto_join_stats2.q.out       |   91 +-
 .../clientpositive/auto_sortmerge_join_12.q.out |   12 +-
 .../cbo_rp_annotate_stats_groupby.q.out         |    4 +-
 .../columnStatsUpdateForStatsOptimizer_2.q.out  |   24 +-
 .../clientpositive/explain_rearrange.q.out      |   24 +-
 ql/src/test/results/clientpositive/join19.q.out |  190 +-
 ql/src/test/results/clientpositive/join42.q.out |  154 +-
 ql/src/test/results/clientpositive/join43.q.out |  136 +-
 .../join_cond_pushdown_unqual1.q.out            |  284 +-
 .../join_cond_pushdown_unqual2.q.out            |  162 +-
 .../join_cond_pushdown_unqual3.q.out            |  284 +-
 .../join_cond_pushdown_unqual4.q.out            |  162 +-
 .../results/clientpositive/join_hive_626.q.out  |   60 +-
 .../test/results/clientpositive/join_star.q.out |  124 +-
 .../llap/acid_bucket_pruning.q.out              |    8 +-
 .../llap/auto_smb_mapjoin_14.q.out              |  260 +-
 .../llap/auto_sortmerge_join_1.q.out            |   48 +-
 .../llap/auto_sortmerge_join_10.q.out           |   42 +-
 .../llap/auto_sortmerge_join_11.q.out           |   64 +-
 .../llap/auto_sortmerge_join_12.q.out           |   26 +-
 .../llap/auto_sortmerge_join_13.q.out           |  134 +-
 .../llap/auto_sortmerge_join_14.q.out           |   24 +-
 .../llap/auto_sortmerge_join_15.q.out           |   24 +-
 .../llap/auto_sortmerge_join_2.q.out            |   32 +-
 .../llap/auto_sortmerge_join_3.q.out            |   48 +-
 .../llap/auto_sortmerge_join_4.q.out            |   48 +-
 .../llap/auto_sortmerge_join_5.q.out            |   44 +-
 .../llap/auto_sortmerge_join_6.q.out            |  682 +--
 .../llap/auto_sortmerge_join_7.q.out            |   48 +-
 .../llap/auto_sortmerge_join_8.q.out            |   48 +-
 .../llap/auto_sortmerge_join_9.q.out            |  488 +-
 .../clientpositive/llap/bucket_groupby.q.out    |  198 +-
 .../llap/bucket_map_join_tez1.q.out             | 1121 ++---
 .../llap/bucket_map_join_tez2.q.out             |  322 +-
 .../clientpositive/llap/bucketmapjoin1.q.out    |   88 +-
 .../clientpositive/llap/bucketmapjoin2.q.out    |   66 +-
 .../clientpositive/llap/bucketmapjoin3.q.out    |   44 +-
 .../clientpositive/llap/bucketmapjoin4.q.out    |   44 +-
 .../clientpositive/llap/bucketmapjoin7.q.out    |   24 +-
 .../clientpositive/llap/bucketpruning1.q.out    |  208 +-
 .../llap/bucketsortoptimize_insert_2.q.out      |  144 +-
 .../llap/bucketsortoptimize_insert_6.q.out      |  168 +-
 .../llap/bucketsortoptimize_insert_7.q.out      |   72 +-
 .../columnStatsUpdateForStatsOptimizer_1.q.out  |   24 +-
 .../llap/column_access_stats.q.out              |  138 +-
 .../llap/column_table_stats.q.out               |   24 +-
 .../llap/column_table_stats_orc.q.out           |   20 +-
 .../clientpositive/llap/constprog_dpp.q.out     |   20 +-
 .../llap/constprog_semijoin.q.out               |  150 +-
 .../llap/correlationoptimizer4.q.out            |  324 +-
 .../results/clientpositive/llap/count.q.out     |  144 +-
 .../llap/cross_product_check_1.q.out            |  150 +-
 .../llap/cross_product_check_2.q.out            |  132 +-
 .../results/clientpositive/llap/cte_3.q.out     |    8 +-
 .../results/clientpositive/llap/cte_5.q.out     |   10 +-
 .../results/clientpositive/llap/cte_mat_3.q.out |   18 +-
 .../results/clientpositive/llap/cte_mat_4.q.out |   36 +-
 .../results/clientpositive/llap/cte_mat_5.q.out |   16 +-
 .../llap/disable_merge_for_bucketing.q.out      |   12 +-
 .../llap/dynamic_partition_pruning.q.out        |  655 +--
 .../llap/dynamic_partition_pruning_2.q.out      |  201 +-
 .../llap/dynamic_semijoin_reduction.q.out       |  459 +-
 .../llap/dynamic_semijoin_reduction_2.q.out     |  269 +-
 .../llap/dynamic_semijoin_reduction_3.q.out     |  186 +-
 .../llap/dynamic_semijoin_reduction_sw.q.out    |   34 +-
 .../llap/dynpart_sort_opt_vectorization.q.out   |  208 +-
 .../llap/dynpart_sort_optimization.q.out        |  288 +-
 .../llap/dynpart_sort_optimization2.q.out       |   68 +-
 .../llap/dynpart_sort_optimization_acid.q.out   |  144 +-
 .../clientpositive/llap/empty_join.q.out        |   22 +-
 .../clientpositive/llap/except_distinct.q.out   |   48 +-
 .../clientpositive/llap/explainuser_1.q.out     |  384 +-
 .../clientpositive/llap/explainuser_2.q.out     |  116 +-
 .../llap/filter_join_breaktask.q.out            |   36 +-
 .../llap/hybridgrace_hashjoin_1.q.out           |  197 +-
 .../results/clientpositive/llap/insert1.q.out   |   46 +-
 .../clientpositive/llap/insert_into1.q.out      |    6 +-
 .../clientpositive/llap/intersect_all.q.out     |   44 +-
 .../llap/intersect_distinct.q.out               |   40 +-
 .../clientpositive/llap/intersect_merge.q.out   |  540 +--
 .../clientpositive/llap/jdbc_handler.q.out      |   14 +-
 .../results/clientpositive/llap/join46.q.out    |  326 +-
 .../llap/join_emit_interval.q.out               |   32 +-
 .../llap/join_is_not_distinct_from.q.out        |  102 +-
 .../clientpositive/llap/join_nullsafe.q.out     |  102 +-
 .../llap/join_reordering_no_stats.q.out         |  708 +++
 .../clientpositive/llap/lateral_view.q.out      |   32 +-
 .../clientpositive/llap/llap_nullscan.q.out     |   64 +-
 .../clientpositive/llap/llap_partitioned.q.out  |    8 +-
 .../results/clientpositive/llap/llap_smb.q.out  |   18 +-
 .../clientpositive/llap/llap_stats.q.out        |    4 +-
 .../results/clientpositive/llap/llap_udf.q.out  |   36 +-
 .../clientpositive/llap/llapdecider.q.out       |   32 +-
 .../clientpositive/llap/lvj_mapjoin.q.out       |   60 +-
 .../results/clientpositive/llap/mapjoin3.q.out  |   16 +-
 .../results/clientpositive/llap/mapjoin46.q.out |  280 +-
 .../clientpositive/llap/mapjoin_decimal.q.out   |   22 +-
 .../llap/mapjoin_emit_interval.q.out            |   28 +-
 .../results/clientpositive/llap/merge1.q.out    |   12 +-
 .../results/clientpositive/llap/merge2.q.out    |   12 +-
 .../results/clientpositive/llap/mergejoin.q.out |  370 +-
 .../llap/metadata_only_queries.q.out            |   68 +-
 .../clientpositive/llap/multiMapJoin1.q.out     |  503 ++-
 .../clientpositive/llap/multiMapJoin2.q.out     |    8 +-
 .../llap/multi_count_distinct_null.q.out        |   42 +-
 .../llap/multi_insert_lateral_view.q.out        |  288 +-
 .../clientpositive/llap/optimize_nullscan.q.out |   20 +-
 .../llap/orc_llap_nonvector.q.out               |   16 +-
 .../clientpositive/llap/orc_merge3.q.out        |    6 +-
 .../clientpositive/llap/orc_merge4.q.out        |    6 +-
 .../clientpositive/llap/orc_merge5.q.out        |   16 +-
 .../clientpositive/llap/orc_merge6.q.out        |   16 +-
 .../clientpositive/llap/orc_merge7.q.out        |   12 +-
 .../llap/orc_merge_incompat1.q.out              |    8 +-
 .../llap/orc_merge_incompat2.q.out              |    6 +-
 .../llap/orc_predicate_pushdown.q.out           |  144 +-
 .../llap/parquet_predicate_pushdown.q.out       |  136 +-
 .../llap/parquet_types_vectorization.q.out      |  112 +-
 .../llap/partition_shared_scan.q.out            |  116 +-
 .../clientpositive/llap/ppd_union_view.q.out    |   66 +-
 .../clientpositive/llap/ptf_matchpath.q.out     |   42 +-
 .../clientpositive/llap/rcfile_createas1.q.out  |    6 +-
 .../clientpositive/llap/rcfile_merge3.q.out     |    6 +-
 .../clientpositive/llap/rcfile_merge4.q.out     |    6 +-
 .../llap/reduce_deduplicate.q.out               |   10 +-
 .../llap/reduce_deduplicate_distinct.q.out      |   84 +-
 .../results/clientpositive/llap/sample10.q.out  |    6 +-
 .../llap/schema_evol_orc_nonvec_part.q.out      |   54 +-
 ...chema_evol_orc_nonvec_part_all_complex.q.out |   18 +-
 ...ema_evol_orc_nonvec_part_all_primitive.q.out |   30 +-
 .../llap/schema_evol_orc_nonvec_table.q.out     |   30 +-
 .../llap/schema_evol_orc_vec_part.q.out         |   54 +-
 .../schema_evol_orc_vec_part_all_complex.q.out  |   18 +-
 ...schema_evol_orc_vec_part_all_primitive.q.out |   30 +-
 .../llap/schema_evol_orc_vec_table.q.out        |   30 +-
 .../llap/schema_evol_text_nonvec_part.q.out     |   54 +-
 ...hema_evol_text_nonvec_part_all_complex.q.out |   18 +-
 ...ma_evol_text_nonvec_part_all_primitive.q.out |   30 +-
 .../llap/schema_evol_text_nonvec_table.q.out    |   30 +-
 .../llap/schema_evol_text_vec_part.q.out        |   54 +-
 .../schema_evol_text_vec_part_all_complex.q.out |   18 +-
 ...chema_evol_text_vec_part_all_primitive.q.out |   30 +-
 .../llap/schema_evol_text_vec_table.q.out       |   30 +-
 .../llap/schema_evol_text_vecrow_part.q.out     |   54 +-
 ...hema_evol_text_vecrow_part_all_complex.q.out |   18 +-
 ...ma_evol_text_vecrow_part_all_primitive.q.out |   30 +-
 .../llap/schema_evol_text_vecrow_table.q.out    |   30 +-
 .../results/clientpositive/llap/semijoin.q.out  |  534 +--
 .../results/clientpositive/llap/skewjoin.q.out  |   76 +-
 .../clientpositive/llap/skewjoinopt15.q.out     |   36 +-
 .../results/clientpositive/llap/smb_cache.q.out |   28 +-
 .../clientpositive/llap/smb_mapjoin_14.q.out    |  244 +-
 .../clientpositive/llap/smb_mapjoin_15.q.out    |  104 +-
 .../clientpositive/llap/smb_mapjoin_17.q.out    |  218 +-
 .../clientpositive/llap/smb_mapjoin_18.q.out    |   24 +-
 .../clientpositive/llap/smb_mapjoin_19.q.out    |    6 +-
 .../clientpositive/llap/smb_mapjoin_4.q.out     |  310 +-
 .../clientpositive/llap/smb_mapjoin_5.q.out     |  310 +-
 .../clientpositive/llap/smb_mapjoin_6.q.out     |  108 +-
 .../results/clientpositive/llap/sqlmerge.q.out  |   76 +-
 .../results/clientpositive/llap/stats11.q.out   |   44 +-
 .../clientpositive/llap/stats_only_null.q.out   |   24 +-
 .../clientpositive/llap/subquery_exists.q.out   |   10 +-
 .../clientpositive/llap/subquery_in.q.out       |   36 +-
 .../clientpositive/llap/subquery_multi.q.out    |  416 +-
 .../clientpositive/llap/subquery_notin.q.out    |  366 +-
 .../clientpositive/llap/subquery_scalar.q.out   |  530 +--
 .../clientpositive/llap/subquery_select.q.out   |   48 +-
 .../results/clientpositive/llap/sysdb.q.out     |   12 +-
 .../llap/table_access_keys_stats.q.out          |    8 +-
 .../clientpositive/llap/temp_table.q.out        |   30 +-
 .../llap/tez_bmj_schema_evolution.q.out         |   22 +-
 .../results/clientpositive/llap/tez_dml.q.out   |    6 +-
 .../results/clientpositive/llap/tez_join.q.out  |   24 +-
 .../clientpositive/llap/tez_join_hash.q.out     |    8 +-
 .../llap/tez_join_result_complex.q.out          |   40 +-
 .../clientpositive/llap/tez_nway_join.q.out     |   90 +-
 .../clientpositive/llap/tez_self_join.q.out     |   36 +-
 .../results/clientpositive/llap/tez_smb_1.q.out |  106 +-
 .../clientpositive/llap/tez_smb_empty.q.out     |   82 +-
 .../clientpositive/llap/tez_smb_main.q.out      |  470 +-
 .../llap/tez_union_group_by.q.out               |   66 +-
 .../clientpositive/llap/unionDistinct_1.q.out   |  994 +++--
 .../clientpositive/llap/union_remove_26.q.out   |    8 +-
 .../llap/vector_adaptor_usage_mode.q.out        |  100 +-
 .../llap/vector_aggregate_9.q.out               |   36 +-
 .../llap/vector_aggregate_without_gby.q.out     |   10 +-
 .../llap/vector_auto_smb_mapjoin_14.q.out       |  260 +-
 .../llap/vector_between_columns.q.out           |   34 +-
 .../clientpositive/llap/vector_between_in.q.out |  166 +-
 .../llap/vector_binary_join_groupby.q.out       |   56 +-
 .../clientpositive/llap/vector_bucket.q.out     |   10 +-
 .../llap/vector_cast_constant.q.out             |   18 +-
 .../clientpositive/llap/vector_char_2.q.out     |   36 +-
 .../clientpositive/llap/vector_char_4.q.out     |    6 +-
 .../llap/vector_char_mapjoin1.q.out             |   78 +-
 .../clientpositive/llap/vector_coalesce_2.q.out |   40 +-
 .../llap/vector_complex_all.q.out               |   86 +-
 .../llap/vector_complex_join.q.out              |    8 +-
 .../clientpositive/llap/vector_count.q.out      |   48 +-
 .../llap/vector_count_distinct.q.out            |   18 +-
 .../clientpositive/llap/vector_data_types.q.out |   24 +-
 .../clientpositive/llap/vector_date_1.q.out     |   68 +-
 .../clientpositive/llap/vector_decimal_1.q.out  |   90 +-
 .../llap/vector_decimal_10_0.q.out              |   10 +-
 .../llap/vector_decimal_aggregate.q.out         |   32 +-
 .../llap/vector_decimal_expressions.q.out       |   14 +-
 .../llap/vector_decimal_mapjoin.q.out           |   18 +-
 .../llap/vector_decimal_math_funcs.q.out        |    8 +-
 .../llap/vector_decimal_precision.q.out         |   12 +-
 .../llap/vector_decimal_round.q.out             |   40 +-
 .../llap/vector_decimal_udf.q.out               |  258 +-
 .../llap/vector_decimal_udf2.q.out              |   16 +-
 .../clientpositive/llap/vector_distinct_2.q.out |   14 +-
 .../clientpositive/llap/vector_groupby4.q.out   |   14 +-
 .../clientpositive/llap/vector_groupby6.q.out   |   14 +-
 .../clientpositive/llap/vector_groupby_3.q.out  |   14 +-
 .../llap/vector_groupby_cube1.q.out             |  126 +-
 .../llap/vector_groupby_grouping_id1.q.out      |   84 +-
 .../llap/vector_groupby_grouping_id2.q.out      |  220 +-
 .../llap/vector_groupby_grouping_id3.q.out      |   32 +-
 .../llap/vector_groupby_grouping_sets1.q.out    |   96 +-
 .../llap/vector_groupby_grouping_sets2.q.out    |   72 +-
 .../llap/vector_groupby_grouping_sets3.q.out    |   46 +-
 .../llap/vector_groupby_grouping_sets4.q.out    |   98 +-
 .../llap/vector_groupby_grouping_sets5.q.out    |   64 +-
 .../llap/vector_groupby_grouping_sets6.q.out    |   24 +-
 .../vector_groupby_grouping_sets_grouping.q.out |  182 +-
 .../vector_groupby_grouping_sets_limit.q.out    |  118 +-
 .../llap/vector_groupby_reduce.q.out            |   84 +-
 .../llap/vector_groupby_rollup1.q.out           |   98 +-
 .../llap/vector_grouping_sets.q.out             |   40 +-
 .../llap/vector_include_no_sel.q.out            |   12 +-
 .../clientpositive/llap/vector_inner_join.q.out |  160 +-
 .../clientpositive/llap/vector_interval_1.q.out |   80 +-
 .../clientpositive/llap/vector_interval_2.q.out |  112 +-
 .../llap/vector_interval_arithmetic.q.out       |   60 +-
 .../llap/vector_interval_mapjoin.q.out          |   20 +-
 .../clientpositive/llap/vector_join30.q.out     |  318 +-
 .../llap/vector_left_outer_join2.q.out          |   96 +-
 .../llap/vector_leftsemi_mapjoin.q.out          | 1904 ++++----
 .../llap/vector_mr_diff_schema_alias.q.out      |   55 +-
 .../llap/vector_multi_insert.q.out              |    6 +-
 .../llap/vector_nullsafe_join.q.out             |  176 +-
 .../llap/vector_number_compare_projection.q.out |   24 +-
 .../clientpositive/llap/vector_orderby_5.q.out  |   16 +-
 .../llap/vector_outer_join0.q.out               |   28 +-
 .../llap/vector_partition_diff_num_cols.q.out   |   60 +-
 .../llap/vector_partitioned_date_time.q.out     |  156 +-
 .../llap/vector_ptf_part_simple.q.out           |  312 +-
 .../clientpositive/llap/vector_reduce1.q.out    |   10 +-
 .../clientpositive/llap/vector_reduce2.q.out    |   10 +-
 .../clientpositive/llap/vector_reduce3.q.out    |   10 +-
 .../llap/vector_reduce_groupby_decimal.q.out    |   18 +-
 .../llap/vector_string_concat.q.out             |   26 +-
 .../clientpositive/llap/vector_struct_in.q.out  |   48 +-
 .../clientpositive/llap/vector_udf1.q.out       |  220 +-
 .../llap/vector_udf_character_length.q.out      |   12 +-
 .../llap/vector_udf_octet_length.q.out          |    6 +-
 .../clientpositive/llap/vector_varchar_4.q.out  |    6 +-
 .../llap/vector_varchar_mapjoin1.q.out          |  154 +-
 .../llap/vector_varchar_simple.q.out            |   24 +-
 .../llap/vector_when_case_null.q.out            |   12 +-
 .../llap/vector_windowing_navfn.q.out           |  132 +-
 .../llap/vectorization_decimal_date.q.out       |   10 +-
 .../llap/vectorization_part_project.q.out       |    8 +-
 .../llap/vectorization_short_regress.q.out      |   72 +-
 .../llap/vectorized_bucketmapjoin1.q.out        |   54 +-
 .../llap/vectorized_context.q.out               |  109 +-
 .../llap/vectorized_date_funcs.q.out            |   42 +-
 .../llap/vectorized_distinct_gby.q.out          |   14 +-
 .../vectorized_dynamic_partition_pruning.q.out  |  649 +--
 .../vectorized_dynamic_semijoin_reduction.q.out |  238 +-
 .../clientpositive/llap/vectorized_join46.q.out |  250 +-
 .../llap/vectorized_parquet.q.out               |   12 +-
 .../llap/vectorized_parquet_types.q.out         |   16 +-
 .../clientpositive/llap/vectorized_ptf.q.out    |  538 +--
 .../llap/vectorized_timestamp.q.out             |   34 +-
 .../llap/vectorized_timestamp_funcs.q.out       |   80 +-
 .../results/clientpositive/merge_join_1.q.out   |   68 +-
 .../test/results/clientpositive/mergejoin.q.out |  132 +-
 .../clientpositive/mergejoins_mixed.q.out       |  237 +-
 ql/src/test/results/clientpositive/mm_all.q.out |   35 +-
 .../results/clientpositive/perf/query14.q.out   |    2 +-
 .../test/results/clientpositive/ppd_join5.q.out |  122 +-
 .../clientpositive/ppd_outer_join5.q.out        |   64 +-
 .../results/clientpositive/smb_mapjoin_47.q.out |  120 +-
 .../spark/auto_join_reordering_values.q.out     |   10 +-
 .../clientpositive/spark/auto_join_stats.q.out  |   34 +-
 .../clientpositive/spark/auto_join_stats2.q.out |   95 +-
 .../spark/auto_smb_mapjoin_14.q.out             |    2 +-
 .../spark/auto_sortmerge_join_12.q.out          |    8 +-
 .../spark/auto_sortmerge_join_6.q.out           |  464 +-
 .../spark/auto_sortmerge_join_9.q.out           |    4 +-
 .../spark/bucket_map_join_tez1.q.out            |  214 +-
 .../spark/bucket_map_join_tez2.q.out            |   28 +-
 .../spark/column_access_stats.q.out             |   38 +-
 .../results/clientpositive/spark/join19.q.out   |  136 +-
 .../spark/join_cond_pushdown_unqual1.q.out      |  274 +-
 .../spark/join_cond_pushdown_unqual2.q.out      |  152 +-
 .../spark/join_cond_pushdown_unqual3.q.out      |  274 +-
 .../spark/join_cond_pushdown_unqual4.q.out      |  152 +-
 .../clientpositive/spark/join_hive_626.q.out    |   64 +-
 .../clientpositive/spark/join_star.q.out        |  137 +-
 .../clientpositive/spark/mergejoins_mixed.q.out |  171 +-
 .../clientpositive/spark/ppd_join5.q.out        |  130 +-
 .../clientpositive/spark/ppd_outer_join5.q.out  |   64 +-
 .../spark/skewjoin_union_remove_1.q.out         |   16 +-
 .../spark/skewjoin_union_remove_2.q.out         |    6 +-
 .../clientpositive/spark/skewjoinopt1.q.out     |   16 +-
 .../clientpositive/spark/skewjoinopt10.q.out    |    8 +-
 .../clientpositive/spark/skewjoinopt11.q.out    |    8 +-
 .../clientpositive/spark/skewjoinopt12.q.out    |    4 +-
 .../clientpositive/spark/skewjoinopt14.q.out    |    8 +-
 .../clientpositive/spark/skewjoinopt15.q.out    |   16 +-
 .../clientpositive/spark/skewjoinopt16.q.out    |    4 +-
 .../clientpositive/spark/skewjoinopt17.q.out    |   12 +-
 .../clientpositive/spark/skewjoinopt19.q.out    |    8 +-
 .../clientpositive/spark/skewjoinopt2.q.out     |   16 +-
 .../clientpositive/spark/skewjoinopt20.q.out    |    8 +-
 .../clientpositive/spark/skewjoinopt3.q.out     |    8 +-
 .../clientpositive/spark/skewjoinopt4.q.out     |   16 +-
 .../clientpositive/spark/skewjoinopt5.q.out     |    4 +-
 .../clientpositive/spark/skewjoinopt6.q.out     |    4 +-
 .../clientpositive/spark/skewjoinopt7.q.out     |    6 +-
 .../clientpositive/spark/skewjoinopt8.q.out     |    6 +-
 .../spark/spark_dynamic_partition_pruning.q.out |  108 +-
 .../spark_dynamic_partition_pruning_3.q.out     |  118 +-
 ...dynamic_partition_pruning_mapjoin_only.q.out |  192 +-
 ...ic_partition_pruning_recursive_mapjoin.q.out | 1097 +++++
 .../spark/spark_explainuser_1.q.out             |  352 +-
 .../spark/spark_use_op_stats.q.out              |   92 +-
 ...k_vectorized_dynamic_partition_pruning.q.out | 4184 ++++++++++--------
 .../clientpositive/spark/stats_only_null.q.out  |   24 +-
 .../spark/table_access_keys_stats.q.out         |    8 +-
 .../clientpositive/stats_only_null.q.out        |   24 +-
 .../clientpositive/stats_partial_size.q.out     |   10 +-
 .../results/clientpositive/stats_ppr_all.q.out  |    6 +-
 .../clientpositive/tez/explainanalyze_2.q.out   |  208 +-
 .../clientpositive/tez/explainanalyze_3.q.out   |   47 +-
 .../clientpositive/tez/explainanalyze_5.q.out   |   14 +-
 .../clientpositive/tez/explainuser_3.q.out      |   43 +-
 .../tez/hybridgrace_hashjoin_1.q.out            |  195 +-
 .../tez/multi_count_distinct.q.out              |   30 +-
 .../results/clientpositive/tez/tez-tag.q.out    |   59 +-
 .../tez/vector_join_part_col_char.q.out         |   16 +-
 .../tez/vector_non_string_partition.q.out       |   28 +-
 .../vector_mr_diff_schema_alias.q.out           |   39 +-
 .../clientpositive/vector_outer_join6.q.out     |    4 +-
 .../clientpositive/vectorized_context.q.out     |   66 +-
 .../apache/hive/service/auth/HttpAuthUtils.java |    4 +-
 .../service/cli/session/HiveSessionImpl.java    |   28 +-
 .../service/cli/thrift/ThriftHttpServlet.java   |    4 +-
 448 files changed, 28238 insertions(+), 22347 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/18d13385/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/18d13385/itests/src/test/resources/testconfiguration.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/18d13385/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/18d13385/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/18d13385/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
----------------------------------------------------------------------
diff --cc ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
index 021507f,230ca47..65c7477
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
@@@ -1724,11 -1703,11 +1723,11 @@@ public class DDLSemanticAnalyzer extend
        TableDesc tblDesc = Utilities.getTableDesc(tblObj);
        Path queryTmpdir = ctx.getExternalTmpPath(newTblPartLoc);
        mergeDesc.setOutputDir(queryTmpdir);
 +      // No need to handle MM tables - unsupported path.
        LoadTableDesc ltd = new LoadTableDesc(queryTmpdir, tblDesc,
-           partSpec == null ? new HashMap<String, String>() : partSpec, null);
 -          partSpec == null ? new HashMap<>() : partSpec);
++          partSpec == null ? new HashMap<>() : partSpec, null);
        ltd.setLbCtx(lbCtx);
 -      Task<MoveWork> moveTsk = TaskFactory.get(new MoveWork(null, null, ltd, null, false),
 -          conf);
 +      Task<MoveWork> moveTsk = TaskFactory.get(new MoveWork(null, null, ltd, null, false), conf);
        mergeTask.addDependentTask(moveTsk);
  
        if (conf.getBoolVar(HiveConf.ConfVars.HIVESTATSAUTOGATHER)) {

http://git-wip-us.apache.org/repos/asf/hive/blob/18d13385/ql/src/java/org/apache/hadoop/hive/ql/parse/EximUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/18d13385/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/18d13385/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/GenSparkUtils.java
----------------------------------------------------------------------