Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/hive
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6b3f5bf5 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6b3f5bf5 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6b3f5bf5 Branch: refs/heads/hive-14535 Commit: 6b3f5bf5c16850387142801c7c4b839430cdd008 Parents: fa9097e aa7edfe Author: Dmitry Tolpeko <[email protected]> Authored: Tue Sep 26 02:11:52 2017 +0000 Committer: Dmitry Tolpeko <[email protected]> Committed: Tue Sep 26 02:11:52 2017 +0000 ---------------------------------------------------------------------- hplsql/src/test/queries/db/summary.sql | 30 +- .../src/test/queries/local/create_function5.sql | 22 +- .../test/queries/local/create_procedure4.sql | 20 +- .../test/resources/testconfiguration.properties | 1 + .../HiveJoinPushTransitivePredicatesRule.java | 21 +- .../apache/hadoop/hive/ql/stats/StatsUtils.java | 50 ++- .../queries/clientpositive/optimize_join_ptp.q | 16 + .../clientpositive/annotate_stats_groupby.q.out | 22 +- .../annotate_stats_groupby2.q.out | 12 +- .../annotate_stats_join_pkfk.q.out | 12 +- .../clientpositive/annotate_stats_select.q.out | 8 +- .../clientpositive/annotate_stats_table.q.out | 4 +- .../clientpositive/auto_sortmerge_join_5.q.out | 42 +-- .../clientpositive/beeline/smb_mapjoin_1.q.out | 10 +- .../clientpositive/beeline/smb_mapjoin_2.q.out | 20 +- .../clientpositive/beeline/smb_mapjoin_3.q.out | 10 +- .../clientpositive/bucketcontext_5.q.out | 14 +- .../clientpositive/bucketcontext_6.q.out | 6 +- .../results/clientpositive/bucketmapjoin5.q.out | 8 +- .../clientpositive/bucketmapjoin_negative.q.out | 4 +- .../bucketmapjoin_negative2.q.out | 4 +- .../bucketmapjoin_negative3.q.out | 126 +++---- .../cbo_rp_annotate_stats_groupby.q.out | 22 +- .../results/clientpositive/cbo_rp_join1.q.out | 64 ++-- .../cbo_rp_udaf_percentile_approx_23.q.out | 8 +- .../clientpositive/columnstats_tbllvl.q.out | 24 +- .../clientpositive/compute_stats_date.q.out | 4 +- .../clientpositive/correlationoptimizer5.q.out | 350 +++++++++---------- .../clientpositive/decimal_precision.q.out | 4 +- .../results/clientpositive/decimal_udf.q.out | 178 +++++----- .../results/clientpositive/decimal_udf2.q.out | 16 +- .../display_colstats_tbllvl.q.out | 8 +- .../clientpositive/distinct_windowing.q.out | 60 ++-- .../distinct_windowing_no_cbo.q.out | 104 +++--- .../clientpositive/drop_table_with_index.q.out | 12 +- .../encryption_join_unencrypted_tbl.q.out | 8 +- .../clientpositive/filter_cond_pushdown2.q.out | 42 +-- .../clientpositive/filter_join_breaktask.q.out | 60 ++-- .../clientpositive/gen_udf_example_add10.q.out | 12 +- .../test/results/clientpositive/groupby10.q.out | 80 ++--- .../clientpositive/groupby_grouping_id3.q.out | 32 +- .../groupby_grouping_sets_grouping.q.out | 222 ++++++------ .../results/clientpositive/index_serde.q.out | 8 +- .../infer_bucket_sort_map_operators.q.out | 8 +- .../test/results/clientpositive/input22.q.out | 12 +- .../results/clientpositive/input3_limit.q.out | 16 +- ql/src/test/results/clientpositive/input4.q.out | 2 +- .../test/results/clientpositive/join_star.q.out | 170 ++++----- .../llap/acid_bucket_pruning.q.out | 8 +- .../llap/auto_sortmerge_join_5.q.out | 46 +-- .../clientpositive/llap/bucketmapjoin1.q.out | 16 +- .../clientpositive/llap/bucketmapjoin4.q.out | 44 +-- .../llap/column_table_stats.q.out | 4 +- .../llap/correlationoptimizer4.q.out | 324 ++++++++--------- .../results/clientpositive/llap/count.q.out | 130 +++---- .../llap/dynpart_sort_optimization.q.out | 288 +++++++-------- .../llap/dynpart_sort_optimization2.q.out | 52 +-- .../clientpositive/llap/explainuser_1.q.out | 106 +++--- .../clientpositive/llap/explainuser_2.q.out | 58 +-- .../llap/filter_join_breaktask.q.out | 76 ++-- .../llap/join_is_not_distinct_from.q.out | 102 +++--- .../clientpositive/llap/join_nullsafe.q.out | 102 +++--- .../clientpositive/llap/mapjoin_hint.q.out | 77 ++-- .../clientpositive/llap/optimize_join_ptp.q.out | 130 +++++++ .../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 +- .../clientpositive/llap/ptf_matchpath.q.out | 42 +-- .../clientpositive/llap/smb_mapjoin_4.q.out | 224 ++++++------ .../clientpositive/llap/smb_mapjoin_5.q.out | 224 ++++++------ .../results/clientpositive/llap/stats11.q.out | 16 +- .../clientpositive/llap/subquery_multi.q.out | 342 +++++++++--------- .../clientpositive/llap/subquery_scalar.q.out | 120 +++---- .../llap/tez_join_result_complex.q.out | 212 +++++------ .../clientpositive/llap/tez_nway_join.q.out | 90 ++--- .../llap/vector_windowing_navfn.q.out | 84 ++--- .../results/clientpositive/nullscript.q.out | 8 +- .../results/clientpositive/orc_merge5.q.out | 16 +- .../results/clientpositive/orc_merge6.q.out | 16 +- .../clientpositive/orc_merge_incompat1.q.out | 8 +- .../clientpositive/orc_merge_incompat2.q.out | 6 +- .../clientpositive/parallel_orderby.q.out | 10 +- .../clientpositive/ppd_repeated_alias.q.out | 52 +-- .../results/clientpositive/ptf_matchpath.q.out | 42 +-- .../results/clientpositive/smb_mapjoin_1.q.out | 10 +- .../results/clientpositive/smb_mapjoin_2.q.out | 20 +- .../results/clientpositive/smb_mapjoin_25.q.out | 96 ++--- .../results/clientpositive/smb_mapjoin_3.q.out | 10 +- .../spark/auto_sortmerge_join_5.q.out | 30 +- .../clientpositive/spark/bucketmapjoin1.q.out | 16 +- .../clientpositive/spark/bucketmapjoin4.q.out | 44 +-- .../clientpositive/spark/bucketmapjoin5.q.out | 8 +- .../spark/bucketmapjoin_negative.q.out | 4 +- .../spark/bucketmapjoin_negative2.q.out | 4 +- .../spark/bucketmapjoin_negative3.q.out | 126 +++---- .../results/clientpositive/spark/count.q.out | 130 +++---- .../spark/filter_join_breaktask.q.out | 48 +-- .../spark/gen_udf_example_add10.q.out | 12 +- .../clientpositive/spark/groupby10.q.out | 72 ++-- .../clientpositive/spark/join_nullsafe.q.out | 116 +++--- .../clientpositive/spark/join_star.q.out | 140 ++++---- .../clientpositive/spark/orc_merge5.q.out | 16 +- .../clientpositive/spark/orc_merge6.q.out | 16 +- .../clientpositive/spark/orc_merge7.q.out | 12 +- .../spark/orc_merge_incompat1.q.out | 8 +- .../spark/orc_merge_incompat2.q.out | 6 +- .../clientpositive/spark/parallel_orderby.q.out | 10 +- .../clientpositive/spark/ptf_matchpath.q.out | 42 +-- .../clientpositive/spark/smb_mapjoin_1.q.out | 58 +-- .../clientpositive/spark/smb_mapjoin_2.q.out | 68 ++-- .../clientpositive/spark/smb_mapjoin_25.q.out | 80 ++--- .../clientpositive/spark/smb_mapjoin_3.q.out | 58 +-- .../clientpositive/spark/smb_mapjoin_4.q.out | 224 ++++++------ .../clientpositive/spark/smb_mapjoin_5.q.out | 224 ++++++------ .../spark/spark_explainuser_1.q.out | 106 +++--- .../clientpositive/subquery_in_having.q.out | 312 ++++++++--------- .../clientpositive/tez/explainanalyze_2.q.out | 58 +-- .../clientpositive/tez/explainanalyze_3.q.out | 6 +- .../clientpositive/tez/explainanalyze_5.q.out | 8 +- .../clientpositive/tez/explainuser_3.q.out | 6 +- .../udaf_percentile_approx_23.q.out | 8 +- .../clientpositive/udf_trunc_number.q.out | 20 +- .../vector_windowing_expressions.q.out | 74 ++-- .../vector_windowing_multipartitioning.q.out | 122 +++---- .../vector_windowing_order_null.q.out | 112 +++--- .../vector_windowing_range_multiorder.q.out | 152 ++++---- .../clientpositive/vector_windowing_rank.q.out | 152 ++++---- .../vector_windowing_streaming.q.out | 16 +- .../vector_windowing_windowspec.q.out | 154 ++++---- .../clientpositive/vectorized_mapjoin2.q.out | 14 +- 132 files changed, 4168 insertions(+), 3981 deletions(-) ----------------------------------------------------------------------
