http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/mapjoin46.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/mapjoin46.q.out b/ql/src/test/results/clientpositive/mapjoin46.q.out index 5e053e8..e74c2fe 100644 --- a/ql/src/test/results/clientpositive/mapjoin46.q.out +++ b/ql/src/test/results/clientpositive/mapjoin46.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) @@ -130,16 +128,14 @@ NULL NULL None NULL NULL NULL 100 1 Bob NULL NULL NULL 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 @@ -240,15 +236,13 @@ NULL NULL None NULL NULL NULL 100 1 Bob NULL NULL NULL 101 2 Car 102 2 Del Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3: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 @@ -346,14 +340,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) @@ -439,14 +431,12 @@ POSTHOOK: Input: default@test2 NULL NULL NULL 104 3 Fli NULL NULL NULL 105 NULL None Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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) @@ -545,16 +535,14 @@ NULL NULL None NULL NULL NULL 101 2 Car 104 3 Fli 101 2 Car 105 NULL None Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -655,15 +643,13 @@ NULL NULL None 102 2 Del 101 2 Car 104 3 Fli 101 2 Car 105 NULL None Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -761,15 +747,13 @@ NULL NULL None NULL NULL NULL 101 2 Car 104 3 Fli 101 2 Car 105 NULL None Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -861,16 +845,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 @@ -964,16 +946,14 @@ NULL NULL None NULL NULL NULL 101 2 Car 102 2 Del 101 2 Car 103 2 Ema Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -1074,15 +1054,13 @@ NULL NULL None 102 2 Del 100 1 Bob 105 NULL None 101 2 Car 105 NULL None Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -1177,15 +1155,13 @@ POSTHOOK: Input: default@test2 100 1 Bob 105 NULL None 101 2 Car 105 NULL None Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -1279,16 +1255,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 @@ -1380,16 +1354,14 @@ POSTHOOK: Input: default@test2 NULL NULL NULL 104 3 Fli NULL NULL NULL 105 NULL None 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 @@ -1483,15 +1455,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 @@ -1582,15 +1552,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 @@ -1677,16 +1645,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 @@ -1779,8 +1745,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, @@ -1800,8 +1765,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/multi_insert_gby4.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/multi_insert_gby4.q.out b/ql/src/test/results/clientpositive/multi_insert_gby4.q.out index 1536d4a..dd01b74 100644 --- a/ql/src/test/results/clientpositive/multi_insert_gby4.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_gby4.q.out @@ -1,12 +1,8 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table e1 (key string, count int) +PREHOOK: query: create table e1 (key string, count int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@e1 -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table e1 (key string, count int) +POSTHOOK: query: create table e1 (key string, count int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@e1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/nested_column_pruning.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/nested_column_pruning.q.out b/ql/src/test/results/clientpositive/nested_column_pruning.q.out index 840bb12..95d1bb9 100644 --- a/ql/src/test/results/clientpositive/nested_column_pruning.q.out +++ b/ql/src/test/results/clientpositive/nested_column_pruning.q.out @@ -1,8 +1,6 @@ -PREHOOK: query: -- First, create source tables -DROP TABLE IF EXISTS dummy +PREHOOK: query: DROP TABLE IF EXISTS dummy PREHOOK: type: DROPTABLE -POSTHOOK: query: -- First, create source tables -DROP TABLE IF EXISTS dummy +POSTHOOK: query: DROP TABLE IF EXISTS dummy POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE dummy (i int) PREHOOK: type: CREATETABLE @@ -121,13 +119,9 @@ POSTHOOK: Lineage: nested_tbl_2.s3 EXPRESSION [] POSTHOOK: Lineage: nested_tbl_2.s4 EXPRESSION [] POSTHOOK: Lineage: nested_tbl_2.s5 EXPRESSION [] POSTHOOK: Lineage: nested_tbl_2.s6 EXPRESSION [] -PREHOOK: query: -- Testing only select statements - -EXPLAIN SELECT a FROM nested_tbl_1 +PREHOOK: query: EXPLAIN SELECT a FROM nested_tbl_1 PREHOOK: type: QUERY -POSTHOOK: query: -- Testing only select statements - -EXPLAIN SELECT a FROM nested_tbl_1 +POSTHOOK: query: EXPLAIN SELECT a FROM nested_tbl_1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -253,11 +247,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@nested_tbl_1 #### A masked pattern was here #### false foo -PREHOOK: query: -- In this case 's1.f3' and 's1.f3.f4' should be merged -EXPLAIN SELECT s1.f3, s1.f3.f4 FROM nested_tbl_1 +PREHOOK: query: EXPLAIN SELECT s1.f3, s1.f3.f4 FROM nested_tbl_1 PREHOOK: type: QUERY -POSTHOOK: query: -- In this case 's1.f3' and 's1.f3.f4' should be merged -EXPLAIN SELECT s1.f3, s1.f3.f4 FROM nested_tbl_1 +POSTHOOK: query: EXPLAIN SELECT s1.f3, s1.f3.f4 FROM nested_tbl_1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -298,11 +290,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@nested_tbl_1 #### A masked pattern was here #### {"f4":4,"f5":5.0} 4 -PREHOOK: query: -- Testing select array and index shifting -EXPLAIN SELECT s1.f3.f5 FROM nested_tbl_1 +PREHOOK: query: EXPLAIN SELECT s1.f3.f5 FROM nested_tbl_1 PREHOOK: type: QUERY -POSTHOOK: query: -- Testing select array and index shifting -EXPLAIN SELECT s1.f3.f5 FROM nested_tbl_1 +POSTHOOK: query: EXPLAIN SELECT s1.f3.f5 FROM nested_tbl_1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -343,11 +333,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@nested_tbl_1 #### A masked pattern was here #### 5.0 -PREHOOK: query: -- Testing select from multiple structs -EXPLAIN SELECT s1.f3.f4, s2.f8.f9 FROM nested_tbl_1 +PREHOOK: query: EXPLAIN SELECT s1.f3.f4, s2.f8.f9 FROM nested_tbl_1 PREHOOK: type: QUERY -POSTHOOK: query: -- Testing select from multiple structs -EXPLAIN SELECT s1.f3.f4, s2.f8.f9 FROM nested_tbl_1 +POSTHOOK: query: EXPLAIN SELECT s1.f3.f4, s2.f8.f9 FROM nested_tbl_1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -388,13 +376,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@nested_tbl_1 #### A masked pattern was here #### 4 true -PREHOOK: query: -- Testing select with filter - -EXPLAIN SELECT s1.f2 FROM nested_tbl_1 WHERE s1.f1 = FALSE +PREHOOK: query: EXPLAIN SELECT s1.f2 FROM nested_tbl_1 WHERE s1.f1 = FALSE PREHOOK: type: QUERY -POSTHOOK: query: -- Testing select with filter - -EXPLAIN SELECT s1.f2 FROM nested_tbl_1 WHERE s1.f1 = FALSE +POSTHOOK: query: EXPLAIN SELECT s1.f2 FROM nested_tbl_1 WHERE s1.f1 = FALSE POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -530,15 +514,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@nested_tbl_1 #### A masked pattern was here #### {"f9":true,"f10":[10,11],"f11":{"key1":true,"key2":false}} -PREHOOK: query: -- Testing lateral view - -EXPLAIN SELECT col1, col2 FROM nested_tbl_1 +PREHOOK: query: EXPLAIN SELECT col1, col2 FROM nested_tbl_1 LATERAL VIEW explode(s2.f8.f10) tbl1 AS col1 LATERAL VIEW explode(s3.f12) tbl2 AS col2 PREHOOK: type: QUERY -POSTHOOK: query: -- Testing lateral view - -EXPLAIN SELECT col1, col2 FROM nested_tbl_1 +POSTHOOK: query: EXPLAIN SELECT col1, col2 FROM nested_tbl_1 LATERAL VIEW explode(s2.f8.f10) tbl1 AS col1 LATERAL VIEW explode(s3.f12) tbl2 AS col2 POSTHOOK: type: QUERY @@ -678,11 +658,9 @@ POSTHOOK: Input: default@nested_tbl_1 10 {"f13":"bar","f14":28} 11 {"f13":"foo","f14":14} 11 {"f13":"bar","f14":28} -PREHOOK: query: -- Testing UDFs -EXPLAIN SELECT pmod(s2.f8.f10[1], s1.f3.f4) FROM nested_tbl_1 +PREHOOK: query: EXPLAIN SELECT pmod(s2.f8.f10[1], s1.f3.f4) FROM nested_tbl_1 PREHOOK: type: QUERY -POSTHOOK: query: -- Testing UDFs -EXPLAIN SELECT pmod(s2.f8.f10[1], s1.f3.f4) FROM nested_tbl_1 +POSTHOOK: query: EXPLAIN SELECT pmod(s2.f8.f10[1], s1.f3.f4) FROM nested_tbl_1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -723,13 +701,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@nested_tbl_1 #### A masked pattern was here #### 3 -PREHOOK: query: -- Testing aggregations - -EXPLAIN SELECT s1.f3.f5, count(s1.f3.f4) FROM nested_tbl_1 GROUP BY s1.f3.f5 +PREHOOK: query: EXPLAIN SELECT s1.f3.f5, count(s1.f3.f4) FROM nested_tbl_1 GROUP BY s1.f3.f5 PREHOOK: type: QUERY -POSTHOOK: query: -- Testing aggregations - -EXPLAIN SELECT s1.f3.f5, count(s1.f3.f4) FROM nested_tbl_1 GROUP BY s1.f3.f5 +POSTHOOK: query: EXPLAIN SELECT s1.f3.f5, count(s1.f3.f4) FROM nested_tbl_1 GROUP BY s1.f3.f5 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -935,16 +909,12 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@nested_tbl_1 #### A masked pattern was here #### {"f4":4,"f5":5.0} 1 -PREHOOK: query: -- Testing joins - -EXPLAIN SELECT t1.s1.f3.f5, t2.s2.f8 +PREHOOK: query: EXPLAIN SELECT t1.s1.f3.f5, t2.s2.f8 FROM nested_tbl_1 t1 JOIN nested_tbl_2 t2 ON t1.s1.f3.f4 = t2.s1.f6 WHERE t2.s2.f8.f9 == FALSE PREHOOK: type: QUERY -POSTHOOK: query: -- Testing joins - -EXPLAIN SELECT t1.s1.f3.f5, t2.s2.f8 +POSTHOOK: query: EXPLAIN SELECT t1.s1.f3.f5, t2.s2.f8 FROM nested_tbl_1 t1 JOIN nested_tbl_2 t2 ON t1.s1.f3.f4 = t2.s1.f6 WHERE t2.s2.f8.f9 == FALSE @@ -1119,13 +1089,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@nested_tbl_1 #### A masked pattern was here #### 5.0 {"f9":true,"f10":[10,11],"f11":{"key1":true,"key2":false}} -PREHOOK: query: -- Testing insert with aliases - -DROP TABLE IF EXISTS nested_tbl_3 +PREHOOK: query: DROP TABLE IF EXISTS nested_tbl_3 PREHOOK: type: DROPTABLE -POSTHOOK: query: -- Testing insert with aliases - -DROP TABLE IF EXISTS nested_tbl_3 +POSTHOOK: query: DROP TABLE IF EXISTS nested_tbl_3 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE nested_tbl_3 (f1 boolean, f2 string) PARTITIONED BY (f3 int) STORED AS PARQUET PREHOOK: type: CREATETABLE @@ -1160,16 +1126,12 @@ POSTHOOK: Input: default@nested_tbl_3 POSTHOOK: Input: default@nested_tbl_3@f3=4 #### A masked pattern was here #### false foo 4 -PREHOOK: query: -- Testing select struct field from elements in array or map - -EXPLAIN +PREHOOK: query: EXPLAIN SELECT count(s1.f6), s3.f12[0].f14 FROM nested_tbl_1 GROUP BY s3.f12[0].f14 PREHOOK: type: QUERY -POSTHOOK: query: -- Testing select struct field from elements in array or map - -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT count(s1.f6), s3.f12[0].f14 FROM nested_tbl_1 GROUP BY s3.f12[0].f14 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out index 53dc1e7..dc29b7d 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out @@ -78,14 +78,12 @@ POSTHOOK: Output: default@test2 POSTHOOK: Lineage: test2.col_2 SIMPLE [(aux2)aux2.FieldSchema(name:col_2, type:string, comment:null), ] POSTHOOK: Lineage: test2.key SIMPLE [(aux2)aux2.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: test2.value SIMPLE [(aux2)aux2.FieldSchema(name:value, type:int, comment:null), ] -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) @@ -147,16 +145,14 @@ NULL NULL None NULL NULL NULL 99 2 Mat 103 2 Ema 99 2 Mat 102 2 Del 100 1 Bob NULL NULL NULL -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 @@ -226,15 +222,13 @@ NULL NULL None NULL NULL NULL 99 2 Mat NULL NULL NULL 100 1 Bob NULL NULL NULL Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3: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 @@ -332,14 +326,12 @@ NULL NULL None NULL NULL NULL 101 2 Car 102 2 Del 99 2 Mat NULL NULL NULL 100 1 Bob 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) @@ -400,14 +392,12 @@ NULL NULL NULL 105 NULL None 99 2 Mat 102 2 Del NULL NULL NULL 104 3 Fli Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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) @@ -506,16 +496,14 @@ NULL NULL None NULL NULL NULL 100 1 Bob 102 2 Del 100 1 Bob 104 3 Fli Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ NULL NULL None 102 2 Del 100 1 Bob 102 2 Del 100 1 Bob 104 3 Fli Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -722,15 +708,13 @@ NULL NULL None NULL NULL NULL 100 1 Bob 102 2 Del 100 1 Bob 104 3 Fli Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -822,16 +806,14 @@ NULL NULL None 102 2 Del 99 2 Mat 103 2 Ema 99 2 Mat 102 2 Del 100 1 Bob 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 @@ -900,16 +882,14 @@ NULL NULL None NULL NULL NULL 99 2 Mat 102 2 Del 100 1 Bob NULL NULL NULL Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -1010,15 +990,13 @@ NULL NULL None 102 2 Del 101 2 Car 104 3 Fli 100 1 Bob 104 3 Fli Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -1113,15 +1091,13 @@ POSTHOOK: Input: default@test2 101 2 Car 104 3 Fli 100 1 Bob 104 3 Fli Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3: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 @@ -1215,16 +1191,14 @@ NULL NULL None 102 2 Del 99 2 Mat 102 2 Del 100 1 Bob 102 2 Del 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 @@ -1291,16 +1265,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 @@ -1394,15 +1366,13 @@ POSTHOOK: Input: default@test2 NULL NULL None 102 2 Del 98 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 @@ -1493,15 +1463,13 @@ POSTHOOK: Input: default@test2 NULL NULL None NULL NULL NULL 98 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 @@ -1588,16 +1556,14 @@ NULL NULL None 102 2 Del 98 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 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/auto_join29.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/auto_join29.q.out b/ql/src/test/results/clientpositive/spark/auto_join29.q.out index 4d56625..beb7363 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join29.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join29.q.out @@ -1,11 +1,7 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -explain +PREHOOK: query: explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - -explain +POSTHOOK: query: explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/groupby6.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/groupby6.q.out b/ql/src/test/results/clientpositive/spark/groupby6.q.out index bb9b315..4f406d7 100644 --- a/ql/src/test/results/clientpositive/spark/groupby6.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby6.q.out @@ -1,12 +1,8 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE +PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE +POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/join_array.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/join_array.q.out b/ql/src/test/results/clientpositive/spark/join_array.q.out index 56a4360..66c143a 100644 --- a/ql/src/test/results/clientpositive/spark/join_array.q.out +++ b/ql/src/test/results/clientpositive/spark/join_array.q.out @@ -30,15 +30,11 @@ POSTHOOK: query: load data local inpath '../../data/files/tiny_b.txt' into table POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@tinyb -PREHOOK: query: -- SORT_QUERY_RESULTS - -select * from tinyA +PREHOOK: query: select * from tinyA PREHOOK: type: QUERY PREHOOK: Input: default@tinya #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -select * from tinyA +POSTHOOK: query: select * from tinyA POSTHOOK: type: QUERY POSTHOOK: Input: default@tinya #### A masked pattern was here #### http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out b/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out index 8b7c96d..f6f0043 100644 --- a/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out +++ b/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out @@ -822,14 +822,12 @@ POSTHOOK: Input: default@src 76 val_76 2 74 val_74 1 72 val_72 2 -PREHOOK: query: -- NOT APPLICABLE -explain +PREHOOK: query: explain select value, avg(key + 1) myavg from src group by value order by myavg, value desc limit 20 PREHOOK: type: QUERY -POSTHOOK: query: -- NOT APPLICABLE -explain +POSTHOOK: query: explain select value, avg(key + 1) myavg from src group by value order by myavg, value desc limit 20 @@ -935,14 +933,12 @@ val_27 28.0 val_28 29.0 val_30 31.0 val_33 34.0 -PREHOOK: query: -- NOT APPLICABLE -explain +PREHOOK: query: explain select key, value, avg(key + 1) from src group by value, key with rollup order by key, value limit 20 PREHOOK: type: QUERY -POSTHOOK: query: -- NOT APPLICABLE -explain +POSTHOOK: query: explain select key, value, avg(key + 1) from src group by value, key with rollup order by key, value limit 20 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/merge1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/merge1.q.out b/ql/src/test/results/clientpositive/spark/merge1.q.out index e594d47..d5b1e9f 100644 --- a/ql/src/test/results/clientpositive/spark/merge1.q.out +++ b/ql/src/test/results/clientpositive/spark/merge1.q.out @@ -1,12 +1,8 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table dest1(key int, val int) +PREHOOK: query: create table dest1(key int, val int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table dest1(key int, val int) +POSTHOOK: query: create table dest1(key int, val int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out b/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out index 2663fe1..7f1d67b 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out @@ -1,12 +1,8 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table src_multi1 like src +PREHOOK: query: create table src_multi1 like src PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@src_multi1 -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table src_multi1 like src +POSTHOOK: query: create table src_multi1 like src POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@src_multi1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out b/ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out index 290afb3..11b4ac7 100644 --- a/ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out +++ b/ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out @@ -1,12 +1,8 @@ -PREHOOK: query: -- This is mainly intended for spark, to test runtime skew join together with map join - -CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE +PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T1 -POSTHOOK: query: -- This is mainly intended for spark, to test runtime skew join together with map join - -CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE +POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/subquery_exists.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/subquery_exists.q.out b/ql/src/test/results/clientpositive/spark/subquery_exists.q.out index 25115a0..f8b8712 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_exists.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_exists.q.out @@ -404,8 +404,7 @@ STAGE PLANS: ListSink Warning: Shuffle Join JOIN[12][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product -PREHOOK: query: -- uncorr exists -explain +PREHOOK: query: explain select * from src b where exists @@ -414,8 +413,7 @@ where exists where a.value > 'val_9' ) PREHOOK: type: QUERY -POSTHOOK: query: -- uncorr exists -explain +POSTHOOK: query: explain select * from src b where exists http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/subquery_in.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/subquery_in.q.out b/ql/src/test/results/clientpositive/spark/subquery_in.q.out index 3bf8c5f..a339814 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_in.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_in.q.out @@ -1111,11 +1111,9 @@ POSTHOOK: Input: default@lineitem 108570 8571 4297 1798 Warning: Shuffle Join JOIN[14][tables = [$hdt$_3, $hdt$_4]] in Work 'Reducer 11' is a cross product -PREHOOK: query: -- corr, agg in outer and inner -explain select sum(l_extendedprice) from lineitem, part where p_partkey = l_partkey and l_quantity IN (select avg(l_quantity) from lineitem where l_partkey = p_partkey) +PREHOOK: query: explain select sum(l_extendedprice) from lineitem, part where p_partkey = l_partkey and l_quantity IN (select avg(l_quantity) from lineitem where l_partkey = p_partkey) PREHOOK: type: QUERY -POSTHOOK: query: -- corr, agg in outer and inner -explain select sum(l_extendedprice) from lineitem, part where p_partkey = l_partkey and l_quantity IN (select avg(l_quantity) from lineitem where l_partkey = p_partkey) +POSTHOOK: query: explain select sum(l_extendedprice) from lineitem, part where p_partkey = l_partkey and l_quantity IN (select avg(l_quantity) from lineitem where l_partkey = p_partkey) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1364,11 +1362,9 @@ POSTHOOK: Input: default@lineitem POSTHOOK: Input: default@part #### A masked pattern was here #### NULL -PREHOOK: query: --where has multiple conjuction -explain select * from part where p_brand <> 'Brand#14' AND p_size IN (select min(p_size) from part p where p.p_type = part.p_type group by p_type) AND p_size <> 340 +PREHOOK: query: explain select * from part where p_brand <> 'Brand#14' AND p_size IN (select min(p_size) from part p where p.p_type = part.p_type group by p_type) AND p_size <> 340 PREHOOK: type: QUERY -POSTHOOK: query: --where has multiple conjuction -explain select * from part where p_brand <> 'Brand#14' AND p_size IN (select min(p_size) from part p where p.p_type = part.p_type group by p_type) AND p_size <> 340 +POSTHOOK: query: explain select * from part where p_brand <> 'Brand#14' AND p_size IN (select min(p_size) from part p where p.p_type = part.p_type group by p_type) AND p_size <> 340 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1564,11 +1560,9 @@ POSTHOOK: Input: default@part 85768 almond antique chartreuse lavender yellow Manufacturer#1 Brand#12 LARGE BRUSHED STEEL 34 SM BAG 1753.76 refull 86428 almond aquamarine burnished black steel Manufacturer#1 Brand#12 STANDARD ANODIZED STEEL 28 WRAP BAG 1414.42 arefully 90681 almond antique chartreuse khaki white Manufacturer#3 Brand#31 MEDIUM BURNISHED TIN 17 SM CASE 1671.68 are slyly after the sl -PREHOOK: query: --lhs contains non-simple expression -explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) +PREHOOK: query: explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) PREHOOK: type: QUERY -POSTHOOK: query: --lhs contains non-simple expression -explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) +POSTHOOK: query: explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1815,11 +1809,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@part #### A masked pattern was here #### 40982 almond antique misty red olive Manufacturer#3 Brand#32 ECONOMY PLATED COPPER 1 LG PKG 1922.98 c foxes can s -PREHOOK: query: --lhs contains non-simple expression, corr -explain select count(*) as c from part as e where p_size + 100 IN (select p_partkey from part where p_name = e.p_name) +PREHOOK: query: explain select count(*) as c from part as e where p_size + 100 IN (select p_partkey from part where p_name = e.p_name) PREHOOK: type: QUERY -POSTHOOK: query: --lhs contains non-simple expression, corr -explain select count(*) as c from part as e where p_size + 100 IN (select p_partkey from part where p_name = e.p_name) +POSTHOOK: query: explain select count(*) as c from part as e where p_size + 100 IN (select p_partkey from part where p_name = e.p_name) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1984,11 +1976,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@part #### A masked pattern was here #### 0 -PREHOOK: query: -- lhs contains udf expression -explain select * from part where floor(p_retailprice) IN (select floor(min(p_retailprice)) from part group by p_type) +PREHOOK: query: explain select * from part where floor(p_retailprice) IN (select floor(min(p_retailprice)) from part group by p_type) PREHOOK: type: QUERY -POSTHOOK: query: -- lhs contains udf expression -explain select * from part where floor(p_retailprice) IN (select floor(min(p_retailprice)) from part group by p_type) +POSTHOOK: query: explain select * from part where floor(p_retailprice) IN (select floor(min(p_retailprice)) from part group by p_type) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2279,11 +2269,9 @@ POSTHOOK: Input: default@part #### A masked pattern was here #### 121152 almond antique burnished rose metallic Manufacturer#1 Brand#14 PROMO PLATED TIN 2 JUMBO BOX 1173.15 e pinto beans h 121152 almond antique burnished rose metallic Manufacturer#1 Brand#14 PROMO PLATED TIN 2 JUMBO BOX 1173.15 e pinto beans h -PREHOOK: query: -- correlated query, multiple correlated variables referring to different outer var -explain select * from part where p_name IN (select p_name from part p where p.p_size = part.p_size AND part.p_partkey= p.p_partkey ) +PREHOOK: query: explain select * from part where p_name IN (select p_name from part p where p.p_size = part.p_size AND part.p_partkey= p.p_partkey ) PREHOOK: type: QUERY -POSTHOOK: query: -- correlated query, multiple correlated variables referring to different outer var -explain select * from part where p_name IN (select p_name from part p where p.p_size = part.p_size AND part.p_partkey= p.p_partkey ) +POSTHOOK: query: explain select * from part where p_name IN (select p_name from part p where p.p_size = part.p_size AND part.p_partkey= p.p_partkey ) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2458,11 +2446,9 @@ POSTHOOK: Input: default@part 85768 almond antique chartreuse lavender yellow Manufacturer#1 Brand#12 LARGE BRUSHED STEEL 34 SM BAG 1753.76 refull 86428 almond aquamarine burnished black steel Manufacturer#1 Brand#12 STANDARD ANODIZED STEEL 28 WRAP BAG 1414.42 arefully 90681 almond antique chartreuse khaki white Manufacturer#3 Brand#31 MEDIUM BURNISHED TIN 17 SM CASE 1671.68 are slyly after the sl -PREHOOK: query: -- correlated var refers to outer table alias -explain select p_name from (select p_name, p_type, p_brand as brand from part) fpart where fpart.p_type IN (select p_type from part where part.p_brand = fpart.brand) +PREHOOK: query: explain select p_name from (select p_name, p_type, p_brand as brand from part) fpart where fpart.p_type IN (select p_type from part where part.p_brand = fpart.brand) PREHOOK: type: QUERY -POSTHOOK: query: -- correlated var refers to outer table alias -explain select p_name from (select p_name, p_type, p_brand as brand from part) fpart where fpart.p_type IN (select p_type from part where part.p_brand = fpart.brand) +POSTHOOK: query: explain select p_name from (select p_name, p_type, p_brand as brand from part) fpart where fpart.p_type IN (select p_type from part where part.p_brand = fpart.brand) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2629,11 +2615,9 @@ almond aquamarine sandy cyan gainsboro almond aquamarine yellow dodger mint almond azure aquamarine papaya violet almond azure blanched chiffon midnight -PREHOOK: query: -- correlated var refers to outer table alias which is an expression -explain select p_name from (select p_name, p_type, p_size+1 as size from part) fpart where fpart.p_type IN (select p_type from part where (part.p_size+1) = fpart.size) +PREHOOK: query: explain select p_name from (select p_name, p_type, p_size+1 as size from part) fpart where fpart.p_type IN (select p_type from part where (part.p_size+1) = fpart.size) PREHOOK: type: QUERY -POSTHOOK: query: -- correlated var refers to outer table alias which is an expression -explain select p_name from (select p_name, p_type, p_size+1 as size from part) fpart where fpart.p_type IN (select p_type from part where (part.p_size+1) = fpart.size) +POSTHOOK: query: explain select p_name from (select p_name, p_type, p_size+1 as size from part) fpart where fpart.p_type IN (select p_type from part where (part.p_size+1) = fpart.size) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2800,11 +2784,9 @@ almond aquamarine sandy cyan gainsboro almond aquamarine yellow dodger mint almond azure aquamarine papaya violet almond azure blanched chiffon midnight -PREHOOK: query: -- where plus having -explain select key, count(*) from src where value IN (select value from src) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key ) +PREHOOK: query: explain select key, count(*) from src where value IN (select value from src) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key ) PREHOOK: type: QUERY -POSTHOOK: query: -- where plus having -explain select key, count(*) from src where value IN (select value from src) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key ) +POSTHOOK: query: explain select key, count(*) from src where value IN (select value from src) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key ) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -3023,11 +3005,9 @@ POSTHOOK: Input: default@src 5 3 70 3 90 3 -PREHOOK: query: -- where with having, correlated -explain select key, count(*) from src where value IN (select value from src sc where sc.key = src.key ) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key ) +PREHOOK: query: explain select key, count(*) from src where value IN (select value from src sc where sc.key = src.key ) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key ) PREHOOK: type: QUERY -POSTHOOK: query: -- where with having, correlated -explain select key, count(*) from src where value IN (select value from src sc where sc.key = src.key ) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key ) +POSTHOOK: query: explain select key, count(*) from src where value IN (select value from src sc where sc.key = src.key ) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key ) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -3308,11 +3288,9 @@ POSTHOOK: Input: default@src 5 3 70 3 90 3 -PREHOOK: query: -- subquery with order by -explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) order by p_brand +PREHOOK: query: explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) order by p_brand PREHOOK: type: QUERY -POSTHOOK: query: -- subquery with order by -explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) order by p_brand +POSTHOOK: query: explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) order by p_brand POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -3451,11 +3429,9 @@ POSTHOOK: Input: default@part 191709 almond antique violet turquoise frosted Manufacturer#2 Brand#22 ECONOMY POLISHED STEEL 40 MED BOX 1800.7 haggle 195606 almond aquamarine sandy cyan gainsboro Manufacturer#2 Brand#25 STANDARD PLATED TIN 18 SM PKG 1701.6 ic de 86428 almond aquamarine burnished black steel Manufacturer#1 Brand#12 STANDARD ANODIZED STEEL 28 WRAP BAG 1414.42 arefully -PREHOOK: query: --order by with limit -explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) order by p_brand limit 4 +PREHOOK: query: explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) order by p_brand limit 4 PREHOOK: type: QUERY -POSTHOOK: query: --order by with limit -explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) order by p_brand limit 4 +POSTHOOK: query: explain select * from part where (p_size-1) IN (select min(p_size) from part group by p_type) order by p_brand limit 4 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -3592,11 +3568,9 @@ POSTHOOK: Input: default@part 121152 almond antique burnished rose metallic Manufacturer#1 Brand#14 PROMO PLATED TIN 2 JUMBO BOX 1173.15 e pinto beans h 191709 almond antique violet turquoise frosted Manufacturer#2 Brand#22 ECONOMY POLISHED STEEL 40 MED BOX 1800.7 haggle 86428 almond aquamarine burnished black steel Manufacturer#1 Brand#12 STANDARD ANODIZED STEEL 28 WRAP BAG 1414.42 arefully -PREHOOK: query: -- union, uncorr -explain select * from src where key IN (select p_name from part UNION ALL select p_brand from part) +PREHOOK: query: explain select * from src where key IN (select p_name from part UNION ALL select p_brand from part) PREHOOK: type: QUERY -POSTHOOK: query: -- union, uncorr -explain select * from src where key IN (select p_name from part UNION ALL select p_brand from part) +POSTHOOK: query: explain select * from src where key IN (select p_name from part UNION ALL select p_brand from part) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -3709,12 +3683,10 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@part POSTHOOK: Input: default@src #### A masked pattern was here #### -PREHOOK: query: -- corr, subquery has another subquery in from -explain select p_mfgr, b.p_name, p_size from part b where b.p_name in +PREHOOK: query: explain select p_mfgr, b.p_name, p_size from part b where b.p_name in (select p_name from (select p_mfgr, p_name, p_size as r from part) a where r < 10 and b.p_mfgr = a.p_mfgr ) order by p_mfgr,p_size PREHOOK: type: QUERY -POSTHOOK: query: -- corr, subquery has another subquery in from -explain select p_mfgr, b.p_name, p_size from part b where b.p_name in +POSTHOOK: query: explain select p_mfgr, b.p_name, p_size from part b where b.p_name in (select p_name from (select p_mfgr, p_name, p_size as r from part) a where r < 10 and b.p_mfgr = a.p_mfgr ) order by p_mfgr,p_size POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -3893,11 +3865,9 @@ Manufacturer#3 almond antique misty red olive 1 Manufacturer#4 almond aquamarine yellow dodger mint 7 Manufacturer#5 almond antique medium spring khaki 6 Manufacturer#5 almond antique sky peru orange 2 -PREHOOK: query: -- join in subquery, correlated predicate with only one table -explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size) +PREHOOK: query: explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size) PREHOOK: type: QUERY -POSTHOOK: query: -- join in subquery, correlated predicate with only one table -explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size) +POSTHOOK: query: explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -4106,12 +4076,10 @@ POSTHOOK: Input: default@part 85768 86428 90681 -PREHOOK: query: -- join in subquery, correlated predicate with both inner tables, same outer var -explain select p_partkey from part where p_name in +PREHOOK: query: explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size and p.p_size=part.p_size) PREHOOK: type: QUERY -POSTHOOK: query: -- join in subquery, correlated predicate with both inner tables, same outer var -explain select p_partkey from part where p_name in +POSTHOOK: query: explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size and p.p_size=part.p_size) POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -4353,12 +4321,10 @@ POSTHOOK: Input: default@part 85768 86428 90681 -PREHOOK: query: -- join in subquery, correlated predicate with both inner tables, different outer var -explain select p_partkey from part where p_name in +PREHOOK: query: explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size and p.p_type=part.p_type) PREHOOK: type: QUERY -POSTHOOK: query: -- join in subquery, correlated predicate with both inner tables, different outer var -explain select p_partkey from part where p_name in +POSTHOOK: query: explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size and p.p_type=part.p_type) POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -4573,12 +4539,10 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- subquery within from -explain select p_partkey from +PREHOOK: query: explain select p_partkey from (select p_size, p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size)) subq PREHOOK: type: QUERY -POSTHOOK: query: -- subquery within from -explain select p_partkey from +POSTHOOK: query: explain select p_partkey from (select p_size, p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size)) subq POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -4813,49 +4777,41 @@ POSTHOOK: query: insert into tnull values(NULL) , (NULL) POSTHOOK: type: QUERY POSTHOOK: Output: default@tnull POSTHOOK: Lineage: tnull.i EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ] -PREHOOK: query: -- empty inner table, non-null sq key, expected empty result -select * from part where p_size IN (select i from tempty) +PREHOOK: query: select * from part where p_size IN (select i from tempty) PREHOOK: type: QUERY PREHOOK: Input: default@part PREHOOK: Input: default@tempty #### A masked pattern was here #### -POSTHOOK: query: -- empty inner table, non-null sq key, expected empty result -select * from part where p_size IN (select i from tempty) +POSTHOOK: query: select * from part where p_size IN (select i from tempty) POSTHOOK: type: QUERY POSTHOOK: Input: default@part POSTHOOK: Input: default@tempty #### A masked pattern was here #### -PREHOOK: query: -- empty inner table, null sq key, expected empty result -select * from tnull where i IN (select i from tempty) +PREHOOK: query: select * from tnull where i IN (select i from tempty) PREHOOK: type: QUERY PREHOOK: Input: default@tempty PREHOOK: Input: default@tnull #### A masked pattern was here #### -POSTHOOK: query: -- empty inner table, null sq key, expected empty result -select * from tnull where i IN (select i from tempty) +POSTHOOK: query: select * from tnull where i IN (select i from tempty) POSTHOOK: type: QUERY POSTHOOK: Input: default@tempty POSTHOOK: Input: default@tnull #### A masked pattern was here #### -PREHOOK: query: -- null inner table, non-null sq key -select * from part where p_size IN (select i from tnull) +PREHOOK: query: select * from part where p_size IN (select i from tnull) PREHOOK: type: QUERY PREHOOK: Input: default@part PREHOOK: Input: default@tnull #### A masked pattern was here #### -POSTHOOK: query: -- null inner table, non-null sq key -select * from part where p_size IN (select i from tnull) +POSTHOOK: query: select * from part where p_size IN (select i from tnull) POSTHOOK: type: QUERY POSTHOOK: Input: default@part POSTHOOK: Input: default@tnull #### A masked pattern was here #### -PREHOOK: query: -- null inner table, null sq key -select * from tnull where i IN (select i from tnull) +PREHOOK: query: select * from tnull where i IN (select i from tnull) PREHOOK: type: QUERY PREHOOK: Input: default@tnull #### A masked pattern was here #### -POSTHOOK: query: -- null inner table, null sq key -select * from tnull where i IN (select i from tnull) +POSTHOOK: query: select * from tnull where i IN (select i from tnull) POSTHOOK: type: QUERY POSTHOOK: Input: default@tnull #### A masked pattern was here #### http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/udf_percentile.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/udf_percentile.q.out b/ql/src/test/results/clientpositive/spark/udf_percentile.q.out index eba7dbe..e3033e7 100644 --- a/ql/src/test/results/clientpositive/spark/udf_percentile.q.out +++ b/ql/src/test/results/clientpositive/spark/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/spark/union8.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/union8.q.out b/ql/src/test/results/clientpositive/spark/union8.q.out index 87ba8ea..753bba9 100644 --- a/ql/src/test/results/clientpositive/spark/union8.q.out +++ b/ql/src/test/results/clientpositive/spark/union8.q.out @@ -1,15 +1,9 @@ -PREHOOK: query: -- 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 +PREHOOK: query: explain select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION ALL select s2.key as key, s2.value as value from src s2 UNION ALL select s3.key as key, s3.value as value from src s3) unionsrc PREHOOK: type: QUERY -POSTHOOK: query: -- 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 +POSTHOOK: query: explain select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION ALL select s2.key as key, s2.value as value from src s2 UNION ALL select s3.key as key, s3.value as value from src s3) unionsrc http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out index 0493994..a205a2f 100644 --- a/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out @@ -151,16 +151,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- SORT_QUERY_RESULTS - -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/subquery_exists.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/subquery_exists.q.out b/ql/src/test/results/clientpositive/subquery_exists.q.out index c3a1b8a..9c02d6a 100644 --- a/ql/src/test/results/clientpositive/subquery_exists.q.out +++ b/ql/src/test/results/clientpositive/subquery_exists.q.out @@ -444,8 +444,7 @@ STAGE PLANS: ListSink Warning: Shuffle Join JOIN[12][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product -PREHOOK: query: -- uncorr exists -explain +PREHOOK: query: explain select * from src b where exists @@ -454,8 +453,7 @@ where exists where a.value > 'val_9' ) PREHOOK: type: QUERY -POSTHOOK: query: -- uncorr exists -explain +POSTHOOK: query: explain select * from src b where exists http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/subquery_notexists.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/subquery_notexists.q.out b/ql/src/test/results/clientpositive/subquery_notexists.q.out index 25b11a0..b8df48b 100644 --- a/ql/src/test/results/clientpositive/subquery_notexists.q.out +++ b/ql/src/test/results/clientpositive/subquery_notexists.q.out @@ -656,8 +656,7 @@ POSTHOOK: Input: default@src 199 val_199 2 val_2 Warning: Shuffle Join JOIN[13][tables = [$hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product -PREHOOK: query: -- non equi predicate -explain +PREHOOK: query: explain select * from src b where not exists @@ -666,8 +665,7 @@ where not exists where b.value <> a.value and a.key > b.key and a.value > 'val_2' ) PREHOOK: type: QUERY -POSTHOOK: query: -- non equi predicate -explain +POSTHOOK: query: explain select * from src b where not exists http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/subquery_notin_having.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/subquery_notin_having.q.out b/ql/src/test/results/clientpositive/subquery_notin_having.q.out index 7ac16df..72a72f9 100644 --- a/ql/src/test/results/clientpositive/subquery_notin_having.q.out +++ b/ql/src/test/results/clientpositive/subquery_notin_having.q.out @@ -1,7 +1,5 @@ Warning: Shuffle Join JOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product -PREHOOK: query: -- non agg, non corr - -explain +PREHOOK: query: explain select key, count(*) from src group by key @@ -207,8 +205,7 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- non agg, corr -explain +PREHOOK: query: explain select b.p_mfgr, min(p_retailprice) from part b group by b.p_mfgr @@ -807,8 +804,7 @@ POSTHOOK: Input: default@part Manufacturer#1 1173.15 Manufacturer#2 1690.68 Warning: Shuffle Join JOIN[32][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product -PREHOOK: query: -- agg, non corr -explain +PREHOOK: query: explain select b.p_mfgr, min(p_retailprice) from part b group by b.p_mfgr @@ -1096,13 +1092,11 @@ POSTHOOK: Input: default@part #### A masked pattern was here #### Manufacturer#1 1173.15 Manufacturer#2 1690.68 -PREHOOK: query: --nullability tests -CREATE TABLE t1 (c1 INT, c2 CHAR(100)) +PREHOOK: query: CREATE TABLE t1 (c1 INT, c2 CHAR(100)) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t1 -POSTHOOK: query: --nullability tests -CREATE TABLE t1 (c1 INT, c2 CHAR(100)) +POSTHOOK: query: CREATE TABLE t1 (c1 INT, c2 CHAR(100)) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out index 6e1cc1a..1eb1b93 100644 --- a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out +++ b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out @@ -1291,8 +1291,7 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- non agg, corr -explain +PREHOOK: query: explain select p_mfgr, b.p_name, p_size from part b where b.p_name not in http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_array_contains.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_array_contains.q.out b/ql/src/test/results/clientpositive/udf_array_contains.q.out index 9320deb..090bba7 100644 --- a/ql/src/test/results/clientpositive/udf_array_contains.q.out +++ b/ql/src/test/results/clientpositive/udf_array_contains.q.out @@ -13,25 +13,21 @@ Example: true Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFArrayContains Function type:BUILTIN -PREHOOK: query: -- evalutes function for array of primitives -SELECT array_contains(array(1, 2, 3), 1) FROM src tablesample (1 rows) +PREHOOK: query: SELECT array_contains(array(1, 2, 3), 1) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- evalutes function for array of primitives -SELECT array_contains(array(1, 2, 3), 1) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT array_contains(array(1, 2, 3), 1) FROM src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### true -PREHOOK: query: -- evaluates function for nested arrays -SELECT array_contains(array(array(1,2), array(2,3), array(3,4)), array(1,2)) +PREHOOK: query: SELECT array_contains(array(array(1,2), array(2,3), array(3,4)), array(1,2)) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- evaluates function for nested arrays -SELECT array_contains(array(array(1,2), array(2,3), array(3,4)), array(1,2)) +POSTHOOK: query: SELECT array_contains(array(array(1,2), array(2,3), array(3,4)), array(1,2)) FROM src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_conv.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_conv.q.out b/ql/src/test/results/clientpositive/udf_conv.q.out index 16846a7..4c5ba75 100644 --- a/ql/src/test/results/clientpositive/udf_conv.q.out +++ b/ql/src/test/results/clientpositive/udf_conv.q.out @@ -16,10 +16,7 @@ Example: '16' Function class:org.apache.hadoop.hive.ql.udf.UDFConv Function type:BUILTIN -PREHOOK: query: -- conv must work on both strings and integers up to 64-bit precision - --- Some simple conversions to test different bases -SELECT +PREHOOK: query: SELECT conv('4521', 10, 36), conv('22', 10, 10), conv('110011', 2, 16), http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_date_add.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_date_add.q.out b/ql/src/test/results/clientpositive/udf_date_add.q.out index 54d9022..fa662d1 100644 --- a/ql/src/test/results/clientpositive/udf_date_add.q.out +++ b/ql/src/test/results/clientpositive/udf_date_add.q.out @@ -14,15 +14,13 @@ Example: '2009-07-31' Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFDateAdd Function type:BUILTIN -PREHOOK: query: -- Test different numeric data types for date_add -SELECT date_add('1900-01-01', cast(10 as tinyint)), +PREHOOK: query: SELECT date_add('1900-01-01', cast(10 as tinyint)), date_add('1900-01-01', cast(10 as smallint)), date_add('1900-01-01', cast(10 as int)) PREHOOK: type: QUERY PREHOOK: Input: _dummy_database@_dummy_table #### A masked pattern was here #### -POSTHOOK: query: -- Test different numeric data types for date_add -SELECT date_add('1900-01-01', cast(10 as tinyint)), +POSTHOOK: query: SELECT date_add('1900-01-01', cast(10 as tinyint)), date_add('1900-01-01', cast(10 as smallint)), date_add('1900-01-01', cast(10 as int)) POSTHOOK: type: QUERY http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_date_sub.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_date_sub.q.out b/ql/src/test/results/clientpositive/udf_date_sub.q.out index ac3b4aa..6bc9f48 100644 --- a/ql/src/test/results/clientpositive/udf_date_sub.q.out +++ b/ql/src/test/results/clientpositive/udf_date_sub.q.out @@ -14,15 +14,13 @@ Example: '2009-07-29' Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFDateSub Function type:BUILTIN -PREHOOK: query: -- Test different numeric data types for date_add -SELECT date_sub('1900-01-01', cast(10 as tinyint)), +PREHOOK: query: SELECT date_sub('1900-01-01', cast(10 as tinyint)), date_sub('1900-01-01', cast(10 as smallint)), date_sub('1900-01-01', cast(10 as int)) PREHOOK: type: QUERY PREHOOK: Input: _dummy_database@_dummy_table #### A masked pattern was here #### -POSTHOOK: query: -- Test different numeric data types for date_add -SELECT date_sub('1900-01-01', cast(10 as tinyint)), +POSTHOOK: query: SELECT date_sub('1900-01-01', cast(10 as tinyint)), date_sub('1900-01-01', cast(10 as smallint)), date_sub('1900-01-01', cast(10 as int)) POSTHOOK: type: QUERY http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_hex.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_hex.q.out b/ql/src/test/results/clientpositive/udf_hex.q.out index fe383d7..9225085 100644 --- a/ql/src/test/results/clientpositive/udf_hex.q.out +++ b/ql/src/test/results/clientpositive/udf_hex.q.out @@ -17,9 +17,7 @@ Example: '46616365626F6F6B' Function class:org.apache.hadoop.hive.ql.udf.UDFHex Function type:BUILTIN -PREHOOK: query: -- If the argument is a string, hex should return a string containing two hex --- digits for every character in the input. -SELECT +PREHOOK: query: SELECT hex('Facebook'), hex('\0'), hex('qwertyuiopasdfghjkl') http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_java_method.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_java_method.q.out b/ql/src/test/results/clientpositive/udf_java_method.q.out index f1fcbdb..f2f146d 100644 --- a/ql/src/test/results/clientpositive/udf_java_method.q.out +++ b/ql/src/test/results/clientpositive/udf_java_method.q.out @@ -13,9 +13,7 @@ Use this UDF to call Java methods by matching the argument signature Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFReflect Function type:BUILTIN -PREHOOK: query: -- java_method() is a synonym for reflect() - -EXPLAIN EXTENDED +PREHOOK: query: EXPLAIN EXTENDED SELECT java_method("java.lang.String", "valueOf", 1), java_method("java.lang.String", "isEmpty"), java_method("java.lang.Math", "max", 2, 3), http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_map_keys.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_map_keys.q.out b/ql/src/test/results/clientpositive/udf_map_keys.q.out index 3a50107..e31b6c9 100644 --- a/ql/src/test/results/clientpositive/udf_map_keys.q.out +++ b/ql/src/test/results/clientpositive/udf_map_keys.q.out @@ -16,24 +16,20 @@ POSTHOOK: type: DESCFUNCTION map_keys(map) - Returns an unordered array containing the keys of the input map. Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFMapKeys Function type:BUILTIN -PREHOOK: query: -- Evaluate function against INT valued keys -SELECT map_keys(map(1, "a", 2, "b", 3, "c")) FROM src tablesample (1 rows) +PREHOOK: query: SELECT map_keys(map(1, "a", 2, "b", 3, "c")) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- Evaluate function against INT valued keys -SELECT map_keys(map(1, "a", 2, "b", 3, "c")) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT map_keys(map(1, "a", 2, "b", 3, "c")) FROM src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### [1,2,3] -PREHOOK: query: -- Evaluate function against STRING valued keys -SELECT map_keys(map("a", 1, "b", 2, "c", 3)) FROM src tablesample (1 rows) +PREHOOK: query: SELECT map_keys(map("a", 1, "b", 2, "c", 3)) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- Evaluate function against STRING valued keys -SELECT map_keys(map("a", 1, "b", 2, "c", 3)) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT map_keys(map("a", 1, "b", 2, "c", 3)) FROM src tablesample (1 rows) 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/udf_map_values.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_map_values.q.out b/ql/src/test/results/clientpositive/udf_map_values.q.out index 1cfc8ab..fda1229 100644 --- a/ql/src/test/results/clientpositive/udf_map_values.q.out +++ b/ql/src/test/results/clientpositive/udf_map_values.q.out @@ -16,24 +16,20 @@ POSTHOOK: type: DESCFUNCTION map_values(map) - Returns an unordered array containing the values of the input map. Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFMapValues Function type:BUILTIN -PREHOOK: query: -- Evaluate function against STRING valued values -SELECT map_values(map(1, "a", 2, "b", 3, "c")) FROM src tablesample (1 rows) +PREHOOK: query: SELECT map_values(map(1, "a", 2, "b", 3, "c")) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- Evaluate function against STRING valued values -SELECT map_values(map(1, "a", 2, "b", 3, "c")) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT map_values(map(1, "a", 2, "b", 3, "c")) FROM src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### ["a","b","c"] -PREHOOK: query: -- Evaluate function against INT valued keys -SELECT map_values(map("a", 1, "b", 2, "c", 3)) FROM src tablesample (1 rows) +PREHOOK: query: SELECT map_values(map("a", 1, "b", 2, "c", 3)) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- Evaluate function against INT valued keys -SELECT map_values(map("a", 1, "b", 2, "c", 3)) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT map_values(map("a", 1, "b", 2, "c", 3)) FROM src tablesample (1 rows) 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/udf_months_between.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_months_between.q.out b/ql/src/test/results/clientpositive/udf_months_between.q.out index ae53132..3db7f61 100644 --- a/ql/src/test/results/clientpositive/udf_months_between.q.out +++ b/ql/src/test/results/clientpositive/udf_months_between.q.out @@ -15,11 +15,9 @@ date1 and date2 type can be date, timestamp or string in the format 'yyyy-MM-dd' 3.94959677 Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFMonthsBetween Function type:BUILTIN -PREHOOK: query: --test string format -explain select months_between('1995-02-02', '1995-01-01') +PREHOOK: query: explain select months_between('1995-02-02', '1995-01-01') PREHOOK: type: QUERY -POSTHOOK: query: --test string format -explain select months_between('1995-02-02', '1995-01-01') +POSTHOOK: query: explain select months_between('1995-02-02', '1995-01-01') POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-0 is a root stage http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_negative.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_negative.q.out b/ql/src/test/results/clientpositive/udf_negative.q.out index e26dbf8..ea8e270 100644 --- a/ql/src/test/results/clientpositive/udf_negative.q.out +++ b/ql/src/test/results/clientpositive/udf_negative.q.out @@ -10,11 +10,9 @@ POSTHOOK: type: DESCFUNCTION negative a - Returns -a Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative Function type:BUILTIN -PREHOOK: query: -- synonym -DESCRIBE FUNCTION - +PREHOOK: query: DESCRIBE FUNCTION - PREHOOK: type: DESCFUNCTION -POSTHOOK: query: -- synonym -DESCRIBE FUNCTION - +POSTHOOK: query: DESCRIBE FUNCTION - POSTHOOK: type: DESCFUNCTION a - b - Returns the difference a-b PREHOOK: query: DESCRIBE FUNCTION EXTENDED - http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_not.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_not.q.out b/ql/src/test/results/clientpositive/udf_not.q.out index 134640e..f0f392a 100644 --- a/ql/src/test/results/clientpositive/udf_not.q.out +++ b/ql/src/test/results/clientpositive/udf_not.q.out @@ -11,11 +11,9 @@ not a - Logical not Synonyms: ! Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNot Function type:BUILTIN -PREHOOK: query: -- synonym -DESCRIBE FUNCTION ! +PREHOOK: query: DESCRIBE FUNCTION ! PREHOOK: type: DESCFUNCTION -POSTHOOK: query: -- synonym -DESCRIBE FUNCTION ! +POSTHOOK: query: DESCRIBE FUNCTION ! POSTHOOK: type: DESCFUNCTION ! a - Logical not PREHOOK: query: DESCRIBE FUNCTION EXTENDED ! http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_percentile.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_percentile.q.out b/ql/src/test/results/clientpositive/udf_percentile.q.out index eba7dbe..e3033e7 100644 --- a/ql/src/test/results/clientpositive/udf_percentile.q.out +++ b/ql/src/test/results/clientpositive/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/udf_positive.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_positive.q.out b/ql/src/test/results/clientpositive/udf_positive.q.out index 09c0c1f..f762315 100644 --- a/ql/src/test/results/clientpositive/udf_positive.q.out +++ b/ql/src/test/results/clientpositive/udf_positive.q.out @@ -10,11 +10,9 @@ POSTHOOK: type: DESCFUNCTION positive a - Returns a Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPositive Function type:BUILTIN -PREHOOK: query: -- synonym -DESCRIBE FUNCTION + +PREHOOK: query: DESCRIBE FUNCTION + PREHOOK: type: DESCFUNCTION -POSTHOOK: query: -- synonym -DESCRIBE FUNCTION + +POSTHOOK: query: DESCRIBE FUNCTION + POSTHOOK: type: DESCFUNCTION a + b - Returns a+b PREHOOK: query: DESCRIBE FUNCTION EXTENDED +
