You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by px...@apache.org on 2017/01/19 04:29:32 UTC
[20/20] hive git commit: IVE-15297: Hive should not split semicolon
within quoted string literals (Pengcheng Xiong,
reviewed by Ashutosh Chauhan) (addendum I)
IVE-15297: Hive should not split semicolon within quoted string literals (Pengcheng Xiong, reviewed by Ashutosh Chauhan) (addendum I)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ef33237d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ef33237d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ef33237d
Branch: refs/heads/master
Commit: ef33237da966563377946efc67f908a9945d7c41
Parents: d357f38
Author: Pengcheng Xiong <px...@apache.org>
Authored: Wed Jan 18 20:29:04 2017 -0800
Committer: Pengcheng Xiong <px...@apache.org>
Committed: Wed Jan 18 20:29:04 2017 -0800
----------------------------------------------------------------------
.../results/clientpositive/acid_subquery.q.out | 12 +-
.../annotate_stats_join_pkfk.q.out | 6 +-
.../clientpositive/avrocountemptytbl.q.out | 8 +-
.../clientpositive/cbo_rp_udf_percentile.q.out | 4 +-
.../clientpositive/cbo_rp_udf_percentile2.q.out | 4 +-
.../clientpositive/create_or_replace_view.q.out | 6 +-
.../results/clientpositive/decimal_udf.q.out | 22 --
ql/src/test/results/clientpositive/join46.q.out | 114 ++----
.../clientpositive/join_emit_interval.q.out | 12 +-
.../results/clientpositive/llap/join46.q.out | 114 ++----
.../llap/join_emit_interval.q.out | 12 +-
.../clientpositive/llap/join_filters.q.out | 8 +-
.../clientpositive/llap/join_nulls.q.out | 8 +-
.../clientpositive/llap/join_nullsafe.q.out | 44 +--
.../clientpositive/llap/lateral_view.q.out | 24 +-
.../clientpositive/llap/leftsemijoin.q.out | 8 +-
.../clientpositive/llap/leftsemijoin_mr.q.out | 8 +-
.../clientpositive/llap/limit_pushdown.q.out | 66 ++--
.../clientpositive/llap/limit_pushdown3.q.out | 48 +--
.../llap/list_bucket_dml_10.q.out | 44 +--
.../clientpositive/llap/load_dyn_part1.q.out | 8 +-
.../clientpositive/llap/load_dyn_part2.q.out | 8 +-
.../clientpositive/llap/load_dyn_part3.q.out | 8 +-
.../clientpositive/llap/lvj_mapjoin.q.out | 8 +-
.../results/clientpositive/llap/mapjoin46.q.out | 108 ++----
.../clientpositive/llap/mapjoin_decimal.q.out | 8 +-
.../llap/mapjoin_emit_interval.q.out | 12 +-
.../clientpositive/llap/mapjoin_mapjoin.q.out | 12 +-
.../results/clientpositive/llap/merge1.q.out | 8 +-
.../results/clientpositive/llap/merge2.q.out | 8 +-
.../results/clientpositive/llap/mergejoin.q.out | 8 +-
.../clientpositive/llap/metadataonly1.q.out | 6 +-
.../test/results/clientpositive/llap/mrr.q.out | 34 +-
.../clientpositive/llap/multiMapJoin1.q.out | 54 +--
.../clientpositive/llap/multiMapJoin2.q.out | 110 +-----
.../clientpositive/llap/multi_insert.q.out | 8 +-
.../llap/multi_insert_lateral_view.q.out | 74 +---
.../llap/nonmr_fetch_threshold.q.out | 24 +-
.../llap/offset_limit_ppd_optimizer.q.out | 54 +--
.../clientpositive/llap/optimize_nullscan.q.out | 14 +-
.../clientpositive/llap/orc_analyze.q.out | 52 +--
.../clientpositive/llap/orc_create.q.out | 38 +-
.../results/clientpositive/llap/orc_llap.q.out | 30 +-
.../clientpositive/llap/orc_merge11.q.out | 6 +-
.../clientpositive/llap/orc_merge5.q.out | 38 +-
.../clientpositive/llap/orc_merge6.q.out | 40 +--
.../clientpositive/llap/orc_merge7.q.out | 42 +--
.../clientpositive/llap/orc_merge9.q.out | 8 +-
.../llap/orc_merge_incompat1.q.out | 26 +-
.../llap/orc_merge_incompat2.q.out | 12 +-
.../clientpositive/llap/orc_ppd_date.q.out | 6 +-
.../clientpositive/llap/orc_ppd_decimal.q.out | 6 +-
.../clientpositive/llap/orc_ppd_timestamp.q.out | 6 +-
.../clientpositive/llap/orc_ppd_varchar.q.out | 6 +-
.../llap/orc_predicate_pushdown.q.out | 28 +-
.../llap/orc_split_elimination.q.out | 256 ++++---------
.../results/clientpositive/llap/parallel.q.out | 8 +-
.../llap/parquet_predicate_pushdown.q.out | 26 +-
.../clientpositive/llap/parquet_types.q.out | 8 +-
.../llap/partition_multilevels.q.out | 72 ++--
.../clientpositive/llap/ppd_union_view.q.out | 8 +-
.../test/results/clientpositive/llap/ptf.q.out | 142 +++-----
.../clientpositive/llap/ptf_matchpath.q.out | 22 +-
.../clientpositive/llap/ptf_streaming.q.out | 76 ++--
.../llap/reduce_deduplicate_extended.q.out | 68 ++--
.../results/clientpositive/llap/sample1.q.out | 6 +-
.../results/clientpositive/llap/sample10.q.out | 8 +-
.../llap/schema_evol_orc_acid_part.q.out | 252 +++----------
.../llap/schema_evol_orc_acid_part_update.q.out | 102 ++----
.../llap/schema_evol_orc_acid_table.q.out | 252 +++----------
.../schema_evol_orc_acid_table_update.q.out | 90 ++---
.../llap/schema_evol_orc_acidvec_part.q.out | 252 +++----------
.../schema_evol_orc_acidvec_part_update.q.out | 90 ++---
.../llap/schema_evol_orc_acidvec_table.q.out | 252 +++----------
.../schema_evol_orc_acidvec_table_update.q.out | 90 ++---
.../llap/schema_evol_orc_nonvec_part.q.out | 248 +++----------
...chema_evol_orc_nonvec_part_all_complex.q.out | 64 +---
...ema_evol_orc_nonvec_part_all_primitive.q.out | 118 ++----
.../llap/schema_evol_orc_nonvec_table.q.out | 248 +++----------
.../llap/schema_evol_orc_vec_part.q.out | 248 +++----------
.../schema_evol_orc_vec_part_all_complex.q.out | 64 +---
...schema_evol_orc_vec_part_all_primitive.q.out | 118 ++----
.../llap/schema_evol_orc_vec_table.q.out | 248 +++----------
.../clientpositive/llap/schema_evol_stats.q.out | 12 +-
.../llap/schema_evol_text_nonvec_part.q.out | 248 +++----------
...hema_evol_text_nonvec_part_all_complex.q.out | 64 +---
...ma_evol_text_nonvec_part_all_primitive.q.out | 118 ++----
.../llap/schema_evol_text_nonvec_table.q.out | 248 +++----------
.../schema_evol_text_vec_part_all_complex.q.out | 68 +---
...chema_evol_text_vec_part_all_primitive.q.out | 122 ++-----
.../llap/schema_evol_text_vec_table.q.out | 252 +++----------
.../llap/schema_evol_text_vecrow_part.q.out | 252 +++----------
...hema_evol_text_vecrow_part_all_complex.q.out | 70 +---
...ma_evol_text_vecrow_part_all_primitive.q.out | 122 ++-----
.../llap/schema_evol_text_vecrow_table.q.out | 252 +++----------
.../llap/selectDistinctStar.q.out | 16 +-
.../llap/select_dummy_source.q.out | 18 +-
.../results/clientpositive/llap/semijoin.q.out | 8 +-
.../results/clientpositive/llap/skewjoin.q.out | 8 +-
.../clientpositive/llap/skewjoinopt15.q.out | 38 +-
.../clientpositive/llap/smb_mapjoin_14.q.out | 94 ++---
.../clientpositive/llap/smb_mapjoin_15.q.out | 46 +--
.../clientpositive/llap/smb_mapjoin_17.q.out | 26 +-
.../clientpositive/llap/smb_mapjoin_18.q.out | 24 +-
.../clientpositive/llap/smb_mapjoin_19.q.out | 14 +-
.../clientpositive/llap/smb_mapjoin_4.q.out | 8 +-
.../clientpositive/llap/smb_mapjoin_5.q.out | 8 +-
.../llap/special_character_in_tabnames_1.q.out | 356 ++++---------------
.../clientpositive/llap/stats_noscan_1.q.out | 28 +-
.../clientpositive/llap/subquery_exists.q.out | 36 +-
.../clientpositive/llap/subquery_in.q.out | 184 ++++------
.../clientpositive/llap/subquery_multi.q.out | 86 ++---
.../clientpositive/llap/subquery_notin.q.out | 174 +++------
.../clientpositive/llap/subquery_views.q.out | 28 +-
.../llap/table_access_keys_stats.q.out | 71 ++--
.../results/clientpositive/llap/tez_dml.q.out | 34 +-
.../llap/tez_dynpart_hashjoin_1.q.out | 12 +-
.../llap/tez_dynpart_hashjoin_2.q.out | 22 +-
.../clientpositive/llap/tez_join_hash.q.out | 8 +-
.../llap/tez_join_result_complex.q.out | 16 +-
.../clientpositive/llap/tez_join_tests.q.out | 8 +-
.../clientpositive/llap/tez_joins_explain.q.out | 6 +-
.../clientpositive/llap/tez_multi_union.q.out | 6 +-
.../llap/tez_schema_evolution.q.out | 8 +-
.../clientpositive/llap/tez_smb_empty.q.out | 8 +-
.../llap/tez_union_multiinsert.q.out | 8 +-
.../llap/tez_vector_dynpart_hashjoin_1.q.out | 12 +-
.../llap/tez_vector_dynpart_hashjoin_2.q.out | 22 +-
.../clientpositive/llap/uber_reduce.q.out | 10 +-
.../llap/udaf_collect_set_2.q.out | 124 ++-----
.../results/clientpositive/llap/union2.q.out | 10 +-
.../results/clientpositive/llap/union3.q.out | 8 +-
.../results/clientpositive/llap/union4.q.out | 14 +-
.../results/clientpositive/llap/union5.q.out | 10 +-
.../results/clientpositive/llap/union6.q.out | 12 +-
.../results/clientpositive/llap/union7.q.out | 10 +-
.../results/clientpositive/llap/union8.q.out | 10 +-
.../results/clientpositive/llap/union9.q.out | 10 +-
.../clientpositive/llap/unionDistinct_2.q.out | 8 +-
.../clientpositive/llap/union_remove_26.q.out | 26 +-
.../clientpositive/llap/union_top_level.q.out | 28 +-
.../llap/update_after_multiple_inserts.q.out | 8 +-
.../clientpositive/llap/update_all_types.q.out | 8 +-
.../clientpositive/llap/varchar_udf1.q.out | 18 +-
.../llap/vector_adaptor_usage_mode.q.out | 8 +-
.../llap/vector_aggregate_9.q.out | 8 +-
.../llap/vector_auto_smb_mapjoin_14.q.out | 110 ++----
.../llap/vector_between_columns.q.out | 12 +-
.../clientpositive/llap/vector_between_in.q.out | 8 +-
.../llap/vector_binary_join_groupby.q.out | 14 +-
.../llap/vector_cast_constant.q.out | 6 +-
.../clientpositive/llap/vector_char_2.q.out | 12 +-
.../llap/vector_char_mapjoin1.q.out | 42 +--
.../clientpositive/llap/vector_coalesce.q.out | 8 +-
.../llap/vector_complex_join.q.out | 8 +-
.../clientpositive/llap/vector_count.q.out | 8 +-
.../llap/vector_count_distinct.q.out | 16 +-
.../clientpositive/llap/vector_data_types.q.out | 6 +-
.../clientpositive/llap/vector_date_1.q.out | 28 +-
.../llap/vector_decimal_aggregate.q.out | 16 +-
.../llap/vector_decimal_mapjoin.q.out | 8 +-
.../llap/vector_decimal_math_funcs.q.out | 24 +-
.../llap/vector_decimal_round_2.q.out | 22 +-
.../llap/vector_decimal_udf.q.out | 114 ++----
.../clientpositive/llap/vector_distinct_2.q.out | 8 +-
.../clientpositive/llap/vector_groupby4.q.out | 8 +-
.../clientpositive/llap/vector_groupby6.q.out | 8 +-
.../clientpositive/llap/vector_groupby_3.q.out | 8 +-
.../llap/vector_groupby_mapjoin.q.out | 6 +-
.../llap/vector_grouping_sets.q.out | 8 +-
.../llap/vector_include_no_sel.q.out | 22 +-
.../clientpositive/llap/vector_interval_1.q.out | 42 +--
.../clientpositive/llap/vector_interval_2.q.out | 20 +-
.../llap/vector_interval_arithmetic.q.out | 12 +-
.../test/results/clientpositive/mapjoin46.q.out | 108 ++----
.../clientpositive/multi_insert_gby4.q.out | 8 +-
.../clientpositive/nested_column_pruning.q.out | 86 ++---
.../results/clientpositive/smb_mapjoin_46.q.out | 102 ++----
.../clientpositive/spark/auto_join29.q.out | 8 +-
.../results/clientpositive/spark/groupby6.q.out | 8 +-
.../clientpositive/spark/join_array.q.out | 8 +-
.../clientpositive/spark/limit_pushdown2.q.out | 12 +-
.../results/clientpositive/spark/merge1.q.out | 8 +-
...i_insert_move_tasks_share_dependencies.q.out | 8 +-
.../spark/runtime_skewjoin_mapjoin_spark.q.out | 8 +-
.../clientpositive/spark/subquery_exists.q.out | 6 +-
.../clientpositive/spark/subquery_in.q.out | 132 +++----
.../clientpositive/spark/udf_percentile.q.out | 4 +-
.../results/clientpositive/spark/union8.q.out | 10 +-
.../spark/vector_decimal_mapjoin.q.out | 8 +-
.../clientpositive/subquery_exists.q.out | 6 +-
.../clientpositive/subquery_notexists.q.out | 6 +-
.../clientpositive/subquery_notin_having.q.out | 16 +-
.../subquery_unqualcolumnrefs.q.out | 3 +-
.../clientpositive/udf_array_contains.q.out | 12 +-
.../test/results/clientpositive/udf_conv.q.out | 5 +-
.../results/clientpositive/udf_date_add.q.out | 6 +-
.../results/clientpositive/udf_date_sub.q.out | 6 +-
.../test/results/clientpositive/udf_hex.q.out | 4 +-
.../clientpositive/udf_java_method.q.out | 4 +-
.../results/clientpositive/udf_map_keys.q.out | 12 +-
.../results/clientpositive/udf_map_values.q.out | 12 +-
.../clientpositive/udf_months_between.q.out | 6 +-
.../results/clientpositive/udf_negative.q.out | 6 +-
.../test/results/clientpositive/udf_not.q.out | 6 +-
.../results/clientpositive/udf_percentile.q.out | 4 +-
.../results/clientpositive/udf_positive.q.out | 6 +-
.../results/clientpositive/udf_sort_array.q.out | 39 +-
.../results/clientpositive/udf_translate.q.out | 6 +-
.../test/results/clientpositive/udf_trunc.q.out | 3 +-
.../test/results/clientpositive/udf_unhex.q.out | 4 +-
.../results/clientpositive/uniquejoin.q.out | 8 +-
.../update_after_multiple_inserts.q.out | 8 +-
...er_multiple_inserts_special_characters.q.out | 8 +-
.../clientpositive/update_all_types.q.out | 8 +-
.../clientpositive/update_orig_table.q.out | 8 +-
.../test/results/clientpositive/varchar_1.q.out | 30 +-
.../test/results/clientpositive/varchar_2.q.out | 12 +-
.../results/clientpositive/varchar_join1.q.out | 18 +-
.../clientpositive/varchar_nested_types.q.out | 30 +-
.../results/clientpositive/varchar_serde.q.out | 60 +---
.../results/clientpositive/varchar_union1.q.out | 18 +-
.../clientpositive/vector_aggregate_9.q.out | 8 +-
.../vector_binary_join_groupby.q.out | 14 +-
.../clientpositive/vector_cast_constant.q.out | 6 +-
.../results/clientpositive/vector_char_2.q.out | 12 +-
.../clientpositive/vector_char_mapjoin1.q.out | 42 +--
.../clientpositive/vector_char_simple.q.out | 18 +-
.../clientpositive/vector_coalesce.q.out | 8 +-
.../clientpositive/vector_complex_join.q.out | 8 +-
.../results/clientpositive/vector_count.q.out | 8 +-
.../clientpositive/vector_data_types.q.out | 6 +-
.../results/clientpositive/vector_date_1.q.out | 28 +-
.../vector_decimal_aggregate.q.out | 16 +-
.../vector_decimal_expressions.q.out | 8 +-
.../clientpositive/vector_decimal_round_2.q.out | 22 +-
.../clientpositive/vector_distinct_2.q.out | 8 +-
.../clientpositive/vector_empty_where.q.out | 6 +-
.../clientpositive/vector_groupby4.q.out | 8 +-
.../clientpositive/vector_groupby6.q.out | 8 +-
.../clientpositive/vector_groupby_3.q.out | 8 +-
.../clientpositive/vector_groupby_mapjoin.q.out | 6 +-
.../clientpositive/vector_grouping_sets.q.out | 8 +-
.../clientpositive/vector_include_no_sel.q.out | 22 +-
.../clientpositive/vector_interval_1.q.out | 42 +--
.../vector_interval_arithmetic.q.out | 12 +-
.../clientpositive/vectorization_2.q.out | 8 +-
.../clientpositive/vectorization_3.q.out | 8 +-
.../clientpositive/vectorization_4.q.out | 8 +-
.../clientpositive/vectorization_5.q.out | 8 +-
.../clientpositive/vectorization_7.q.out | 14 +-
.../clientpositive/vectorization_8.q.out | 14 +-
.../clientpositive/vectorization_9.q.out | 8 +-
.../clientpositive/vectorization_div0.q.out | 24 +-
.../clientpositive/vectorization_limit.q.out | 32 +-
.../vectorized_bucketmapjoin1.q.out | 14 +-
.../clientpositive/vectorized_date_funcs.q.out | 24 +-
.../clientpositive/vectorized_mapjoin.q.out | 8 +-
.../vectorized_parquet_types.q.out | 12 +-
.../vectorized_rcfile_columnar.q.out | 10 +-
.../clientpositive/vectorized_shufflejoin.q.out | 8 +-
.../vectorized_timestamp_funcs.q.out | 32 +-
ql/src/test/results/clientpositive/view.q.out | 48 +--
.../results/clientpositive/view_inputs.q.out | 8 +-
.../windowing_columnPruning.q.out | 18 +-
.../clientpositive/windowing_distinct.q.out | 18 +-
.../clientpositive/windowing_expressions.q.out | 6 +-
.../results/clientpositive/windowing_rank.q.out | 8 +-
.../clientpositive/windowing_streaming.q.out | 12 +-
.../clientpositive/windowing_udaf2.q.out | 6 +-
.../clientpositive/windowing_windowspec.q.out | 6 +-
.../clientpositive/windowing_windowspec3.q.out | 38 +-
.../clientpositive/windowing_windowspec4.q.out | 8 +-
273 files changed, 2535 insertions(+), 8238 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/acid_subquery.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/acid_subquery.q.out b/ql/src/test/results/clientpositive/acid_subquery.q.out
index b977768..b6402e4 100644
--- a/ql/src/test/results/clientpositive/acid_subquery.q.out
+++ b/ql/src/test/results/clientpositive/acid_subquery.q.out
@@ -36,8 +36,7 @@ POSTHOOK: Lineage: target PARTITION(p=1,q=3).a EXPRESSION [(values__tmp__table__
POSTHOOK: Lineage: target PARTITION(p=1,q=3).b EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
POSTHOOK: Lineage: target PARTITION(p=2,q=2).a EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
POSTHOOK: Lineage: target PARTITION(p=2,q=2).b EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
-PREHOOK: query: -- the intent here is to record the set of ReadEntity and WriteEntity objects for these 2 update statements
-update target set b = 1 where p in (select t.q1 from source t where t.a1=5)
+PREHOOK: query: update target set b = 1 where p in (select t.q1 from source t where t.a1=5)
PREHOOK: type: QUERY
PREHOOK: Input: default@source
PREHOOK: Input: default@target
@@ -47,8 +46,7 @@ PREHOOK: Input: default@target@p=2/q=2
PREHOOK: Output: default@target@p=1/q=2
PREHOOK: Output: default@target@p=1/q=3
PREHOOK: Output: default@target@p=2/q=2
-POSTHOOK: query: -- the intent here is to record the set of ReadEntity and WriteEntity objects for these 2 update statements
-update target set b = 1 where p in (select t.q1 from source t where t.a1=5)
+POSTHOOK: query: update target set b = 1 where p in (select t.q1 from source t where t.a1=5)
POSTHOOK: type: QUERY
POSTHOOK: Input: default@source
POSTHOOK: Input: default@target
@@ -70,8 +68,7 @@ POSTHOOK: Input: default@source
POSTHOOK: Input: default@target
POSTHOOK: Input: default@target@p=2/q=2
POSTHOOK: Output: default@source
-PREHOOK: query: -- the extra predicates in when matched clause match 1 partition
-merge into target t using source s on t.a = s.a1 when matched and p = 1 and q = 2 then update set b = 1 when matched and p = 2 and q = 2 then delete when not matched and a1 > 100 then insert values(s.a1,s.b1,s.p1, s.q1)
+PREHOOK: query: merge into target t using source s on t.a = s.a1 when matched and p = 1 and q = 2 then update set b = 1 when matched and p = 2 and q = 2 then delete when not matched and a1 > 100 then insert values(s.a1,s.b1,s.p1, s.q1)
PREHOOK: type: QUERY
PREHOOK: Input: default@source
PREHOOK: Input: default@target
@@ -85,8 +82,7 @@ PREHOOK: Output: default@target@p=1/q=3
PREHOOK: Output: default@target@p=1/q=3
PREHOOK: Output: default@target@p=2/q=2
PREHOOK: Output: default@target@p=2/q=2
-POSTHOOK: query: -- the extra predicates in when matched clause match 1 partition
-merge into target t using source s on t.a = s.a1 when matched and p = 1 and q = 2 then update set b = 1 when matched and p = 2 and q = 2 then delete when not matched and a1 > 100 then insert values(s.a1,s.b1,s.p1, s.q1)
+POSTHOOK: query: merge into target t using source s on t.a = s.a1 when matched and p = 1 and q = 2 then update set b = 1 when matched and p = 2 and q = 2 then delete when not matched and a1 > 100 then insert values(s.a1,s.b1,s.p1, s.q1)
POSTHOOK: type: QUERY
POSTHOOK: Input: default@source
POSTHOOK: Input: default@target
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/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 f4b9ca4..b4d46d2 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
@@ -415,11 +415,9 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: -- widening cast: inferred PK-FK, thus same row count as previous query
-explain select s.s_store_sk from store_bigint s join store_sales ss on (s.s_store_sk = ss.ss_store_sk)
+PREHOOK: query: explain select s.s_store_sk from store_bigint s join store_sales ss on (s.s_store_sk = ss.ss_store_sk)
PREHOOK: type: QUERY
-POSTHOOK: query: -- widening cast: inferred PK-FK, thus same row count as previous query
-explain select s.s_store_sk from store_bigint s join store_sales ss on (s.s_store_sk = ss.ss_store_sk)
+POSTHOOK: query: explain select s.s_store_sk from store_bigint s join store_sales ss on (s.s_store_sk = ss.ss_store_sk)
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/avrocountemptytbl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/avrocountemptytbl.q.out b/ql/src/test/results/clientpositive/avrocountemptytbl.q.out
index afaab34..72e8489 100644
--- a/ql/src/test/results/clientpositive/avrocountemptytbl.q.out
+++ b/ql/src/test/results/clientpositive/avrocountemptytbl.q.out
@@ -1,10 +1,6 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-drop table if exists emptyavro
+PREHOOK: query: drop table if exists emptyavro
PREHOOK: type: DROPTABLE
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-drop table if exists emptyavro
+POSTHOOK: query: drop table if exists emptyavro
POSTHOOK: type: DROPTABLE
PREHOOK: query: create table emptyavro (a int) stored as avro
PREHOOK: type: CREATETABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/cbo_rp_udf_percentile.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_udf_percentile.q.out b/ql/src/test/results/clientpositive/cbo_rp_udf_percentile.q.out
index eba7dbe..e3033e7 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_udf_percentile.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_udf_percentile.q.out
@@ -10,9 +10,7 @@ POSTHOOK: type: DESCFUNCTION
percentile(expr, pc) - Returns the percentile(s) of expr at pc (range: [0,1]).pc can be a double or double array
Function class:org.apache.hadoop.hive.ql.udf.UDAFPercentile
Function type:BUILTIN
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-SELECT CAST(key AS INT) DIV 10,
+PREHOOK: query: SELECT CAST(key AS INT) DIV 10,
percentile(CAST(substr(value, 5) AS INT), 0.0),
percentile(CAST(substr(value, 5) AS INT), 0.5),
percentile(CAST(substr(value, 5) AS INT), 1.0),
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/cbo_rp_udf_percentile2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_udf_percentile2.q.out b/ql/src/test/results/clientpositive/cbo_rp_udf_percentile2.q.out
index c9b385e..769f51f 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_udf_percentile2.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_udf_percentile2.q.out
@@ -10,9 +10,7 @@ POSTHOOK: type: DESCFUNCTION
percentile(expr, pc) - Returns the percentile(s) of expr at pc (range: [0,1]).pc can be a double or double array
Function class:org.apache.hadoop.hive.ql.udf.UDAFPercentile
Function type:BUILTIN
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-SELECT CAST(key AS INT) DIV 10,
+PREHOOK: query: SELECT CAST(key AS INT) DIV 10,
count(distinct(value)),
percentile(CAST(substr(value, 5) AS INT), 0.0),
percentile(CAST(substr(value, 5) AS INT), 0.5),
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/create_or_replace_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_or_replace_view.q.out b/ql/src/test/results/clientpositive/create_or_replace_view.q.out
index cfe536d..2ad6b47 100644
--- a/ql/src/test/results/clientpositive/create_or_replace_view.q.out
+++ b/ql/src/test/results/clientpositive/create_or_replace_view.q.out
@@ -48,14 +48,12 @@ Sort Columns: []
View Original Text: select * from srcpart
View Expanded Text: select `srcpart`.`key`, `srcpart`.`value`, `srcpart`.`ds`, `srcpart`.`hr` from `default`.`srcpart`
View Rewrite Enabled: No
-PREHOOK: query: -- modifying definition of unpartitioned view
-create or replace view vt.v partitioned on (ds, hr) as select * from srcpart
+PREHOOK: query: create or replace view vt.v partitioned on (ds, hr) as select * from srcpart
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@srcpart
PREHOOK: Output: database:vt
PREHOOK: Output: vt@v
-POSTHOOK: query: -- modifying definition of unpartitioned view
-create or replace view vt.v partitioned on (ds, hr) as select * from srcpart
+POSTHOOK: query: create or replace view vt.v partitioned on (ds, hr) as select * from srcpart
POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@srcpart
POSTHOOK: Output: database:vt
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/decimal_udf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_udf.q.out b/ql/src/test/results/clientpositive/decimal_udf.q.out
index 3b5aa6a..6e72f77 100644
--- a/ql/src/test/results/clientpositive/decimal_udf.q.out
+++ b/ql/src/test/results/clientpositive/decimal_udf.q.out
@@ -1347,7 +1347,6 @@ POSTHOOK: query: SELECT value, sum(key) / count(key), avg(key), sum(key) FROM DE
POSTHOOK: type: QUERY
POSTHOOK: Input: default@decimal_udf
#### A masked pattern was here ####
-<<<<<<< HEAD
-1234567890 -1234567890.123456789000000000 -1234567890.12345678900000 -1234567890.1234567890
-1255 -1255.490000000000000000 -1255.49000000000000 -1255.4900000000
-11 -1.122000000000000000 -1.12200000000000 -1.1220000000
@@ -1365,28 +1364,7 @@ POSTHOOK: Input: default@decimal_udf
200 200.000000000000000000 200.00000000000000 200.0000000000
4400 -4400.000000000000000000 -4400.00000000000000 -4400.0000000000
1234567890 1234567890.123456780000000000 1234567890.12345678000000 1234567890.1234567800
-PREHOOK: query: -- negative
-EXPLAIN SELECT -key FROM DECIMAL_UDF
-=======
--1234567890 -1234567890.12345678900000000000000 -1234567890.12345678900000 -1234567890.1234567890
--1255 -1255.49000000000000000000000 -1255.49000000000000 -1255.4900000000
--11 -1.12200000000000000000000 -1.12200000000000 -1.1220000000
--1 -1.12000000000000000000000 -1.12000000000000 -2.2400000000
-0 0.02538461538461538461538 0.02538461538462 0.3300000000
-1 1.04840000000000000000000 1.04840000000000 5.2420000000
-2 2.00000000000000000000000 2.00000000000000 4.0000000000
-3 3.14000000000000000000000 3.14000000000000 9.4200000000
-4 3.14000000000000000000000 3.14000000000000 3.1400000000
-10 10.00000000000000000000000 10.00000000000000 10.0000000000
-20 20.00000000000000000000000 20.00000000000000 20.0000000000
-100 100.00000000000000000000000 100.00000000000000 100.0000000000
-124 124.00000000000000000000000 124.00000000000000 124.0000000000
-125 125.20000000000000000000000 125.20000000000000 125.2000000000
-200 200.00000000000000000000000 200.00000000000000 200.0000000000
-4400 -4400.00000000000000000000000 -4400.00000000000000 -4400.0000000000
-1234567890 1234567890.12345678000000000000000 1234567890.12345678000000 1234567890.1234567800
PREHOOK: query: EXPLAIN SELECT -key FROM DECIMAL_UDF
->>>>>>> diff
PREHOOK: type: QUERY
POSTHOOK: query: EXPLAIN SELECT -key FROM DECIMAL_UDF
POSTHOOK: type: QUERY
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/join46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join46.q.out b/ql/src/test/results/clientpositive/join46.q.out
index ca4a27b..123e3c5 100644
--- a/ql/src/test/results/clientpositive/join46.q.out
+++ b/ql/src/test/results/clientpositive/join46.q.out
@@ -36,14 +36,12 @@ POSTHOOK: Output: default@test2
POSTHOOK: Lineage: test2.col_2 SIMPLE [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col3, type:string, comment:), ]
POSTHOOK: Lineage: test2.key EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
POSTHOOK: Lineage: test2.value EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
-PREHOOK: query: -- Basic outer join
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Basic outer join
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value)
@@ -127,16 +125,14 @@ NULL NULL None NULL NULL NULL
101 2 Car 102 2 Del
99 2 Mat 103 2 Ema
99 2 Mat 102 2 Del
-PREHOOK: query: -- Conjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
AND test1.key between 100 and 102
AND test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Conjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -231,15 +227,13 @@ NULL NULL None NULL NULL NULL
101 2 Car 102 2 Del
99 2 Mat NULL NULL NULL
Warning: Shuffle Join JOIN[7][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Conjunction with pred on single inputs (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102
AND test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Conjunction with pred on single inputs (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102
@@ -327,14 +321,12 @@ POSTHOOK: Input: default@test2
99 0 Alice NULL NULL NULL
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
-PREHOOK: query: -- Conjunction with pred on multiple inputs and none (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value AND true)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Conjunction with pred on multiple inputs and none (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value AND true)
@@ -417,14 +409,12 @@ NULL NULL NULL 105 NULL None
99 2 Mat 102 2 Del
NULL NULL NULL 104 3 Fli
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102)
@@ -513,16 +503,14 @@ POSTHOOK: Input: default@test2
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -616,15 +604,13 @@ POSTHOOK: Input: default@test2
98 NULL None 102 2 Del
NULL NULL None 102 2 Del
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and left input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and left input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -715,15 +701,13 @@ POSTHOOK: Input: default@test2
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and right input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and right input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -808,16 +792,14 @@ POSTHOOK: Input: default@test2
99 0 Alice 102 2 Del
98 NULL None 102 2 Del
NULL NULL None 102 2 Del
-PREHOOK: query: -- Keys plus residual (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
AND (test1.key between 100 and 102
OR test2.key between 100 and 102))
PREHOOK: type: QUERY
-POSTHOOK: query: -- Keys plus residual (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -908,15 +890,13 @@ NULL NULL None NULL NULL NULL
101 2 Car 102 2 Del
99 2 Mat 102 2 Del
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Complex condition, projecting columns
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT col_1, col_2
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key=test2.key)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Complex condition, projecting columns
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT col_1, col_2
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1006,16 +986,14 @@ Alice NULL
None NULL
None NULL
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1109,15 +1087,13 @@ POSTHOOK: Input: default@test2
98 NULL None 102 2 Del
NULL NULL None 102 2 Del
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and left input (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and left input (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1205,15 +1181,13 @@ POSTHOOK: Input: default@test2
99 2 Mat 103 2 Ema
99 2 Mat 102 2 Del
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and right input (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and right input (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1300,16 +1274,14 @@ POSTHOOK: Input: default@test2
NULL NULL None 102 2 Del
NULL NULL NULL 105 NULL None
NULL NULL NULL 104 3 Fli
-PREHOOK: query: -- Keys plus residual (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
AND (test1.key between 100 and 102
OR test2.key between 100 and 102))
PREHOOK: type: QUERY
-POSTHOOK: query: -- Keys plus residual (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1398,16 +1370,14 @@ NULL NULL NULL 105 NULL None
99 2 Mat 102 2 Del
NULL NULL NULL 104 3 Fli
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
@@ -1501,15 +1471,13 @@ POSTHOOK: Input: default@test2
98 NULL None 102 2 Del
NULL NULL None 102 2 Del
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and left input (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and left input (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
@@ -1600,15 +1568,13 @@ POSTHOOK: Input: default@test2
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and right input (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and right input (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
@@ -1695,16 +1661,14 @@ POSTHOOK: Input: default@test2
NULL NULL None 102 2 Del
NULL NULL NULL 105 NULL None
NULL NULL NULL 104 3 Fli
-PREHOOK: query: -- Keys plus residual (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
AND (test1.key between 100 and 102
OR test2.key between 100 and 102))
PREHOOK: type: QUERY
-POSTHOOK: query: -- Keys plus residual (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
@@ -1797,8 +1761,7 @@ NULL NULL NULL 105 NULL None
99 2 Mat 102 2 Del
NULL NULL NULL 104 3 Fli
Warning: Shuffle Join JOIN[17][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product
-PREHOOK: query: -- Mixed ( FOJ (ROJ, LOJ) )
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM (
SELECT test1.key AS key1, test1.value AS value1, test1.col_1 AS col_1,
@@ -1818,8 +1781,7 @@ FULL OUTER JOIN (
) sq2
ON (sq1.value1 is null or sq2.value4 is null and sq2.value3 != sq1.value2)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Mixed ( FOJ (ROJ, LOJ) )
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM (
SELECT test1.key AS key1, test1.value AS value1, test1.col_1 AS col_1,
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/join_emit_interval.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_emit_interval.q.out b/ql/src/test/results/clientpositive/join_emit_interval.q.out
index a65ff86..1a94e6c 100644
--- a/ql/src/test/results/clientpositive/join_emit_interval.q.out
+++ b/ql/src/test/results/clientpositive/join_emit_interval.q.out
@@ -36,14 +36,12 @@ POSTHOOK: Output: default@test2
POSTHOOK: Lineage: test2.col_2 SIMPLE [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col3, type:string, comment:), ]
POSTHOOK: Lineage: test2.key EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
POSTHOOK: Lineage: test2.value EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
-PREHOOK: query: -- Equi-condition and condition on one input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value AND test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Equi-condition and condition on one input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value AND test1.key between 100 and 102)
@@ -130,14 +128,12 @@ NULL NULL None NULL NULL NULL
101 2 Car 102 2 Del
99 2 Mat NULL NULL NULL
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102)
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/join46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join46.q.out b/ql/src/test/results/clientpositive/llap/join46.q.out
index 1cd856b..f7805d4 100644
--- a/ql/src/test/results/clientpositive/llap/join46.q.out
+++ b/ql/src/test/results/clientpositive/llap/join46.q.out
@@ -36,14 +36,12 @@ POSTHOOK: Output: default@test2
POSTHOOK: Lineage: test2.col_2 SIMPLE [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col3, type:string, comment:), ]
POSTHOOK: Lineage: test2.key EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
POSTHOOK: Lineage: test2.value EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
-PREHOOK: query: -- Basic outer join
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Basic outer join
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value)
@@ -141,16 +139,14 @@ NULL NULL None NULL NULL NULL
99 2 Mat 103 2 Ema
101 2 Car 102 2 Del
101 2 Car 103 2 Ema
-PREHOOK: query: -- Conjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
AND test1.key between 100 and 102
AND test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Conjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -259,15 +255,13 @@ NULL NULL None NULL NULL NULL
99 2 Mat NULL NULL NULL
101 2 Car 102 2 Del
Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Conjunction with pred on single inputs (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102
AND test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Conjunction with pred on single inputs (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102
@@ -369,14 +363,12 @@ NULL NULL None NULL NULL NULL
99 2 Mat NULL NULL NULL
100 1 Bob 102 2 Del
101 2 Car 102 2 Del
-PREHOOK: query: -- Conjunction with pred on multiple inputs and none (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value AND true)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Conjunction with pred on multiple inputs and none (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value AND true)
@@ -473,14 +465,12 @@ NULL NULL NULL 105 NULL None
101 2 Car 103 2 Ema
NULL NULL NULL 104 3 Fli
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102)
@@ -583,16 +573,14 @@ NULL NULL None NULL NULL NULL
101 2 Car 104 3 Fli
101 2 Car 105 NULL None
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -700,15 +688,13 @@ NULL NULL None 102 2 Del
101 2 Car 104 3 Fli
101 2 Car 105 NULL None
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and left input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and left input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -813,15 +799,13 @@ NULL NULL None NULL NULL NULL
101 2 Car 104 3 Fli
101 2 Car 105 NULL None
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and right input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and right input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -920,16 +904,14 @@ NULL NULL None 102 2 Del
100 1 Bob 102 2 Del
101 2 Car 102 2 Del
101 2 Car 103 2 Ema
-PREHOOK: query: -- Keys plus residual (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
AND (test1.key between 100 and 102
OR test2.key between 100 and 102))
PREHOOK: type: QUERY
-POSTHOOK: query: -- Keys plus residual (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1034,15 +1016,13 @@ NULL NULL None NULL NULL NULL
101 2 Car 102 2 Del
101 2 Car 103 2 Ema
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Complex condition, projecting columns
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT col_1, col_2
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key=test2.key)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Complex condition, projecting columns
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT col_1, col_2
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1146,16 +1126,14 @@ Bob NULL
Car Del
Car Ema
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1263,15 +1241,13 @@ NULL NULL None 102 2 Del
101 2 Car 104 3 Fli
101 2 Car 105 NULL None
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and left input (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and left input (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1373,15 +1349,13 @@ POSTHOOK: Input: default@test2
101 2 Car 104 3 Fli
101 2 Car 105 NULL None
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and right input (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and right input (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1482,16 +1456,14 @@ NULL NULL None 102 2 Del
101 2 Car 103 2 Ema
NULL NULL NULL 104 3 Fli
NULL NULL NULL 105 NULL None
-PREHOOK: query: -- Keys plus residual (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
AND (test1.key between 100 and 102
OR test2.key between 100 and 102))
PREHOOK: type: QUERY
-POSTHOOK: query: -- Keys plus residual (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 RIGHT OUTER JOIN test2
ON (test1.value=test2.value
@@ -1594,16 +1566,14 @@ NULL NULL NULL 105 NULL None
101 2 Car 103 2 Ema
NULL NULL NULL 104 3 Fli
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
@@ -1711,15 +1681,13 @@ NULL NULL None 102 2 Del
101 2 Car 104 3 Fli
101 2 Car 105 NULL None
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and left input (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
OR test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and left input (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
@@ -1824,15 +1792,13 @@ NULL NULL None NULL NULL NULL
101 2 Car 104 3 Fli
101 2 Car 105 NULL None
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and right input (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
OR test2.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and right input (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
@@ -1933,16 +1899,14 @@ NULL NULL None 102 2 Del
101 2 Car 103 2 Ema
NULL NULL NULL 104 3 Fli
NULL NULL NULL 105 NULL None
-PREHOOK: query: -- Keys plus residual (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
AND (test1.key between 100 and 102
OR test2.key between 100 and 102))
PREHOOK: type: QUERY
-POSTHOOK: query: -- Keys plus residual (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
ON (test1.value=test2.value
@@ -2049,8 +2013,7 @@ NULL NULL None NULL NULL NULL
101 2 Car 103 2 Ema
NULL NULL NULL 104 3 Fli
Warning: Shuffle Join MERGEJOIN[26][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: -- Mixed ( FOJ (ROJ, LOJ) )
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM (
SELECT test1.key AS key1, test1.value AS value1, test1.col_1 AS col_1,
@@ -2070,8 +2033,7 @@ FULL OUTER JOIN (
) sq2
ON (sq1.value1 is null or sq2.value4 is null and sq2.value3 != sq1.value2)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Mixed ( FOJ (ROJ, LOJ) )
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM (
SELECT test1.key AS key1, test1.value AS value1, test1.col_1 AS col_1,
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/join_emit_interval.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join_emit_interval.q.out b/ql/src/test/results/clientpositive/llap/join_emit_interval.q.out
index f576f81..e8a87f1 100644
--- a/ql/src/test/results/clientpositive/llap/join_emit_interval.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_emit_interval.q.out
@@ -36,14 +36,12 @@ POSTHOOK: Output: default@test2
POSTHOOK: Lineage: test2.col_2 SIMPLE [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col3, type:string, comment:), ]
POSTHOOK: Lineage: test2.key EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
POSTHOOK: Lineage: test2.value EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
-PREHOOK: query: -- Equi-condition and condition on one input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value AND test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Equi-condition and condition on one input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.value=test2.value AND test1.key between 100 and 102)
@@ -144,14 +142,12 @@ NULL NULL None NULL NULL NULL
101 2 Car 102 2 Del
101 2 Car 103 2 Ema
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102)
PREHOOK: type: QUERY
-POSTHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
SELECT *
FROM test1 LEFT OUTER JOIN test2
ON (test1.key between 100 and 102)
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/join_filters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join_filters.q.out b/ql/src/test/results/clientpositive/llap/join_filters.q.out
index 6eebf83..b730d30 100644
--- a/ql/src/test/results/clientpositive/llap/join_filters.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_filters.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_AND_HASH_QUERY_RESULTS
-
-CREATE TABLE myinput1(key int, value int)
+PREHOOK: query: CREATE TABLE myinput1(key int, value int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@myinput1
-POSTHOOK: query: -- SORT_AND_HASH_QUERY_RESULTS
-
-CREATE TABLE myinput1(key int, value int)
+POSTHOOK: query: CREATE TABLE myinput1(key int, value int)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@myinput1
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/join_nulls.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join_nulls.q.out b/ql/src/test/results/clientpositive/llap/join_nulls.q.out
index a1411cd..c9876d3 100644
--- a/ql/src/test/results/clientpositive/llap/join_nulls.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_nulls.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE myinput1(key int, value int)
+PREHOOK: query: CREATE TABLE myinput1(key int, value int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@myinput1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE myinput1(key int, value int)
+POSTHOOK: query: CREATE TABLE myinput1(key int, value int)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@myinput1
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out b/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out
index 7e3b67d..71685aa 100644
--- a/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE myinput1(key int, value int)
+PREHOOK: query: CREATE TABLE myinput1(key int, value int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@myinput1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE myinput1(key int, value int)
+POSTHOOK: query: CREATE TABLE myinput1(key int, value int)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@myinput1
@@ -18,11 +14,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' INTO TABLE my
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@myinput1
-PREHOOK: query: -- merging
-explain select * from myinput1 a join myinput1 b on a.key<=>b.value
+PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value
PREHOOK: type: QUERY
-POSTHOOK: query: -- merging
-explain select * from myinput1 a join myinput1 b on a.key<=>b.value
+POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -92,13 +86,11 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: -- SORT_QUERY_RESULTS
-select * from myinput1 a join myinput1 b on a.key<=>b.value
+PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value
PREHOOK: type: QUERY
PREHOOK: Input: default@myinput1
#### A masked pattern was here ####
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-select * from myinput1 a join myinput1 b on a.key<=>b.value
+POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value
POSTHOOK: type: QUERY
POSTHOOK: Input: default@myinput1
#### A masked pattern was here ####
@@ -541,13 +533,11 @@ POSTHOOK: Input: default@myinput1
100 100 100 100 100 100
NULL 10 10 NULL NULL 10
NULL NULL NULL NULL NULL NULL
-PREHOOK: query: -- outer joins
-SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ON a.key<=>b.value
+PREHOOK: query: SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ON a.key<=>b.value
PREHOOK: type: QUERY
PREHOOK: Input: default@myinput1
#### A masked pattern was here ####
-POSTHOOK: query: -- outer joins
-SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ON a.key<=>b.value
+POSTHOOK: query: SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ON a.key<=>b.value
POSTHOOK: type: QUERY
POSTHOOK: Input: default@myinput1
#### A masked pattern was here ####
@@ -604,13 +594,11 @@ NULL NULL 10 NULL
NULL NULL 48 NULL
NULL NULL NULL 35
NULL NULL NULL NULL
-PREHOOK: query: -- map joins
-SELECT /*+ MAPJOIN(a) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value
+PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value
PREHOOK: type: QUERY
PREHOOK: Input: default@myinput1
#### A masked pattern was here ####
-POSTHOOK: query: -- map joins
-SELECT /*+ MAPJOIN(a) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value
+POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value
POSTHOOK: type: QUERY
POSTHOOK: Input: default@myinput1
#### A masked pattern was here ####
@@ -668,13 +656,11 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in5.txt' into table sm
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@smb_input
-PREHOOK: query: -- smbs
-CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
+PREHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@smb_input1
-POSTHOOK: query: -- smbs
-CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
+POSTHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@smb_input1
@@ -1590,11 +1576,9 @@ NULL 10050 NULL 10050
NULL 35 NULL 35
NULL NULL 12 NULL
NULL NULL NULL NULL
-PREHOOK: query: --HIVE-3315 join predicate transitive
-explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL
+PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL
PREHOOK: type: QUERY
-POSTHOOK: query: --HIVE-3315 join predicate transitive
-explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL
+POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/lateral_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lateral_view.q.out b/ql/src/test/results/clientpositive/llap/lateral_view.q.out
index bb3cfcf..5bde889 100644
--- a/ql/src/test/results/clientpositive/llap/lateral_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/lateral_view.q.out
@@ -304,37 +304,31 @@ STAGE PLANS:
Number of rows: 3
ListSink
-PREHOOK: query: -- Verify that * selects columns from both tables
-SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol SORT BY key ASC, myCol ASC LIMIT 1
+PREHOOK: query: SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol SORT BY key ASC, myCol ASC LIMIT 1
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
-POSTHOOK: query: -- Verify that * selects columns from both tables
-SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol SORT BY key ASC, myCol ASC LIMIT 1
+POSTHOOK: query: SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol SORT BY key ASC, myCol ASC LIMIT 1
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
0 val_0 1
-PREHOOK: query: -- TABLE.* should be supported
-SELECT myTable.* FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LIMIT 3
+PREHOOK: query: SELECT myTable.* FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LIMIT 3
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
-POSTHOOK: query: -- TABLE.* should be supported
-SELECT myTable.* FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LIMIT 3
+POSTHOOK: query: SELECT myTable.* FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LIMIT 3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
1
2
3
-PREHOOK: query: -- Multiple lateral views should result in a Cartesian product
-SELECT myTable.myCol, myTable2.myCol2 FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW explode(array('a', 'b', 'c')) myTable2 AS myCol2 LIMIT 9
+PREHOOK: query: SELECT myTable.myCol, myTable2.myCol2 FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW explode(array('a', 'b', 'c')) myTable2 AS myCol2 LIMIT 9
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
-POSTHOOK: query: -- Multiple lateral views should result in a Cartesian product
-SELECT myTable.myCol, myTable2.myCol2 FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW explode(array('a', 'b', 'c')) myTable2 AS myCol2 LIMIT 9
+POSTHOOK: query: SELECT myTable.myCol, myTable2.myCol2 FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW explode(array('a', 'b', 'c')) myTable2 AS myCol2 LIMIT 9
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
@@ -347,13 +341,11 @@ POSTHOOK: Input: default@src
3 a
3 b
3 c
-PREHOOK: query: -- Should be able to reference tables generated earlier
-SELECT myTable2.* FROM src LATERAL VIEW explode(array(array(1,2,3))) myTable AS myCol LATERAL VIEW explode(myTable.myCol) myTable2 AS myCol2 LIMIT 3
+PREHOOK: query: SELECT myTable2.* FROM src LATERAL VIEW explode(array(array(1,2,3))) myTable AS myCol LATERAL VIEW explode(myTable.myCol) myTable2 AS myCol2 LIMIT 3
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
-POSTHOOK: query: -- Should be able to reference tables generated earlier
-SELECT myTable2.* FROM src LATERAL VIEW explode(array(array(1,2,3))) myTable AS myCol LATERAL VIEW explode(myTable.myCol) myTable2 AS myCol2 LIMIT 3
+POSTHOOK: query: SELECT myTable2.* FROM src LATERAL VIEW explode(array(array(1,2,3))) myTable AS myCol LATERAL VIEW explode(myTable.myCol) myTable2 AS myCol2 LIMIT 3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/leftsemijoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/leftsemijoin.q.out b/ql/src/test/results/clientpositive/llap/leftsemijoin.q.out
index 11f0bb0..a11bbc4 100644
--- a/ql/src/test/results/clientpositive/llap/leftsemijoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/leftsemijoin.q.out
@@ -1,10 +1,6 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-drop table sales
+PREHOOK: query: drop table sales
PREHOOK: type: DROPTABLE
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-drop table sales
+POSTHOOK: query: drop table sales
POSTHOOK: type: DROPTABLE
PREHOOK: query: drop table things
PREHOOK: type: DROPTABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/leftsemijoin_mr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/leftsemijoin_mr.q.out b/ql/src/test/results/clientpositive/llap/leftsemijoin_mr.q.out
index fe63057..ce0326c 100644
--- a/ql/src/test/results/clientpositive/llap/leftsemijoin_mr.q.out
+++ b/ql/src/test/results/clientpositive/llap/leftsemijoin_mr.q.out
@@ -30,15 +30,11 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/leftsemijoin_mr_t2.txt
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@t2
-PREHOOK: query: -- Run this query using TestMinimrCliDriver
-
-SELECT * FROM T1
+PREHOOK: query: SELECT * FROM T1
PREHOOK: type: QUERY
PREHOOK: Input: default@t1
#### A masked pattern was here ####
-POSTHOOK: query: -- Run this query using TestMinimrCliDriver
-
-SELECT * FROM T1
+POSTHOOK: query: SELECT * FROM T1
POSTHOOK: type: QUERY
POSTHOOK: Input: default@t1
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out b/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
index 3fe4837..3200165 100644
--- a/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
@@ -1,15 +1,7 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- HIVE-3562 Some limit can be pushed down to map stage
-
-explain
+PREHOOK: query: explain
select key,value from src order by key limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- HIVE-3562 Some limit can be pushed down to map stage
-
-explain
+POSTHOOK: query: explain
select key,value from src order by key limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -276,12 +268,10 @@ val_126 127.0
val_128 387.0
val_129 260.0
val_131 132.0
-PREHOOK: query: -- deduped RS
-explain
+PREHOOK: query: explain
select value,avg(key + 1) from src group by value order by value limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- deduped RS
-explain
+POSTHOOK: query: explain
select value,avg(key + 1) from src group by value order by value limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -374,12 +364,10 @@ val_126 127.0
val_128 129.0
val_129 130.0
val_131 132.0
-PREHOOK: query: -- distincts
-explain
+PREHOOK: query: explain
select distinct(cdouble) as dis from alltypesorc order by dis limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- distincts
-explain
+POSTHOOK: query: explain
select distinct(cdouble) as dis from alltypesorc order by dis limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -665,12 +653,10 @@ POSTHOOK: Input: default@alltypesorc
-63 19
-64 24
NULL 2932
-PREHOOK: query: -- multi distinct
-explain
+PREHOOK: query: explain
select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- multi distinct
-explain
+POSTHOOK: query: explain
select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -762,12 +748,10 @@ POSTHOOK: Input: default@alltypesorc
-63 3 16
-64 3 13
NULL 3065 3
-PREHOOK: query: -- limit zero
-explain
+PREHOOK: query: explain
select key,value from src order by key limit 0
PREHOOK: type: QUERY
-POSTHOOK: query: -- limit zero
-explain
+POSTHOOK: query: explain
select key,value from src order by key limit 0
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -788,12 +772,10 @@ POSTHOOK: query: select key,value from src order by key limit 0
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
-PREHOOK: query: -- 2MR (applied to last RS)
-explain
+PREHOOK: query: explain
select value, sum(key) as sum from src group by value order by sum limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- 2MR (applied to last RS)
-explain
+POSTHOOK: query: explain
select value, sum(key) as sum from src group by value order by sum limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -899,16 +881,14 @@ val_41 41.0
val_5 15.0
val_8 8.0
val_9 9.0
-PREHOOK: query: -- subqueries
-explain
+PREHOOK: query: explain
select * from
(select key, count(1) from src group by key order by key limit 2) subq
join
(select key, count(1) from src group by key limit 3) subq2
on subq.key=subq2.key limit 4
PREHOOK: type: QUERY
-POSTHOOK: query: -- subqueries
-explain
+POSTHOOK: query: explain
select * from
(select key, count(1) from src group by key order by key limit 2) subq
join
@@ -1063,12 +1043,10 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: -- map aggregation disabled
-explain
+PREHOOK: query: explain
select value, sum(key) as sum from src group by value order by value limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- map aggregation disabled
-explain
+POSTHOOK: query: explain
select value, sum(key) as sum from src group by value order by value limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -1155,12 +1133,10 @@ val_126 126.0
val_128 384.0
val_129 258.0
val_131 131.0
-PREHOOK: query: -- flush for order-by
-explain
+PREHOOK: query: explain
select key,value,value,value,value,value,value,value,value from src order by key limit 100
PREHOOK: type: QUERY
-POSTHOOK: query: -- flush for order-by
-explain
+POSTHOOK: query: explain
select key,value,value,value,value,value,value,value,value from src order by key limit 100
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -1324,12 +1300,10 @@ POSTHOOK: Input: default@src
187 val_187 val_187 val_187 val_187 val_187 val_187 val_187 val_187
187 val_187 val_187 val_187 val_187 val_187 val_187 val_187 val_187
187 val_187 val_187 val_187 val_187 val_187 val_187 val_187 val_187
-PREHOOK: query: -- flush for group-by
-explain
+PREHOOK: query: explain
select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) order by sum limit 100
PREHOOK: type: QUERY
-POSTHOOK: query: -- flush for group-by
-explain
+POSTHOOK: query: explain
select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) order by sum limit 100
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out b/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
index 229f35a..2bd42e9 100644
--- a/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
+++ b/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
@@ -282,12 +282,10 @@ val_126 127.0
val_128 387.0
val_129 260.0
val_131 132.0
-PREHOOK: query: -- deduped RS
-explain
+PREHOOK: query: explain
select value,avg(key + 1) from src group by value order by value limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- deduped RS
-explain
+POSTHOOK: query: explain
select value,avg(key + 1) from src group by value order by value limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -394,12 +392,10 @@ val_126 127.0
val_128 129.0
val_129 130.0
val_131 132.0
-PREHOOK: query: -- distincts
-explain
+PREHOOK: query: explain
select distinct(cdouble) as dis from alltypesorc order by dis limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- distincts
-explain
+POSTHOOK: query: explain
select distinct(cdouble) as dis from alltypesorc order by dis limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -726,12 +722,10 @@ NULL 2932
-48 29
-47 22
-46 24
-PREHOOK: query: -- multi distinct
-explain
+PREHOOK: query: explain
select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- multi distinct
-explain
+POSTHOOK: query: explain
select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -837,12 +831,10 @@ NULL 3065 3
-48 3 27
-47 3 23
-46 3 19
-PREHOOK: query: -- limit zero
-explain
+PREHOOK: query: explain
select key,value from src order by key limit 0
PREHOOK: type: QUERY
-POSTHOOK: query: -- limit zero
-explain
+POSTHOOK: query: explain
select key,value from src order by key limit 0
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -863,12 +855,10 @@ POSTHOOK: query: select key,value from src order by key limit 0
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
-PREHOOK: query: -- 2MR (applied to last RS)
-explain
+PREHOOK: query: explain
select value, sum(key) as sum from src group by value order by sum limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- 2MR (applied to last RS)
-explain
+POSTHOOK: query: explain
select value, sum(key) as sum from src group by value order by sum limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -974,12 +964,10 @@ val_33 33.0
val_34 34.0
val_18 36.0
val_41 41.0
-PREHOOK: query: -- map aggregation disabled
-explain
+PREHOOK: query: explain
select value, sum(key) as sum from src group by value order by value limit 20
PREHOOK: type: QUERY
-POSTHOOK: query: -- map aggregation disabled
-explain
+POSTHOOK: query: explain
select value, sum(key) as sum from src group by value order by value limit 20
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -1080,12 +1068,10 @@ val_126 126.0
val_128 384.0
val_129 258.0
val_131 131.0
-PREHOOK: query: -- flush for order-by
-explain
+PREHOOK: query: explain
select key,value,value,value,value,value,value,value,value from src order by key limit 100
PREHOOK: type: QUERY
-POSTHOOK: query: -- flush for order-by
-explain
+POSTHOOK: query: explain
select key,value,value,value,value,value,value,value,value from src order by key limit 100
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
@@ -1249,12 +1235,10 @@ POSTHOOK: Input: default@src
187 val_187 val_187 val_187 val_187 val_187 val_187 val_187 val_187
187 val_187 val_187 val_187 val_187 val_187 val_187 val_187 val_187
187 val_187 val_187 val_187 val_187 val_187 val_187 val_187 val_187
-PREHOOK: query: -- flush for group-by
-explain
+PREHOOK: query: explain
select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) order by sum limit 100
PREHOOK: type: QUERY
-POSTHOOK: query: -- flush for group-by
-explain
+POSTHOOK: query: explain
select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) order by sum limit 100
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
index 2af0d6e..53d852e 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
@@ -1,18 +1,4 @@
-PREHOOK: query: -- run this test case in minimr to ensure it works in cluster
-
--- list bucketing DML: static partition. multiple skewed columns.
--- ds=2008-04-08/hr=11/HIVE_DEFAULT_LIST_BUCKETING_DIR_NAME:
--- 5263 000000_0
--- 5263 000001_0
--- ds=2008-04-08/hr=11/key=103/value=val_103:
--- 99 000000_0
--- 99 000001_0
--- ds=2008-04-08/hr=11/key=484/value=val_484:
--- 87 000000_0
--- 87 000001_0
-
--- create a skewed table
-create table list_bucketing_static_part (key String, value String)
+PREHOOK: query: create table list_bucketing_static_part (key String, value String)
partitioned by (ds String, hr String)
skewed by (key) on ('484','51','103')
stored as DIRECTORIES
@@ -20,21 +6,7 @@ create table list_bucketing_static_part (key String, value String)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@list_bucketing_static_part
-POSTHOOK: query: -- run this test case in minimr to ensure it works in cluster
-
--- list bucketing DML: static partition. multiple skewed columns.
--- ds=2008-04-08/hr=11/HIVE_DEFAULT_LIST_BUCKETING_DIR_NAME:
--- 5263 000000_0
--- 5263 000001_0
--- ds=2008-04-08/hr=11/key=103/value=val_103:
--- 99 000000_0
--- 99 000001_0
--- ds=2008-04-08/hr=11/key=484/value=val_484:
--- 87 000000_0
--- 87 000001_0
-
--- create a skewed table
-create table list_bucketing_static_part (key String, value String)
+POSTHOOK: query: create table list_bucketing_static_part (key String, value String)
partitioned by (ds String, hr String)
skewed by (key) on ('484','51','103')
stored as DIRECTORIES
@@ -42,13 +14,11 @@ create table list_bucketing_static_part (key String, value String)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@list_bucketing_static_part
-PREHOOK: query: -- list bucketing DML without merge. use bucketize to generate a few small files.
-explain extended
+PREHOOK: query: explain extended
insert overwrite table list_bucketing_static_part partition (ds = '2008-04-08', hr = '11')
select key, value from src
PREHOOK: type: QUERY
-POSTHOOK: query: -- list bucketing DML without merge. use bucketize to generate a few small files.
-explain extended
+POSTHOOK: query: explain extended
insert overwrite table list_bucketing_static_part partition (ds = '2008-04-08', hr = '11')
select key, value from src
POSTHOOK: type: QUERY
@@ -200,12 +170,10 @@ POSTHOOK: Input: default@src
POSTHOOK: Output: default@list_bucketing_static_part@ds=2008-04-08/hr=11
POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- check DML result
-show partitions list_bucketing_static_part
+PREHOOK: query: show partitions list_bucketing_static_part
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@list_bucketing_static_part
-POSTHOOK: query: -- check DML result
-show partitions list_bucketing_static_part
+POSTHOOK: query: show partitions list_bucketing_static_part
POSTHOOK: type: SHOWPARTITIONS
POSTHOOK: Input: default@list_bucketing_static_part
ds=2008-04-08/hr=11
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out
index efd79a6..6ad9af8 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part1.q.out
@@ -1,11 +1,7 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-show partitions srcpart
+PREHOOK: query: show partitions srcpart
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@srcpart
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-show partitions srcpart
+POSTHOOK: query: show partitions srcpart
POSTHOOK: type: SHOWPARTITIONS
POSTHOOK: Input: default@srcpart
ds=2008-04-08/hr=11
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
index 52d754a..528b29d 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
@@ -1,14 +1,10 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table if not exists nzhang_part_bucket (key string, value string)
+PREHOOK: query: create table if not exists nzhang_part_bucket (key string, value string)
partitioned by (ds string, hr string)
clustered by (key) into 10 buckets
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@nzhang_part_bucket
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table if not exists nzhang_part_bucket (key string, value string)
+POSTHOOK: query: create table if not exists nzhang_part_bucket (key string, value string)
partitioned by (ds string, hr string)
clustered by (key) into 10 buckets
POSTHOOK: type: CREATETABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
index 7a5b0fc..b34975f 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part3.q.out
@@ -1,11 +1,7 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-show partitions srcpart
+PREHOOK: query: show partitions srcpart
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@srcpart
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-show partitions srcpart
+POSTHOOK: query: show partitions srcpart
POSTHOOK: type: SHOWPARTITIONS
POSTHOOK: Input: default@srcpart
ds=2008-04-08/hr=11
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
index 366eda0..c7c4c70 100644
--- a/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
@@ -1,10 +1,6 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-drop table sour1
+PREHOOK: query: drop table sour1
PREHOOK: type: DROPTABLE
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-drop table sour1
+POSTHOOK: query: drop table sour1
POSTHOOK: type: DROPTABLE
PREHOOK: query: drop table sour2
PREHOOK: type: DROPTABLE