From e8c5327926db8424fd6fcc631d0b5694ea1635d1 Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Fri, 17 Nov 2017 17:28:15 -0800 Subject: [PATCH] HIVE-18100 --- .../test/resources/testconfiguration.properties | 3 +- .../test/queries/clientpositive/explainanalyze_2.q | 2 +- .../test/queries/clientpositive/unionDistinct_1.q | 314 +-------------------- .../test/queries/clientpositive/unionDistinct_2.q | 23 -- .../test/queries/clientpositive/unionDistinct_3.q | 190 +++++++++++++ .../{tez => llap}/explainanalyze_2.q.out | 0 .../clientpositive/llap/unionDistinct_2.q.out | 108 ------- 7 files changed, 196 insertions(+), 444 deletions(-) create mode 100644 ql/src/test/queries/clientpositive/unionDistinct_3.q rename ql/src/test/results/clientpositive/{tez => llap}/explainanalyze_2.q.out (100%) diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties index 3b1005f85c..7431fffb83 100644 --- a/itests/src/test/resources/testconfiguration.properties +++ b/itests/src/test/resources/testconfiguration.properties @@ -55,7 +55,6 @@ minitez.query.files.shared=delete_orig_table.q,\ minitez.query.files=acid_vectorization_original_tez.q,\ explainuser_3.q,\ explainanalyze_1.q,\ - explainanalyze_2.q,\ explainanalyze_3.q,\ explainanalyze_4.q,\ explainanalyze_5.q,\ @@ -531,6 +530,7 @@ minillaplocal.query.files=\ escape1.q,\ escape2.q,\ exchgpartition2lel.q,\ + explainanalyze_2.q,\ explainuser_1.q,\ explainuser_4.q,\ groupby2.q,\ @@ -792,6 +792,7 @@ minillaplocal.query.files=\ smb_mapjoin_17.q,\ groupby_resolution.q,\ windowing_windowspec2.q,\ + unionDistinct_3.q,\ vectorized_join46.q,\ vectorized_multi_output_select.q,\ partialdhj.q diff --git a/ql/src/test/queries/clientpositive/explainanalyze_2.q b/ql/src/test/queries/clientpositive/explainanalyze_2.q index b764d7d2af..2a12aab0ea 100644 --- a/ql/src/test/queries/clientpositive/explainanalyze_2.q +++ b/ql/src/test/queries/clientpositive/explainanalyze_2.q @@ -1,7 +1,7 @@ set hive.map.aggr=false; set hive.strict.checks.bucketing=false; - +set hive.llap.execution.mode=auto; set hive.explain.user=true; explain analyze diff --git a/ql/src/test/queries/clientpositive/unionDistinct_1.q b/ql/src/test/queries/clientpositive/unionDistinct_1.q index f2a0dc17d1..bf2df77256 100644 --- a/ql/src/test/queries/clientpositive/unionDistinct_1.q +++ b/ql/src/test/queries/clientpositive/unionDistinct_1.q @@ -27,27 +27,6 @@ insert overwrite table tmptable select * from tmptable x sort by x.key; --- union11.q - - --- SORT_BEFORE_DIFF --- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink - -explain - select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1 - UNION DISTINCT - select 'tst2' as key, count(1) as value from src s2 - UNION DISTINCT - select 'tst3' as key, count(1) as value from src s3) unionsrc group by unionsrc.key; - - - select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1 - UNION DISTINCT - select 'tst2' as key, count(1) as value from src s2 - UNION DISTINCT - select 'tst3' as key, count(1) as value from src s3) unionsrc group by unionsrc.key; - - -- union12.q @@ -85,110 +64,6 @@ explain select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT select s2.key as key, s2.value as value from src s2) unionsrc; --- union14.q - - --- SORT_BEFORE_DIFF --- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink - -explain - select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value from src1 s2 - UNION DISTINCT - select 'tst1' as key, cast(count(1) as string) as value from src s1) - unionsrc group by unionsrc.key; - - - - select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value from src1 s2 - UNION DISTINCT - select 'tst1' as key, cast(count(1) as string) as value from src s1) - unionsrc group by unionsrc.key; --- union15.q - - --- SORT_BEFORE_DIFF --- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink - -explain - select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 - UNION DISTINCT - select s2.key as key, s2.value as value from src1 s2 - UNION DISTINCT - select s3.key as key, s3.value as value from src1 s3) unionsrc group by unionsrc.key; - - select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 - UNION DISTINCT - select s2.key as key, s2.value as value from src1 s2 - UNION DISTINCT - select s3.key as key, s3.value as value from src1 s3) unionsrc group by unionsrc.key; - - --- union16.q - --- SORT_BEFORE_DIFF -EXPLAIN -SELECT count(1) FROM ( - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src) src; - - -SELECT count(1) FROM ( - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src UNION DISTINCT - SELECT key, value FROM src) src; -- union17.q CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE; @@ -261,76 +136,6 @@ SELECT DEST119.* FROM DEST119 SORT BY DEST119.key, DEST119.value; SELECT DEST219.* FROM DEST219 SORT BY DEST219.key, DEST219.val1, DEST219.val2; - --- union2.q - --- SORT_BEFORE_DIFF --- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink - -explain - select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT - select s2.key as key, s2.value as value from src s2) unionsrc; - -select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT - select s2.key as key, s2.value as value from src s2) unionsrc; --- union20.q - --- SORT_BEFORE_DIFF --- union :map-reduce sub-queries followed by join - -explain -SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value -FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 - UNION DISTINCT - select s2.key as key, s2.value as value from src s2 where s2.key < 10) unionsrc1 -JOIN - (select 'tst1' as key, cast(count(1) as string) as value from src s3 - UNION DISTINCT - select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2 -ON (unionsrc1.key = unionsrc2.key); - -SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value -FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 - UNION DISTINCT - select s2.key as key, s2.value as value from src s2 where s2.key < 10) unionsrc1 -JOIN - (select 'tst1' as key, cast(count(1) as string) as value from src s3 - UNION DISTINCT - select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2 -ON (unionsrc1.key = unionsrc2.key); --- union21.q - --- SORT_BEFORE_DIFF --- union of constants, udf outputs, and columns from text table and thrift table - -explain -SELECT key, count(1) -FROM ( - SELECT '1' as key from src - UNION DISTINCT - SELECT reverse(key) as key from src - UNION DISTINCT - SELECT key as key from src - UNION DISTINCT - SELECT astring as key from src_thrift - UNION DISTINCT - SELECT lstring[0] as key from src_thrift -) union_output -GROUP BY key; - -SELECT key, count(1) -FROM ( - SELECT '1' as key from src - UNION DISTINCT - SELECT reverse(key) as key from src - UNION DISTINCT - SELECT key as key from src - UNION DISTINCT - SELECT astring as key from src_thrift - UNION DISTINCT - SELECT lstring[0] as key from src_thrift -) union_output -GROUP BY key; -- union22.q -- SORT_QUERY_RESULTS @@ -819,11 +624,8 @@ insert overwrite table t6 select * from t5; select * from t6; -drop table t1; -drop table t2; -create table t1 as select * from src where key < 10; -create table t2 as select key, count(1) as cnt from src where key < 10 group by key; +create table t9 as select key, count(1) as cnt from src where key < 10 group by key; create table t7(c1 string, cnt int); create table t8(c1 string, cnt int); @@ -833,7 +635,7 @@ from ( select key as c1, count(1) as cnt from t1 group by key UNION DISTINCT - select key as c1, cnt from t2 + select key as c1, cnt from t9 ) x insert overwrite table t7 select c1, count(1) group by c1 @@ -844,7 +646,7 @@ from ( select key as c1, count(1) as cnt from t1 group by key UNION DISTINCT - select key as c1, cnt from t2 + select key as c1, cnt from t9 ) x insert overwrite table t7 select c1, count(1) group by c1 @@ -860,13 +662,6 @@ select * from t8; -- This tests various union queries which have columns on one side of the query -- being of double type and those on the other side another -drop table if exists t1; - -drop table if exists t2; - -CREATE TABLE t1 AS SELECT * FROM src WHERE key < 10; -CREATE TABLE t2 AS SELECT * FROM src WHERE key < 10; - -- Test simple union with double EXPLAIN SELECT * FROM @@ -1035,108 +830,5 @@ SELECT * FROM ( UNION DISTINCT SELECT key,value FROM (SELECT * FROM (SELECT * FROM src10_3) sub2 UNION DISTINCT SELECT * FROM src10_4 ) alias0 ) alias1; --- union4.q - - - --- union case: both subqueries are map-reduce jobs on same input, followed by filesink - -drop table if exists tmptable; - -create table tmptable(key string, value int); - -explain -insert overwrite table tmptable - select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, count(1) as value from src s1 - UNION DISTINCT - select 'tst2' as key, count(1) as value from src s2) unionsrc; - -insert overwrite table tmptable -select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, count(1) as value from src s1 - UNION DISTINCT - select 'tst2' as key, count(1) as value from src s2) unionsrc; - -select * from tmptable x sort by x.key; - - --- union5.q - - --- SORT_BEFORE_DIFF --- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink - -explain - select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1 - UNION DISTINCT - select 'tst2' as key, count(1) as value from src s2) unionsrc group by unionsrc.key; - -select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1 - UNION DISTINCT - select 'tst2' as key, count(1) as value from src s2) unionsrc group by unionsrc.key; --- union6.q - - --- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink - -drop table if exists tmptable; - -create table tmptable(key string, value string); - -explain -insert overwrite table tmptable - select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 - UNION DISTINCT - select s2.key as key, s2.value as value from src1 s2) unionsrc; - -insert overwrite table tmptable -select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 - UNION DISTINCT - select s2.key as key, s2.value as value from src1 s2) unionsrc; - -select * from tmptable x sort by x.key, x.value; - - --- union7.q - - - --- SORT_BEFORE_DIFF --- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink - -explain - select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 - UNION DISTINCT - select s2.key as key, s2.value as value from src1 s2) unionsrc group by unionsrc.key; - -select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 - UNION DISTINCT - select s2.key as key, s2.value as value from src1 s2) unionsrc group by unionsrc.key; - - --- union8.q - --- SORT_BEFORE_DIFF --- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink - -explain - select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT - select s2.key as key, s2.value as value from src s2 UNION DISTINCT - select s3.key as key, s3.value as value from src s3) unionsrc; - -select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT - select s2.key as key, s2.value as value from src s2 UNION DISTINCT - select s3.key as key, s3.value as value from src s3) unionsrc; --- union9.q - --- SORT_BEFORE_DIFF --- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink - -explain - select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT - select s2.key as key, s2.value as value from src s2 UNION DISTINCT - select s3.key as key, s3.value as value from src s3) unionsrc; - select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT - select s2.key as key, s2.value as value from src s2 UNION DISTINCT - select s3.key as key, s3.value as value from src s3) unionsrc; diff --git a/ql/src/test/queries/clientpositive/unionDistinct_2.q b/ql/src/test/queries/clientpositive/unionDistinct_2.q index 324bf68f58..da47d38b7b 100644 --- a/ql/src/test/queries/clientpositive/unionDistinct_2.q +++ b/ql/src/test/queries/clientpositive/unionDistinct_2.q @@ -6,21 +6,6 @@ CREATE TABLE u2 as select key, value from src order by key limit 3; CREATE TABLE u3 as select key, value from src order by key desc limit 5; -select * from u1; - -select * from u2; - -select * from u3; - -select key, value from -( -select key, value from u1 -union all -select key, value from u2 -union all -select key as key, value from u3 -) tab; - select key, value from ( select key, value from u1 @@ -57,14 +42,6 @@ union select key as key, value from u3 ) tab; -select distinct * from -( -select key, value from u1 -union all -select key, value from u2 -union all -select key as key, value from u3 -) tab; select distinct * from ( diff --git a/ql/src/test/queries/clientpositive/unionDistinct_3.q b/ql/src/test/queries/clientpositive/unionDistinct_3.q new file mode 100644 index 0000000000..015f9c0419 --- /dev/null +++ b/ql/src/test/queries/clientpositive/unionDistinct_3.q @@ -0,0 +1,190 @@ +set hive.mapred.mode=nonstrict; +set hive.explain.user=false; + +-- union2.q + +-- SORT_BEFORE_DIFF +-- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink + +explain + select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT + select s2.key as key, s2.value as value from src s2) unionsrc; + +select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT + select s2.key as key, s2.value as value from src s2) unionsrc; + +-- union6.q + + + +-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink + +drop table if exists tmptable; + +create table tmptable(key string, value string); + +explain +insert overwrite table tmptable + select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 + UNION DISTINCT + select s2.key as key, s2.value as value from src1 s2) unionsrc; + +insert overwrite table tmptable +select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 + UNION DISTINCT + select s2.key as key, s2.value as value from src1 s2) unionsrc; + +select * from tmptable x sort by x.key, x.value; + +drop table if exists tmptable; + + +-- union8.q + +-- SORT_BEFORE_DIFF +-- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink + +explain + select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT + select s2.key as key, s2.value as value from src s2 UNION DISTINCT + select s3.key as key, s3.value as value from src s3) unionsrc; + +select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION DISTINCT + select s2.key as key, s2.value as value from src s2 UNION DISTINCT + select s3.key as key, s3.value as value from src s3) unionsrc; + +-- union11.q + + +-- SORT_BEFORE_DIFF +-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink + +explain + select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1 + UNION DISTINCT + select 'tst2' as key, count(1) as value from src s2 + UNION DISTINCT + select 'tst3' as key, count(1) as value from src s3) unionsrc group by unionsrc.key; + + + select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1 + UNION DISTINCT + select 'tst2' as key, count(1) as value from src s2 + UNION DISTINCT + select 'tst3' as key, count(1) as value from src s3) unionsrc group by unionsrc.key; + +-- union14.q + + +-- SORT_BEFORE_DIFF +-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink + +explain + select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value from src1 s2 + UNION DISTINCT + select 'tst1' as key, cast(count(1) as string) as value from src s1) + unionsrc group by unionsrc.key; + + + + select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value from src1 s2 + UNION DISTINCT + select 'tst1' as key, cast(count(1) as string) as value from src s1) + unionsrc group by unionsrc.key; +-- union15.q + + +-- SORT_BEFORE_DIFF +-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink + +explain + select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 + UNION DISTINCT + select s2.key as key, s2.value as value from src1 s2 + UNION DISTINCT + select s3.key as key, s3.value as value from src1 s3) unionsrc group by unionsrc.key; + + select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 + UNION DISTINCT + select s2.key as key, s2.value as value from src1 s2 + UNION DISTINCT + select s3.key as key, s3.value as value from src1 s3) unionsrc group by unionsrc.key; + +-- union16.q + +-- SORT_BEFORE_DIFF +EXPLAIN +SELECT count(1) FROM ( + SELECT key, value FROM src UNION DISTINCT + SELECT key, value FROM src UNION DISTINCT + SELECT key, value FROM src UNION DISTINCT + SELECT key, value FROM src UNION DISTINCT + SELECT key, value FROM src) src; + + +SELECT count(1) FROM ( + SELECT key, value FROM src UNION DISTINCT + SELECT key, value FROM src UNION DISTINCT + SELECT key, value FROM src UNION DISTINCT + SELECT key, value FROM src UNION DISTINCT + SELECT key, value FROM src) src; + +-- union20.q + +-- SORT_BEFORE_DIFF +-- union :map-reduce sub-queries followed by join + +explain +SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value +FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 + UNION DISTINCT + select s2.key as key, s2.value as value from src s2 where s2.key < 10) unionsrc1 +JOIN + (select 'tst1' as key, cast(count(1) as string) as value from src s3 + UNION DISTINCT + select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2 +ON (unionsrc1.key = unionsrc2.key); + +SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value +FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 + UNION DISTINCT + select s2.key as key, s2.value as value from src s2 where s2.key < 10) unionsrc1 +JOIN + (select 'tst1' as key, cast(count(1) as string) as value from src s3 + UNION DISTINCT + select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2 +ON (unionsrc1.key = unionsrc2.key); +-- union21.q + +-- SORT_BEFORE_DIFF +-- union of constants, udf outputs, and columns from text table and thrift table + +explain +SELECT key, count(1) +FROM ( + SELECT '1' as key from src + UNION DISTINCT + SELECT reverse(key) as key from src + UNION DISTINCT + SELECT key as key from src + UNION DISTINCT + SELECT astring as key from src_thrift + UNION DISTINCT + SELECT lstring[0] as key from src_thrift +) union_output +GROUP BY key; + +SELECT key, count(1) +FROM ( + SELECT '1' as key from src + UNION DISTINCT + SELECT reverse(key) as key from src + UNION DISTINCT + SELECT key as key from src + UNION DISTINCT + SELECT astring as key from src_thrift + UNION DISTINCT + SELECT lstring[0] as key from src_thrift +) union_output +GROUP BY key; + diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_2.q.out b/ql/src/test/results/clientpositive/llap/explainanalyze_2.q.out similarity index 100% rename from ql/src/test/results/clientpositive/tez/explainanalyze_2.q.out rename to ql/src/test/results/clientpositive/llap/explainanalyze_2.q.out diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out b/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out index 3b3983f896..dc4e55478a 100644 --- a/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out +++ b/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out @@ -34,82 +34,6 @@ POSTHOOK: Output: database:default POSTHOOK: Output: default@u3 POSTHOOK: Lineage: u3.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: u3.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select * from u1 -PREHOOK: type: QUERY -PREHOOK: Input: default@u1 -#### A masked pattern was here #### -POSTHOOK: query: select * from u1 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@u1 -#### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -10 val_10 -100 val_100 -PREHOOK: query: select * from u2 -PREHOOK: type: QUERY -PREHOOK: Input: default@u2 -#### A masked pattern was here #### -POSTHOOK: query: select * from u2 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@u2 -#### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -PREHOOK: query: select * from u3 -PREHOOK: type: QUERY -PREHOOK: Input: default@u3 -#### A masked pattern was here #### -POSTHOOK: query: select * from u3 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@u3 -#### A masked pattern was here #### -96 val_96 -97 val_97 -97 val_97 -98 val_98 -98 val_98 -PREHOOK: query: select key, value from -( -select key, value from u1 -union all -select key, value from u2 -union all -select key as key, value from u3 -) tab -PREHOOK: type: QUERY -PREHOOK: Input: default@u1 -PREHOOK: Input: default@u2 -PREHOOK: Input: default@u3 -#### A masked pattern was here #### -POSTHOOK: query: select key, value from -( -select key, value from u1 -union all -select key, value from u2 -union all -select key as key, value from u3 -) tab -POSTHOOK: type: QUERY -POSTHOOK: Input: default@u1 -POSTHOOK: Input: default@u2 -POSTHOOK: Input: default@u3 -#### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_0 -0 val_0 -0 val_0 -10 val_10 -100 val_100 -96 val_96 -97 val_97 -97 val_97 -98 val_98 -98 val_98 PREHOOK: query: select key, value from ( select key, value from u1 @@ -244,38 +168,6 @@ POSTHOOK: Input: default@u3 98 val_98 PREHOOK: query: select distinct * from ( -select key, value from u1 -union all -select key, value from u2 -union all -select key as key, value from u3 -) tab -PREHOOK: type: QUERY -PREHOOK: Input: default@u1 -PREHOOK: Input: default@u2 -PREHOOK: Input: default@u3 -#### A masked pattern was here #### -POSTHOOK: query: select distinct * from -( -select key, value from u1 -union all -select key, value from u2 -union all -select key as key, value from u3 -) tab -POSTHOOK: type: QUERY -POSTHOOK: Input: default@u1 -POSTHOOK: Input: default@u2 -POSTHOOK: Input: default@u3 -#### A masked pattern was here #### -0 val_0 -10 val_10 -100 val_100 -96 val_96 -97 val_97 -98 val_98 -PREHOOK: query: select distinct * from -( select distinct * from u1 union select key, value from u2 -- 2.13.6 (Apple Git-96)