HIVE-20850: Push case conditional from projections to dimension tables if possible (Zoltan Haindrich via Jesus Camacho Rodriguez)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/55887646 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/55887646 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/55887646 Branch: refs/heads/master Commit: 558876462d2589423d7131b51c24dbf61b8a22b9 Parents: dca389b Author: Zoltan Haindrich <[email protected]> Authored: Mon Nov 12 10:03:28 2018 -0800 Committer: Jesus Camacho Rodriguez <[email protected]> Committed: Mon Nov 12 10:03:57 2018 -0800 ---------------------------------------------------------------------- .../results/positive/accumulo_queries.q.out | 34 +- .../test/results/positive/hbase_queries.q.out | 34 +- .../hive/jdbc/AbstractJdbcTriggersTest.java | 5 +- .../jdbc/TestTriggersMoveWorkloadManager.java | 9 +- .../jdbc/TestTriggersTezSessionPoolManager.java | 21 +- .../hadoop/hive/ql/parse/CalcitePlanner.java | 2 +- .../bucket_mapjoin_mismatch1.q.out | 4 +- .../clientpositive/allcolref_in_udf.q.out | 28 +- .../annotate_stats_join_pkfk.q.out | 40 +- .../results/clientpositive/auto_join13.q.out | 6 +- .../results/clientpositive/auto_join19.q.out | 4 +- .../clientpositive/auto_join19_inclause.q.out | 4 +- .../results/clientpositive/auto_join2.q.out | 24 +- .../results/clientpositive/auto_join32.q.out | 6 +- .../results/clientpositive/auto_join9.q.out | 4 +- .../clientpositive/auto_join_stats.q.out | 122 +- .../clientpositive/auto_join_stats2.q.out | 90 +- .../materialized_view_create_rewrite.q.out | 8 +- .../clientpositive/bucket_map_join_spark1.q.out | 4 +- .../clientpositive/bucket_map_join_spark2.q.out | 4 +- .../clientpositive/bucket_map_join_spark3.q.out | 4 +- .../clientpositive/bucket_map_join_spark4.q.out | 4 +- .../bucketsortoptimize_insert_4.q.out | 4 +- .../bucketsortoptimize_insert_5.q.out | 4 +- .../bucketsortoptimize_insert_8.q.out | 8 +- .../test/results/clientpositive/cbo_const.q.out | 82 +- .../results/clientpositive/cbo_rp_join1.q.out | 80 +- .../clientpositive/cbo_rp_outer_join_ppr.q.out | 8 +- .../constantPropagateForSubQuery.q.out | 10 +- .../results/clientpositive/constprog2.q.out | 16 +- .../clientpositive/constprog_partitioner.q.out | 8 +- .../clientpositive/correlationoptimizer8.q.out | 58 +- .../test/results/clientpositive/cte_mat_5.q.out | 18 +- .../results/clientpositive/deleteAnalyze.q.out | 18 +- .../clientpositive/druid/druidmini_mv.q.out | 16 +- .../encryption_join_unencrypted_tbl.q.out | 76 +- .../clientpositive/filter_cond_pushdown.q.out | 90 +- .../clientpositive/filter_join_breaktask.q.out | 24 +- .../infer_bucket_sort_map_operators.q.out | 24 +- .../clientpositive/infer_join_preds.q.out | 22 +- .../results/clientpositive/innerjoin1.q.out | 76 +- .../test/results/clientpositive/input23.q.out | 8 +- .../results/clientpositive/interval_3.q.out | 16 +- ql/src/test/results/clientpositive/join13.q.out | 8 +- ql/src/test/results/clientpositive/join2.q.out | 32 +- ql/src/test/results/clientpositive/join26.q.out | 2 +- ql/src/test/results/clientpositive/join32.q.out | 2 +- ql/src/test/results/clientpositive/join33.q.out | 2 +- ql/src/test/results/clientpositive/join42.q.out | 28 +- ql/src/test/results/clientpositive/join45.q.out | 392 +- ql/src/test/results/clientpositive/join46.q.out | 290 +- ql/src/test/results/clientpositive/join47.q.out | 392 +- ql/src/test/results/clientpositive/join9.q.out | 6 +- .../clientpositive/join_cond_pushdown_1.q.out | 18 +- .../clientpositive/join_cond_pushdown_3.q.out | 18 +- .../join_cond_pushdown_unqual1.q.out | 18 +- .../join_cond_pushdown_unqual3.q.out | 18 +- .../clientpositive/join_emit_interval.q.out | 52 +- .../clientpositive/join_filters_overlap.q.out | 338 +- .../results/clientpositive/join_merging.q.out | 152 +- .../test/results/clientpositive/join_view.q.out | 4 +- .../clientpositive/llap/auto_join_filters.q.out | 60 +- .../llap/auto_sortmerge_join_6.q.out | 174 +- .../llap/bucket_map_join_tez2.q.out | 116 +- .../clientpositive/llap/bucketmapjoin1.q.out | 20 +- .../clientpositive/llap/bucketmapjoin2.q.out | 4 +- .../clientpositive/llap/bucketmapjoin3.q.out | 16 +- .../llap/bucketsortoptimize_insert_2.q.out | 24 +- .../llap/bucketsortoptimize_insert_6.q.out | 301 +- .../llap/bucketsortoptimize_insert_7.q.out | 8 +- .../clientpositive/llap/check_constraint.q.out | 43 +- .../llap/constprog_semijoin.q.out | 54 +- .../llap/constraints_optimization.q.out | 8 +- .../llap/correlationoptimizer4.q.out | 314 +- .../clientpositive/llap/cross_prod_1.q.out | 26 +- .../results/clientpositive/llap/cte_mat_5.q.out | 12 +- .../clientpositive/llap/deleteAnalyze.q.out | 8 +- .../llap/dynamic_partition_pruning.q.out | 401 +- .../llap/dynamic_semijoin_reduction_2.q.out | 12 +- .../clientpositive/llap/explainanalyze_2.q.out | 64 +- .../clientpositive/llap/explainuser_1.q.out | 306 +- .../clientpositive/llap/explainuser_2.q.out | 166 +- .../clientpositive/llap/explainuser_4.q.out | 34 +- .../llap/external_jdbc_table.q.out | 20 +- .../llap/filter_join_breaktask.q.out | 30 +- .../llap/hybridgrace_hashjoin_1.q.out | 8 +- .../clientpositive/llap/join32_lessSize.q.out | 16 +- .../results/clientpositive/llap/join46.q.out | 338 +- .../llap/join_emit_interval.q.out | 60 +- .../results/clientpositive/llap/lineage3.q.out | 4 +- .../clientpositive/llap/llap_smb_ptf.q.out | 36 +- .../results/clientpositive/llap/mapjoin46.q.out | 342 +- .../llap/mapjoin_emit_interval.q.out | 52 +- .../clientpositive/llap/mapjoin_hint.q.out | 32 +- .../llap/materialized_view_create_rewrite.q.out | 18 +- .../materialized_view_create_rewrite_3.q.out | 4 +- .../materialized_view_create_rewrite_4.q.out | 8 +- .../materialized_view_create_rewrite_5.q.out | 12 +- ...materialized_view_create_rewrite_dummy.q.out | 18 +- ...ized_view_create_rewrite_rebuild_dummy.q.out | 4 +- ...alized_view_create_rewrite_time_window.q.out | 4 +- .../results/clientpositive/llap/mergejoin.q.out | 8 +- .../clientpositive/llap/multiMapJoin1.q.out | 36 +- .../results/clientpositive/llap/orc_llap.q.out | 32 +- .../llap/partition_shared_scan.q.out | 22 +- .../clientpositive/llap/ppd_union_view.q.out | 32 +- .../llap/q93_with_constraints.q.out | 4 +- .../results/clientpositive/llap/reopt_dpp.q.out | 16 +- .../clientpositive/llap/reopt_semijoin.q.out | 8 +- .../clientpositive/llap/sharedworkext.q.out | 8 +- .../results/clientpositive/llap/stats11.q.out | 4 +- .../clientpositive/llap/subquery_in.q.out | 276 +- .../clientpositive/llap/subquery_notin.q.out | 82 +- .../clientpositive/llap/subquery_scalar.q.out | 128 +- .../clientpositive/llap/subquery_select.q.out | 532 +-- .../llap/table_access_keys_stats.q.out | 4 +- .../llap/tez_dynpart_hashjoin_1.q.out | 22 +- .../llap/tez_dynpart_hashjoin_2.q.out | 114 +- .../llap/tez_dynpart_hashjoin_3.q.out | 196 +- .../llap/tez_fixed_bucket_pruning.q.out | 84 +- .../clientpositive/llap/tez_self_join.q.out | 16 +- .../llap/tez_vector_dynpart_hashjoin_2.q.out | 114 +- .../clientpositive/llap/unionDistinct_1.q.out | 1946 +++++----- .../llap/vector_between_columns.q.out | 24 +- .../llap/vector_char_mapjoin1.q.out | 36 +- .../clientpositive/llap/vector_coalesce_3.q.out | 16 +- .../llap/vector_complex_join.q.out | 28 +- .../clientpositive/llap/vector_inner_join.q.out | 43 +- .../llap/vector_join_filters.q.out | 43 +- .../llap/vector_left_outer_join2.q.out | 108 +- .../llap/vector_mapjoin_reduce.q.out | 4 +- .../llap/vector_varchar_mapjoin1.q.out | 24 +- .../llap/vector_windowing_rank.q.out | 28 +- .../vectorized_dynamic_partition_pruning.q.out | 341 +- .../clientpositive/llap/vectorized_join46.q.out | 276 +- .../llap/vectorized_multi_output_select.q.out | 8 +- .../clientpositive/louter_join_ppr.q.out | 112 +- .../test/results/clientpositive/mapjoin1.q.out | 32 +- .../test/results/clientpositive/mapjoin46.q.out | 318 +- .../test/results/clientpositive/mapjoin47.q.out | 358 +- .../test/results/clientpositive/masking_1.q.out | 38 +- .../results/clientpositive/masking_12.q.out | 56 +- .../test/results/clientpositive/masking_3.q.out | 3472 +++++++++--------- .../test/results/clientpositive/masking_4.q.out | 56 +- .../test/results/clientpositive/mergejoin.q.out | 8 +- .../results/clientpositive/mergejoins.q.out | 34 +- .../multi_insert_with_join2.q.out | 16 +- .../results/clientpositive/outer_join_ppr.q.out | 8 +- ql/src/test/results/clientpositive/pcr.q.out | 100 +- .../clientpositive/perf/spark/query1.q.out | 10 +- .../clientpositive/perf/spark/query11.q.out | 148 +- .../clientpositive/perf/spark/query12.q.out | 4 +- .../clientpositive/perf/spark/query13.q.out | 190 +- .../clientpositive/perf/spark/query15.q.out | 32 +- .../clientpositive/perf/spark/query17.q.out | 20 +- .../clientpositive/perf/spark/query18.q.out | 68 +- .../clientpositive/perf/spark/query19.q.out | 20 +- .../clientpositive/perf/spark/query2.q.out | 24 +- .../clientpositive/perf/spark/query20.q.out | 4 +- .../clientpositive/perf/spark/query21.q.out | 14 +- .../clientpositive/perf/spark/query22.q.out | 4 +- .../clientpositive/perf/spark/query23.q.out | 202 +- .../clientpositive/perf/spark/query24.q.out | 88 +- .../clientpositive/perf/spark/query25.q.out | 22 +- .../clientpositive/perf/spark/query26.q.out | 4 +- .../clientpositive/perf/spark/query27.q.out | 8 +- .../clientpositive/perf/spark/query29.q.out | 32 +- .../clientpositive/perf/spark/query3.q.out | 4 +- .../clientpositive/perf/spark/query30.q.out | 12 +- .../clientpositive/perf/spark/query31.q.out | 310 +- .../clientpositive/perf/spark/query32.q.out | 10 +- .../clientpositive/perf/spark/query33.q.out | 42 +- .../clientpositive/perf/spark/query36.q.out | 4 +- .../clientpositive/perf/spark/query38.q.out | 12 +- .../clientpositive/perf/spark/query39.q.out | 12 +- .../clientpositive/perf/spark/query4.q.out | 308 +- .../clientpositive/perf/spark/query40.q.out | 14 +- .../clientpositive/perf/spark/query42.q.out | 4 +- .../clientpositive/perf/spark/query43.q.out | 12 +- .../clientpositive/perf/spark/query46.q.out | 4 +- .../clientpositive/perf/spark/query47.q.out | 16 +- .../clientpositive/perf/spark/query48.q.out | 148 +- .../clientpositive/perf/spark/query49.q.out | 102 +- .../clientpositive/perf/spark/query5.q.out | 12 +- .../clientpositive/perf/spark/query50.q.out | 20 +- .../clientpositive/perf/spark/query52.q.out | 4 +- .../clientpositive/perf/spark/query53.q.out | 18 +- .../clientpositive/perf/spark/query54.q.out | 4 +- .../clientpositive/perf/spark/query55.q.out | 4 +- .../clientpositive/perf/spark/query56.q.out | 42 +- .../clientpositive/perf/spark/query57.q.out | 22 +- .../clientpositive/perf/spark/query58.q.out | 48 +- .../clientpositive/perf/spark/query59.q.out | 54 +- .../clientpositive/perf/spark/query6.q.out | 14 +- .../clientpositive/perf/spark/query60.q.out | 42 +- .../clientpositive/perf/spark/query61.q.out | 8 +- .../clientpositive/perf/spark/query63.q.out | 18 +- .../clientpositive/perf/spark/query65.q.out | 6 +- .../clientpositive/perf/spark/query66.q.out | 44 +- .../clientpositive/perf/spark/query67.q.out | 56 +- .../clientpositive/perf/spark/query68.q.out | 4 +- .../clientpositive/perf/spark/query7.q.out | 4 +- .../clientpositive/perf/spark/query70.q.out | 4 +- .../clientpositive/perf/spark/query71.q.out | 4 +- .../clientpositive/perf/spark/query72.q.out | 50 +- .../clientpositive/perf/spark/query74.q.out | 150 +- .../clientpositive/perf/spark/query75.q.out | 56 +- .../clientpositive/perf/spark/query76.q.out | 42 +- .../clientpositive/perf/spark/query77.q.out | 16 +- .../clientpositive/perf/spark/query78.q.out | 30 +- .../clientpositive/perf/spark/query79.q.out | 24 +- .../clientpositive/perf/spark/query8.q.out | 16 +- .../clientpositive/perf/spark/query80.q.out | 12 +- .../clientpositive/perf/spark/query81.q.out | 20 +- .../clientpositive/perf/spark/query83.q.out | 46 +- .../clientpositive/perf/spark/query84.q.out | 16 +- .../clientpositive/perf/spark/query85.q.out | 255 +- .../clientpositive/perf/spark/query86.q.out | 4 +- .../clientpositive/perf/spark/query87.q.out | 12 +- .../clientpositive/perf/spark/query89.q.out | 10 +- .../clientpositive/perf/spark/query9.q.out | 62 +- .../clientpositive/perf/spark/query91.q.out | 12 +- .../clientpositive/perf/spark/query92.q.out | 10 +- .../clientpositive/perf/spark/query93.q.out | 18 +- .../clientpositive/perf/spark/query98.q.out | 4 +- .../clientpositive/perf/spark/query99.q.out | 58 +- .../clientpositive/perf/tez/cbo_query1.q.out | 8 +- .../clientpositive/perf/tez/cbo_query10.q.out | 6 +- .../clientpositive/perf/tez/cbo_query11.q.out | 94 +- .../clientpositive/perf/tez/cbo_query12.q.out | 2 +- .../clientpositive/perf/tez/cbo_query13.q.out | 30 +- .../clientpositive/perf/tez/cbo_query14.q.out | 102 +- .../clientpositive/perf/tez/cbo_query15.q.out | 14 +- .../clientpositive/perf/tez/cbo_query17.q.out | 20 +- .../clientpositive/perf/tez/cbo_query18.q.out | 59 +- .../clientpositive/perf/tez/cbo_query19.q.out | 16 +- .../clientpositive/perf/tez/cbo_query2.q.out | 16 +- .../clientpositive/perf/tez/cbo_query20.q.out | 2 +- .../clientpositive/perf/tez/cbo_query21.q.out | 8 +- .../clientpositive/perf/tez/cbo_query22.q.out | 4 +- .../clientpositive/perf/tez/cbo_query23.q.out | 216 +- .../clientpositive/perf/tez/cbo_query24.q.out | 30 +- .../clientpositive/perf/tez/cbo_query25.q.out | 18 +- .../clientpositive/perf/tez/cbo_query26.q.out | 10 +- .../clientpositive/perf/tez/cbo_query27.q.out | 10 +- .../clientpositive/perf/tez/cbo_query29.q.out | 18 +- .../clientpositive/perf/tez/cbo_query3.q.out | 8 +- .../clientpositive/perf/tez/cbo_query30.q.out | 10 +- .../clientpositive/perf/tez/cbo_query31.q.out | 72 +- .../clientpositive/perf/tez/cbo_query32.q.out | 12 +- .../clientpositive/perf/tez/cbo_query33.q.out | 36 +- .../clientpositive/perf/tez/cbo_query34.q.out | 10 +- .../clientpositive/perf/tez/cbo_query35.q.out | 6 +- .../clientpositive/perf/tez/cbo_query36.q.out | 10 +- .../clientpositive/perf/tez/cbo_query37.q.out | 12 +- .../clientpositive/perf/tez/cbo_query38.q.out | 6 +- .../clientpositive/perf/tez/cbo_query39.q.out | 12 +- .../clientpositive/perf/tez/cbo_query4.q.out | 122 +- .../clientpositive/perf/tez/cbo_query40.q.out | 8 +- .../clientpositive/perf/tez/cbo_query42.q.out | 8 +- .../clientpositive/perf/tez/cbo_query43.q.out | 8 +- .../clientpositive/perf/tez/cbo_query46.q.out | 10 +- .../clientpositive/perf/tez/cbo_query47.q.out | 8 +- .../clientpositive/perf/tez/cbo_query48.q.out | 28 +- .../clientpositive/perf/tez/cbo_query49.q.out | 81 +- .../clientpositive/perf/tez/cbo_query5.q.out | 14 +- .../clientpositive/perf/tez/cbo_query50.q.out | 8 +- .../clientpositive/perf/tez/cbo_query51.q.out | 4 +- .../clientpositive/perf/tez/cbo_query52.q.out | 8 +- .../clientpositive/perf/tez/cbo_query53.q.out | 8 +- .../clientpositive/perf/tez/cbo_query54.q.out | 6 +- .../clientpositive/perf/tez/cbo_query55.q.out | 8 +- .../clientpositive/perf/tez/cbo_query56.q.out | 36 +- .../clientpositive/perf/tez/cbo_query57.q.out | 8 +- .../clientpositive/perf/tez/cbo_query58.q.out | 12 +- .../clientpositive/perf/tez/cbo_query59.q.out | 20 +- .../clientpositive/perf/tez/cbo_query6.q.out | 6 +- .../clientpositive/perf/tez/cbo_query60.q.out | 36 +- .../clientpositive/perf/tez/cbo_query61.q.out | 40 +- .../clientpositive/perf/tez/cbo_query63.q.out | 8 +- .../clientpositive/perf/tez/cbo_query64.q.out | 114 +- .../clientpositive/perf/tez/cbo_query65.q.out | 8 +- .../clientpositive/perf/tez/cbo_query66.q.out | 34 +- .../clientpositive/perf/tez/cbo_query68.q.out | 10 +- .../clientpositive/perf/tez/cbo_query69.q.out | 6 +- .../clientpositive/perf/tez/cbo_query7.q.out | 10 +- .../clientpositive/perf/tez/cbo_query71.q.out | 14 +- .../clientpositive/perf/tez/cbo_query72.q.out | 26 +- .../clientpositive/perf/tez/cbo_query73.q.out | 10 +- .../clientpositive/perf/tez/cbo_query74.q.out | 30 +- .../clientpositive/perf/tez/cbo_query75.q.out | 48 +- .../clientpositive/perf/tez/cbo_query76.q.out | 20 +- .../clientpositive/perf/tez/cbo_query77.q.out | 16 +- .../clientpositive/perf/tez/cbo_query78.q.out | 24 +- .../clientpositive/perf/tez/cbo_query79.q.out | 16 +- .../clientpositive/perf/tez/cbo_query8.q.out | 16 +- .../clientpositive/perf/tez/cbo_query80.q.out | 42 +- .../clientpositive/perf/tez/cbo_query81.q.out | 10 +- .../clientpositive/perf/tez/cbo_query82.q.out | 12 +- .../clientpositive/perf/tez/cbo_query83.q.out | 12 +- .../clientpositive/perf/tez/cbo_query84.q.out | 16 +- .../clientpositive/perf/tez/cbo_query85.q.out | 44 +- .../clientpositive/perf/tez/cbo_query87.q.out | 6 +- .../clientpositive/perf/tez/cbo_query88.q.out | 80 +- .../clientpositive/perf/tez/cbo_query89.q.out | 6 +- .../clientpositive/perf/tez/cbo_query9.q.out | 12 +- .../clientpositive/perf/tez/cbo_query90.q.out | 20 +- .../clientpositive/perf/tez/cbo_query91.q.out | 18 +- .../clientpositive/perf/tez/cbo_query92.q.out | 12 +- .../clientpositive/perf/tez/cbo_query93.q.out | 12 +- .../clientpositive/perf/tez/cbo_query95.q.out | 14 +- .../clientpositive/perf/tez/cbo_query96.q.out | 10 +- .../clientpositive/perf/tez/cbo_query97.q.out | 4 +- .../clientpositive/perf/tez/cbo_query98.q.out | 2 +- .../clientpositive/perf/tez/cbo_query99.q.out | 39 +- .../clientpositive/perf/tez/query1.q.out | 10 +- .../clientpositive/perf/tez/query10.q.out | 2 +- .../clientpositive/perf/tez/query11.q.out | 412 +-- .../clientpositive/perf/tez/query12.q.out | 6 +- .../clientpositive/perf/tez/query13.q.out | 166 +- .../clientpositive/perf/tez/query14.q.out | 32 +- .../clientpositive/perf/tez/query15.q.out | 38 +- .../clientpositive/perf/tez/query17.q.out | 16 +- .../clientpositive/perf/tez/query18.q.out | 266 +- .../clientpositive/perf/tez/query19.q.out | 30 +- .../clientpositive/perf/tez/query2.q.out | 18 +- .../clientpositive/perf/tez/query20.q.out | 6 +- .../clientpositive/perf/tez/query21.q.out | 20 +- .../clientpositive/perf/tez/query22.q.out | 6 +- .../clientpositive/perf/tez/query23.q.out | 564 ++- .../clientpositive/perf/tez/query24.q.out | 50 +- .../clientpositive/perf/tez/query25.q.out | 20 +- .../clientpositive/perf/tez/query26.q.out | 12 +- .../clientpositive/perf/tez/query27.q.out | 8 +- .../clientpositive/perf/tez/query29.q.out | 28 +- .../clientpositive/perf/tez/query3.q.out | 8 +- .../clientpositive/perf/tez/query30.q.out | 14 +- .../clientpositive/perf/tez/query31.q.out | 358 +- .../clientpositive/perf/tez/query32.q.out | 8 +- .../clientpositive/perf/tez/query33.q.out | 28 +- .../clientpositive/perf/tez/query34.q.out | 6 +- .../clientpositive/perf/tez/query35.q.out | 2 +- .../clientpositive/perf/tez/query36.q.out | 6 +- .../clientpositive/perf/tez/query37.q.out | 6 +- .../clientpositive/perf/tez/query38.q.out | 14 +- .../clientpositive/perf/tez/query39.q.out | 12 +- .../clientpositive/perf/tez/query4.q.out | 610 ++- .../clientpositive/perf/tez/query40.q.out | 22 +- .../clientpositive/perf/tez/query42.q.out | 8 +- .../clientpositive/perf/tez/query43.q.out | 20 +- .../clientpositive/perf/tez/query46.q.out | 10 +- .../clientpositive/perf/tez/query47.q.out | 8 +- .../clientpositive/perf/tez/query48.q.out | 136 +- .../clientpositive/perf/tez/query49.q.out | 370 +- .../clientpositive/perf/tez/query5.q.out | 14 +- .../clientpositive/perf/tez/query50.q.out | 12 +- .../clientpositive/perf/tez/query51.q.out | 2 +- .../clientpositive/perf/tez/query52.q.out | 8 +- .../clientpositive/perf/tez/query53.q.out | 16 +- .../clientpositive/perf/tez/query54.q.out | 8 +- .../clientpositive/perf/tez/query55.q.out | 8 +- .../clientpositive/perf/tez/query56.q.out | 28 +- .../clientpositive/perf/tez/query57.q.out | 12 +- .../clientpositive/perf/tez/query58.q.out | 414 ++- .../clientpositive/perf/tez/query59.q.out | 122 +- .../clientpositive/perf/tez/query6.q.out | 6 +- .../clientpositive/perf/tez/query60.q.out | 28 +- .../clientpositive/perf/tez/query61.q.out | 18 +- .../clientpositive/perf/tez/query63.q.out | 16 +- .../clientpositive/perf/tez/query64.q.out | 436 ++- .../clientpositive/perf/tez/query65.q.out | 4 +- .../clientpositive/perf/tez/query66.q.out | 52 +- .../clientpositive/perf/tez/query67.q.out | 152 +- .../clientpositive/perf/tez/query68.q.out | 10 +- .../clientpositive/perf/tez/query69.q.out | 2 +- .../clientpositive/perf/tez/query7.q.out | 12 +- .../clientpositive/perf/tez/query70.q.out | 4 +- .../clientpositive/perf/tez/query71.q.out | 14 +- .../clientpositive/perf/tez/query72.q.out | 44 +- .../clientpositive/perf/tez/query73.q.out | 6 +- .../clientpositive/perf/tez/query74.q.out | 200 +- .../clientpositive/perf/tez/query75.q.out | 36 +- .../clientpositive/perf/tez/query76.q.out | 20 +- .../clientpositive/perf/tez/query77.q.out | 18 +- .../clientpositive/perf/tez/query78.q.out | 26 +- .../clientpositive/perf/tez/query79.q.out | 24 +- .../clientpositive/perf/tez/query8.q.out | 18 +- .../clientpositive/perf/tez/query80.q.out | 12 +- .../clientpositive/perf/tez/query81.q.out | 18 +- .../clientpositive/perf/tez/query82.q.out | 6 +- .../clientpositive/perf/tez/query83.q.out | 304 +- .../clientpositive/perf/tez/query84.q.out | 20 +- .../clientpositive/perf/tez/query85.q.out | 244 +- .../clientpositive/perf/tez/query86.q.out | 4 +- .../clientpositive/perf/tez/query87.q.out | 14 +- .../clientpositive/perf/tez/query88.q.out | 20 +- .../clientpositive/perf/tez/query89.q.out | 10 +- .../clientpositive/perf/tez/query9.q.out | 292 +- .../clientpositive/perf/tez/query90.q.out | 8 +- .../clientpositive/perf/tez/query91.q.out | 14 +- .../clientpositive/perf/tez/query92.q.out | 8 +- .../clientpositive/perf/tez/query93.q.out | 22 +- .../clientpositive/perf/tez/query95.q.out | 4 +- .../clientpositive/perf/tez/query96.q.out | 6 +- .../clientpositive/perf/tez/query97.q.out | 2 +- .../clientpositive/perf/tez/query98.q.out | 6 +- .../clientpositive/perf/tez/query99.q.out | 192 +- .../results/clientpositive/pointlookup2.q.out | 328 +- .../results/clientpositive/pointlookup3.q.out | 288 +- .../results/clientpositive/pointlookup5.q.out | 48 +- .../clientpositive/position_alias_test_1.q.out | 30 +- .../clientpositive/ppd_outer_join5.q.out | 80 +- .../clientpositive/ppd_repeated_alias.q.out | 28 +- .../results/clientpositive/ppd_udf_case.q.out | 52 +- .../clientpositive/router_join_ppr.q.out | 112 +- .../test/results/clientpositive/semijoin4.q.out | 16 +- .../results/clientpositive/skewjoinopt18.q.out | 38 +- .../results/clientpositive/smb_mapjoin_46.q.out | 217 +- .../results/clientpositive/smb_mapjoin_47.q.out | 34 +- .../clientpositive/spark/auto_join13.q.out | 6 +- .../clientpositive/spark/auto_join19.q.out | 4 +- .../clientpositive/spark/auto_join2.q.out | 24 +- .../clientpositive/spark/auto_join32.q.out | 4 +- .../clientpositive/spark/auto_join9.q.out | 4 +- .../spark/auto_join_filters.q.out | 60 +- .../clientpositive/spark/auto_join_stats.q.out | 82 +- .../clientpositive/spark/auto_join_stats2.q.out | 58 +- .../spark/auto_sortmerge_join_6.q.out | 36 +- .../spark/bucket_map_join_spark1.q.out | 4 +- .../spark/bucket_map_join_spark2.q.out | 4 +- .../spark/bucket_map_join_spark3.q.out | 4 +- .../spark/bucket_map_join_spark4.q.out | 4 +- .../spark/bucket_map_join_tez1.q.out | 96 +- .../spark/bucket_map_join_tez2.q.out | 70 +- .../clientpositive/spark/bucketmapjoin1.q.out | 8 +- .../clientpositive/spark/bucketmapjoin2.q.out | 4 +- .../clientpositive/spark/bucketmapjoin3.q.out | 16 +- .../spark/bucketsortoptimize_insert_2.q.out | 12 +- .../spark/bucketsortoptimize_insert_4.q.out | 4 +- .../spark/bucketsortoptimize_insert_6.q.out | 28 +- .../spark/bucketsortoptimize_insert_7.q.out | 4 +- .../spark/bucketsortoptimize_insert_8.q.out | 8 +- .../spark/constprog_partitioner.q.out | 8 +- .../spark/constprog_semijoin.q.out | 4 +- .../spark/dynamic_rdd_cache.q.out | 88 +- .../spark/filter_join_breaktask.q.out | 18 +- .../spark/infer_bucket_sort_map_operators.q.out | 24 +- .../results/clientpositive/spark/join13.q.out | 8 +- .../results/clientpositive/spark/join2.q.out | 32 +- .../results/clientpositive/spark/join26.q.out | 2 +- .../results/clientpositive/spark/join32.q.out | 2 +- .../clientpositive/spark/join32_lessSize.q.out | 6 +- .../results/clientpositive/spark/join33.q.out | 2 +- .../results/clientpositive/spark/join9.q.out | 6 +- .../spark/join_cond_pushdown_1.q.out | 18 +- .../spark/join_cond_pushdown_3.q.out | 18 +- .../spark/join_cond_pushdown_unqual1.q.out | 18 +- .../spark/join_cond_pushdown_unqual3.q.out | 18 +- .../spark/join_filters_overlap.q.out | 338 +- .../clientpositive/spark/join_merging.q.out | 182 +- .../clientpositive/spark/join_view.q.out | 4 +- .../clientpositive/spark/louter_join_ppr.q.out | 112 +- .../results/clientpositive/spark/mapjoin1.q.out | 32 +- .../clientpositive/spark/mergejoins.q.out | 34 +- .../clientpositive/spark/outer_join_ppr.q.out | 8 +- .../test/results/clientpositive/spark/pcr.q.out | 60 +- .../clientpositive/spark/ppd_outer_join5.q.out | 80 +- .../clientpositive/spark/router_join_ppr.q.out | 112 +- .../clientpositive/spark/skewjoinopt18.q.out | 38 +- .../spark/spark_dynamic_partition_pruning.q.out | 370 +- .../spark_dynamic_partition_pruning_3.q.out | 18 +- .../spark_dynamic_partition_pruning_4.q.out | 10 +- .../spark/spark_explainuser_1.q.out | 334 +- .../spark/spark_use_ts_stats_for_mapjoin.q.out | 26 +- ...k_vectorized_dynamic_partition_pruning.q.out | 480 +-- .../clientpositive/spark/subquery_in.q.out | 238 +- .../clientpositive/spark/subquery_notin.q.out | 104 +- .../clientpositive/spark/subquery_scalar.q.out | 74 +- .../clientpositive/spark/subquery_select.q.out | 444 ++- .../results/clientpositive/spark/union22.q.out | 17 +- .../results/clientpositive/spark/union32.q.out | 46 +- .../clientpositive/spark/union_remove_12.q.out | 4 +- .../clientpositive/spark/union_remove_13.q.out | 4 +- .../clientpositive/spark/union_remove_14.q.out | 4 +- .../spark/vector_inner_join.q.out | 33 +- .../clientpositive/subquery_notexists.q.out | 30 +- .../results/clientpositive/tablevalues.q.out | 12 +- .../clientpositive/tez/explainanalyze_4.q.out | 4 +- .../clientpositive/tez/explainanalyze_5.q.out | 4 +- .../tez/hybridgrace_hashjoin_1.q.out | 8 +- .../results/clientpositive/tez/tez-tag.q.out | 8 +- .../udf_case_column_pruning.q.out | 9 +- .../test/results/clientpositive/union22.q.out | 23 +- .../test/results/clientpositive/union32.q.out | 46 +- .../clientpositive/union_remove_12.q.out | 4 +- .../clientpositive/union_remove_13.q.out | 4 +- .../clientpositive/union_remove_14.q.out | 4 +- .../clientpositive/vector_between_columns.q.out | 30 +- .../clientpositive/vector_char_mapjoin1.q.out | 40 +- .../clientpositive/vector_coalesce_3.q.out | 7 +- .../vector_left_outer_join2.q.out | 92 +- .../vector_varchar_mapjoin1.q.out | 22 +- .../clientpositive/vectorized_join46_mr.q.out | 252 +- 503 files changed, 16838 insertions(+), 16161 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/accumulo-handler/src/test/results/positive/accumulo_queries.q.out ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out index 24c595d..b8a73f5 100644 --- a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out +++ b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out @@ -575,12 +575,16 @@ STAGE PLANS: mode: mergepartial outputColumnNames: _col0, _col1 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE - File Output Operator - compressed: false - table: - input format: org.apache.hadoop.mapred.SequenceFileInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + Select Operator + expressions: _col1 (type: bigint), UDFToDouble(_col0) (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Stage: Stage-2 Map Reduce @@ -592,29 +596,29 @@ STAGE PLANS: predicate: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator - expressions: key (type: int), value (type: string) - outputColumnNames: _col0, _col1 + expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) + outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator - key expressions: UDFToDouble(_col0) (type: double) + key expressions: _col2 (type: double) sort order: + - Map-reduce partition columns: UDFToDouble(_col0) (type: double) + Map-reduce partition columns: _col2 (type: double) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE value expressions: _col0 (type: int), _col1 (type: string) TableScan Reduce Output Operator - key expressions: UDFToDouble(_col0) (type: double) + key expressions: _col1 (type: double) sort order: + - Map-reduce partition columns: UDFToDouble(_col0) (type: double) + Map-reduce partition columns: _col1 (type: double) Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: bigint) + value expressions: _col0 (type: bigint) Reduce Operator Tree: Join Operator condition map: Inner Join 0 to 1 keys: - 0 UDFToDouble(_col0) (type: double) - 1 UDFToDouble(_col0) (type: double) + 0 _col2 (type: double) + 1 _col1 (type: double) outputColumnNames: _col0, _col1, _col3 Statistics: Num rows: 275 Data size: 2921 Basic stats: PARTIAL Column stats: NONE Select Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/hbase-handler/src/test/results/positive/hbase_queries.q.out ---------------------------------------------------------------------- diff --git a/hbase-handler/src/test/results/positive/hbase_queries.q.out b/hbase-handler/src/test/results/positive/hbase_queries.q.out index aea7e7e..9a94625 100644 --- a/hbase-handler/src/test/results/positive/hbase_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out @@ -576,12 +576,16 @@ STAGE PLANS: mode: mergepartial outputColumnNames: _col0, _col1 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE - File Output Operator - compressed: false - table: - input format: org.apache.hadoop.mapred.SequenceFileInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + Select Operator + expressions: _col1 (type: bigint), UDFToDouble(_col0) (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Stage: Stage-2 Map Reduce @@ -593,29 +597,29 @@ STAGE PLANS: predicate: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator - expressions: key (type: int), value (type: string) - outputColumnNames: _col0, _col1 + expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) + outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator - key expressions: UDFToDouble(_col0) (type: double) + key expressions: _col2 (type: double) sort order: + - Map-reduce partition columns: UDFToDouble(_col0) (type: double) + Map-reduce partition columns: _col2 (type: double) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE value expressions: _col0 (type: int), _col1 (type: string) TableScan Reduce Output Operator - key expressions: UDFToDouble(_col0) (type: double) + key expressions: _col1 (type: double) sort order: + - Map-reduce partition columns: UDFToDouble(_col0) (type: double) + Map-reduce partition columns: _col1 (type: double) Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: bigint) + value expressions: _col0 (type: bigint) Reduce Operator Tree: Join Operator condition map: Inner Join 0 to 1 keys: - 0 UDFToDouble(_col0) (type: double) - 1 UDFToDouble(_col0) (type: double) + 0 _col2 (type: double) + 1 _col1 (type: double) outputColumnNames: _col0, _col1, _col3 Statistics: Num rows: 275 Data size: 2921 Basic stats: PARTIAL Column stats: NONE Select Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/itests/hive-unit/src/test/java/org/apache/hive/jdbc/AbstractJdbcTriggersTest.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/AbstractJdbcTriggersTest.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/AbstractJdbcTriggersTest.java index aa9893e..8889b62 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/AbstractJdbcTriggersTest.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/AbstractJdbcTriggersTest.java @@ -43,12 +43,13 @@ import org.apache.hadoop.hive.metastore.api.WMTrigger; import org.apache.hadoop.hive.ql.wm.Trigger; import org.apache.hive.jdbc.miniHS2.MiniHS2; import org.apache.hive.jdbc.miniHS2.MiniHS2.MiniClusterType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public abstract class AbstractJdbcTriggersTest { private final Logger LOG = LoggerFactory.getLogger(getClass().getName()); http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersMoveWorkloadManager.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersMoveWorkloadManager.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersMoveWorkloadManager.java index ad5aa18..e722f74 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersMoveWorkloadManager.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersMoveWorkloadManager.java @@ -42,6 +42,7 @@ import org.apache.hadoop.hive.ql.wm.Trigger; import org.apache.hive.common.util.RetryTestRunner; import org.apache.hive.jdbc.miniHS2.MiniHS2; import org.apache.hive.jdbc.miniHS2.MiniHS2.MiniClusterType; + import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; @@ -102,7 +103,7 @@ public class TestTriggersMoveWorkloadManager extends AbstractJdbcTriggersTest { Trigger killTrigger = new ExecutionTrigger("slow_query_kill", killExpression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(moveTrigger), Lists.newArrayList(killTrigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.tez.session.events.print.summary=json"); @@ -138,7 +139,7 @@ public class TestTriggersMoveWorkloadManager extends AbstractJdbcTriggersTest { Trigger killTrigger = new ExecutionTrigger("slow_query_kill", killExpression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(moveTrigger, killTrigger), Lists.newArrayList()); - String query = "select sleep(t1.under_col, 1), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 1), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col==t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.tez.session.events.print.summary=json"); @@ -173,7 +174,7 @@ public class TestTriggersMoveWorkloadManager extends AbstractJdbcTriggersTest { Trigger killTrigger = new ExecutionTrigger("slow_query_kill", killExpression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(moveTrigger1, killTrigger), Lists.newArrayList(moveTrigger2)); - String query = "select sleep(t1.under_col, 1), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 1), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.tez.session.events.print.summary=json"); @@ -251,7 +252,7 @@ public class TestTriggersMoveWorkloadManager extends AbstractJdbcTriggersTest { Trigger killTrigger = new ExecutionTrigger("kill_big_read", killExpression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(moveTrigger, killTrigger), Lists.newArrayList()); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.tez.session.events.print.summary=json"); http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java index faab11a..4372967 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestTriggersTezSessionPoolManager.java @@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.wm.ExecutionTrigger; import org.apache.hadoop.hive.ql.wm.Expression; import org.apache.hadoop.hive.ql.wm.ExpressionFactory; import org.apache.hadoop.hive.ql.wm.Trigger; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; @@ -48,7 +49,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression expression = ExpressionFactory.fromString("ELAPSED_TIME > 20000"); Trigger trigger = new ExecutionTrigger("slow_query", expression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(trigger)); - String query = "select sleep(t1.under_col, 500), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 500), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); @@ -61,7 +62,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression expression = ExpressionFactory.fromString("ELAPSED_TIME > 100"); Trigger trigger = new ExecutionTrigger("slow_query", expression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(trigger)); - String query = "select sleep(t1.under_col, 500), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 500), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); @@ -74,7 +75,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression expression = ExpressionFactory.fromString("EXECUTION_TIME > 1000"); Trigger trigger = new ExecutionTrigger("slow_query", expression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(trigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); @@ -104,7 +105,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression expression = ExpressionFactory.fromString("HDFS_BYTES_READ > 100"); Trigger trigger = new ExecutionTrigger("big_read", expression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(trigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); @@ -117,7 +118,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression expression = ExpressionFactory.fromString("FILE_BYTES_WRITTEN > 100"); Trigger trigger = new ExecutionTrigger("big_write", expression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(trigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); @@ -130,7 +131,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression expression = ExpressionFactory.fromString("VERTEX_TOTAL_TASKS > 20"); Trigger trigger = new ExecutionTrigger("highly_parallel", expression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(trigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = getConfigs(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); @@ -143,7 +144,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression expression = ExpressionFactory.fromString("DAG_TOTAL_TASKS > 50"); Trigger trigger = new ExecutionTrigger("highly_parallel", expression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(trigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = getConfigs(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); @@ -156,7 +157,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression expression = ExpressionFactory.fromString("HDFS_READ_OPS > 50"); Trigger trigger = new ExecutionTrigger("high_read_ops", expression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(trigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = getConfigs(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); @@ -351,7 +352,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression execTimeExpression = ExpressionFactory.fromString("EXECUTION_TIME > 1000"); Trigger execTimeTrigger = new ExecutionTrigger("slow_query", execTimeExpression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(shuffleTrigger, execTimeTrigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); @@ -366,7 +367,7 @@ public class TestTriggersTezSessionPoolManager extends AbstractJdbcTriggersTest Expression execTimeExpression = ExpressionFactory.fromString("EXECUTION_TIME > 100000"); Trigger execTimeTrigger = new ExecutionTrigger("slow_query", execTimeExpression, new Action(Action.Type.KILL_QUERY)); setupTriggers(Lists.newArrayList(shuffleTrigger, execTimeTrigger)); - String query = "select sleep(t1.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + + String query = "select sleep(t1.under_col+t2.under_col, 5), t1.value from " + tableName + " t1 join " + tableName + " t2 on t1.under_col>=t2.under_col"; List<String> setCmds = new ArrayList<>(); setCmds.add("set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecWMEventsSummaryPrinter"); http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java index 35f2b0a..6e9c68b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java @@ -2069,9 +2069,9 @@ public class CalcitePlanner extends SemanticAnalyzer { rules.add(new HivePointLookupOptimizerRule.JoinCondition(minNumORClauses)); rules.add(new HivePointLookupOptimizerRule.ProjectionExpressions(minNumORClauses)); } + rules.add(HiveProjectJoinTransposeRule.INSTANCE); if (conf.getBoolVar(HiveConf.ConfVars.HIVE_OPTIMIZE_CONSTRAINTS_JOIN) && profilesCBO.contains(ExtendedCBOProfile.REFERENTIAL_CONSTRAINTS)) { - rules.add(HiveProjectJoinTransposeRule.INSTANCE); rules.add(HiveJoinConstraintsRule.INSTANCE); } rules.add(HiveJoinAddNotNullRule.INSTANCE_JOIN); http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out b/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out index 3c43278..264d7d4 100644 --- a/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out +++ b/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out @@ -143,10 +143,10 @@ STAGE PLANS: keys: 0 _col0 (type: int) 1 _col0 (type: int) - outputColumnNames: _col0, _col1, _col4 + outputColumnNames: _col0, _col1, _col3 Statistics: Num rows: 118 Data size: 46200 Basic stats: PARTIAL Column stats: NONE Select Operator - expressions: _col0 (type: int), _col1 (type: string), _col4 (type: string) + expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 118 Data size: 46200 Basic stats: PARTIAL Column stats: NONE File Output Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/allcolref_in_udf.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/allcolref_in_udf.q.out b/ql/src/test/results/clientpositive/allcolref_in_udf.q.out index ded58bd..952fe48 100644 --- a/ql/src/test/results/clientpositive/allcolref_in_udf.q.out +++ b/ql/src/test/results/clientpositive/allcolref_in_udf.q.out @@ -93,15 +93,15 @@ STAGE PLANS: predicate: (UDFToDouble(key) < 100.0D) (type: boolean) Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: key (type: string), value (type: string) - outputColumnNames: _col0, _col1 + expressions: key (type: string), value (type: string), concat(key, value) (type: string), (UDFToDouble(key) + 1.0D) (type: double) + outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: (UDFToDouble(_col0) + 1.0D) (type: double) + key expressions: _col3 (type: double) sort order: + - Map-reduce partition columns: (UDFToDouble(_col0) + 1.0D) (type: double) + Map-reduce partition columns: _col3 (type: double) Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) TableScan alias: b filterExpr: key is not null (type: boolean) @@ -110,26 +110,26 @@ STAGE PLANS: predicate: key is not null (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: key (type: string), value (type: string) - outputColumnNames: _col0, _col1 + expressions: key (type: string), value (type: string), concat(key, value) (type: string), UDFToDouble(key) (type: double) + outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: UDFToDouble(_col0) (type: double) + key expressions: _col3 (type: double) sort order: + - Map-reduce partition columns: UDFToDouble(_col0) (type: double) + Map-reduce partition columns: _col3 (type: double) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) Reduce Operator Tree: Join Operator condition map: Inner Join 0 to 1 keys: - 0 (UDFToDouble(_col0) + 1.0D) (type: double) - 1 UDFToDouble(_col0) (type: double) - outputColumnNames: _col0, _col1, _col5, _col6 + 0 _col3 (type: double) + 1 _col3 (type: double) + outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col6 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: 2 (type: int), concat(_col0, _col1, _col5, _col6) (type: string), concat(_col0, _col1) (type: string), concat(_col5, _col6) (type: string), concat(_col0, _col1, _col5) (type: string), concat(_col0, _col5, _col6) (type: string) + expressions: 2 (type: int), concat(_col0, _col1, _col4, _col5) (type: string), _col2 (type: string), _col6 (type: string), concat(_col0, _col1, _col4) (type: string), concat(_col0, _col4, _col5) (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE UDTF Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out b/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out index a42452a..eafd49a 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out @@ -473,21 +473,21 @@ STAGE PLANS: predicate: ss_store_sk is not null (type: boolean) Statistics: Num rows: 964 Data size: 3720 Basic stats: COMPLETE Column stats: COMPLETE Select Operator - expressions: ss_store_sk (type: int) + expressions: UDFToLong(ss_store_sk) (type: bigint) outputColumnNames: _col0 - Statistics: Num rows: 964 Data size: 3720 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 964 Data size: 7440 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator - key expressions: UDFToLong(_col0) (type: bigint) + key expressions: _col0 (type: bigint) sort order: + - Map-reduce partition columns: UDFToLong(_col0) (type: bigint) - Statistics: Num rows: 964 Data size: 3720 Basic stats: COMPLETE Column stats: COMPLETE + Map-reduce partition columns: _col0 (type: bigint) + Statistics: Num rows: 964 Data size: 7440 Basic stats: COMPLETE Column stats: COMPLETE Reduce Operator Tree: Join Operator condition map: Inner Join 0 to 1 keys: 0 _col0 (type: bigint) - 1 UDFToLong(_col0) (type: bigint) + 1 _col0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 964 Data size: 7712 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator @@ -605,12 +605,12 @@ STAGE PLANS: Select Operator expressions: s_store_sk (type: int) outputColumnNames: _col0 - Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 12 Data size: 48 Basic stats: COMPLETE Column stats: PARTIAL Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 12 Data size: 48 Basic stats: COMPLETE Column stats: PARTIAL TableScan alias: ss filterExpr: ((ss_quantity > 10) and ss_store_sk is not null) (type: boolean) @@ -621,12 +621,12 @@ STAGE PLANS: Select Operator expressions: ss_store_sk (type: int) outputColumnNames: _col0 - Statistics: Num rows: 321 Data size: 2468 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 321 Data size: 1240 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 321 Data size: 2468 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 321 Data size: 1240 Basic stats: COMPLETE Column stats: COMPLETE Reduce Operator Tree: Join Operator condition map: @@ -678,12 +678,12 @@ STAGE PLANS: Select Operator expressions: s_store_sk (type: int) outputColumnNames: _col0 - Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 12 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 12 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: ss filterExpr: ss_store_sk is not null (type: boolean) @@ -767,12 +767,12 @@ STAGE PLANS: Select Operator expressions: ss_store_sk (type: int) outputColumnNames: _col0 - Statistics: Num rows: 321 Data size: 2468 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 321 Data size: 1240 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 321 Data size: 2468 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 321 Data size: 1240 Basic stats: COMPLETE Column stats: COMPLETE Reduce Operator Tree: Join Operator condition map: @@ -1030,12 +1030,12 @@ STAGE PLANS: Select Operator expressions: s_store_sk (type: int) outputColumnNames: _col0 - Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 12 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 12 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: s1 filterExpr: s_store_sk is not null (type: boolean) @@ -1109,12 +1109,12 @@ STAGE PLANS: Select Operator expressions: ss_store_sk (type: int) outputColumnNames: _col0 - Statistics: Num rows: 321 Data size: 2468 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 321 Data size: 1240 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 321 Data size: 2468 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 321 Data size: 1240 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: s filterExpr: s_store_sk is not null (type: boolean) @@ -1156,10 +1156,10 @@ STAGE PLANS: 0 _col0 (type: int) 1 _col0 (type: int) 2 _col0 (type: int) - outputColumnNames: _col2 + outputColumnNames: _col1 Statistics: Num rows: 321 Data size: 1284 Basic stats: COMPLETE Column stats: COMPLETE Select Operator - expressions: _col2 (type: int) + expressions: _col1 (type: int) outputColumnNames: _col0 Statistics: Num rows: 321 Data size: 1284 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/auto_join13.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/auto_join13.q.out b/ql/src/test/results/clientpositive/auto_join13.q.out index 8b7dc4a..60c087d 100644 --- a/ql/src/test/results/clientpositive/auto_join13.q.out +++ b/ql/src/test/results/clientpositive/auto_join13.q.out @@ -49,13 +49,13 @@ STAGE PLANS: predicate: (UDFToDouble(key) < 200.0D) (type: boolean) Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: key (type: string) + expressions: UDFToDouble(key) (type: double) outputColumnNames: _col0 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: 0 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double) - 1 UDFToDouble(_col0) (type: double) + 1 _col0 (type: double) $hdt$_0:$hdt$_1:src TableScan alias: src @@ -100,7 +100,7 @@ STAGE PLANS: Inner Join 0 to 1 keys: 0 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double) - 1 UDFToDouble(_col0) (type: double) + 1 _col0 (type: double) outputColumnNames: _col1, _col2 Statistics: Num rows: 200 Data size: 2132 Basic stats: COMPLETE Column stats: NONE Select Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/auto_join19.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/auto_join19.q.out b/ql/src/test/results/clientpositive/auto_join19.q.out index 295cc1a..be4e5c0 100644 --- a/ql/src/test/results/clientpositive/auto_join19.q.out +++ b/ql/src/test/results/clientpositive/auto_join19.q.out @@ -82,10 +82,10 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - outputColumnNames: _col0, _col4 + outputColumnNames: _col0, _col2 Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: UDFToInteger(_col0) (type: int), _col4 (type: string) + expressions: UDFToInteger(_col0) (type: int), _col2 (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE File Output Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/auto_join19_inclause.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/auto_join19_inclause.q.out b/ql/src/test/results/clientpositive/auto_join19_inclause.q.out index 158f722..d680ec9 100644 --- a/ql/src/test/results/clientpositive/auto_join19_inclause.q.out +++ b/ql/src/test/results/clientpositive/auto_join19_inclause.q.out @@ -82,10 +82,10 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - outputColumnNames: _col0, _col4 + outputColumnNames: _col0, _col2 Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: UDFToInteger(_col0) (type: int), _col4 (type: string) + expressions: UDFToInteger(_col0) (type: int), _col2 (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE File Output Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/auto_join2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/auto_join2.q.out b/ql/src/test/results/clientpositive/auto_join2.q.out index 6e4803a..8170f12 100644 --- a/ql/src/test/results/clientpositive/auto_join2.q.out +++ b/ql/src/test/results/clientpositive/auto_join2.q.out @@ -45,8 +45,8 @@ STAGE PLANS: predicate: key is not null (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: key (type: string) - outputColumnNames: _col0 + expressions: key (type: string), UDFToDouble(key) (type: double) + outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: @@ -61,13 +61,13 @@ STAGE PLANS: predicate: key is not null (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: key (type: string), value (type: string) + expressions: value (type: string), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: - 0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double) - 1 UDFToDouble(_col0) (type: double) + 0 (_col1 + _col3) (type: double) + 1 _col1 (type: double) Stage: Stage-7 Map Reduce @@ -80,8 +80,8 @@ STAGE PLANS: predicate: key is not null (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: key (type: string) - outputColumnNames: _col0 + expressions: key (type: string), UDFToDouble(key) (type: double) + outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: @@ -89,18 +89,18 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - outputColumnNames: _col0, _col1 + outputColumnNames: _col0, _col1, _col3 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 keys: - 0 (UDFToDouble(_col0) + UDFToDouble(_col1)) (type: double) - 1 UDFToDouble(_col0) (type: double) - outputColumnNames: _col0, _col3 + 0 (_col1 + _col3) (type: double) + 1 _col1 (type: double) + outputColumnNames: _col0, _col4 Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: UDFToInteger(_col0) (type: int), _col3 (type: string) + expressions: UDFToInteger(_col0) (type: int), _col4 (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE File Output Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/auto_join32.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/auto_join32.q.out b/ql/src/test/results/clientpositive/auto_join32.q.out index 656654e..e63354a 100644 --- a/ql/src/test/results/clientpositive/auto_join32.q.out +++ b/ql/src/test/results/clientpositive/auto_join32.q.out @@ -447,10 +447,10 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - outputColumnNames: _col0, _col3 + outputColumnNames: _col0, _col2 Group By Operator - aggregations: count(DISTINCT _col3) - keys: _col0 (type: string), _col3 (type: string) + aggregations: count(DISTINCT _col2) + keys: _col0 (type: string), _col2 (type: string) mode: hash outputColumnNames: _col0, _col1, _col2 Reduce Output Operator http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/auto_join9.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/auto_join9.q.out b/ql/src/test/results/clientpositive/auto_join9.q.out index 618429e..fb27842 100644 --- a/ql/src/test/results/clientpositive/auto_join9.q.out +++ b/ql/src/test/results/clientpositive/auto_join9.q.out @@ -74,10 +74,10 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - outputColumnNames: _col0, _col4 + outputColumnNames: _col0, _col2 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: UDFToInteger(_col0) (type: int), _col4 (type: string) + expressions: UDFToInteger(_col0) (type: int), _col2 (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE File Output Operator
