http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_sort_array.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_sort_array.q.out b/ql/src/test/results/clientpositive/udf_sort_array.q.out index 6e90328..1e9dc85 100644 --- a/ql/src/test/results/clientpositive/udf_sort_array.q.out +++ b/ql/src/test/results/clientpositive/udf_sort_array.q.out @@ -19,12 +19,10 @@ Example: 'a', 'b', 'c', 'd' Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFSortArray Function type:BUILTIN -PREHOOK: query: -- Evaluate function against STRING valued keys -EXPLAIN +PREHOOK: query: EXPLAIN SELECT sort_array(array("b", "d", "c", "a")) FROM src tablesample (1 rows) PREHOOK: type: QUERY -POSTHOOK: query: -- Evaluate function against STRING valued keys -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT sort_array(array("b", "d", "c", "a")) FROM src tablesample (1 rows) POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -63,63 +61,52 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### ["enterprise databases","hadoop distributed file system","hadoop map-reduce"] -PREHOOK: query: -- Evaluate function against INT valued keys -SELECT sort_array(array(2, 9, 7, 3, 5, 4, 1, 6, 8)) FROM src tablesample (1 rows) +PREHOOK: query: SELECT sort_array(array(2, 9, 7, 3, 5, 4, 1, 6, 8)) 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 sort_array(array(2, 9, 7, 3, 5, 4, 1, 6, 8)) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT sort_array(array(2, 9, 7, 3, 5, 4, 1, 6, 8)) FROM src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### [1,2,3,4,5,6,7,8,9] -PREHOOK: query: -- Evaluate function against FLOAT valued keys -SELECT sort_array(sort_array(array(2.333, 9, 1.325, 2.003, 0.777, -3.445, 1))) FROM src tablesample (1 rows) +PREHOOK: query: SELECT sort_array(sort_array(array(2.333, 9, 1.325, 2.003, 0.777, -3.445, 1))) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- Evaluate function against FLOAT valued keys -SELECT sort_array(sort_array(array(2.333, 9, 1.325, 2.003, 0.777, -3.445, 1))) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT sort_array(sort_array(array(2.333, 9, 1.325, 2.003, 0.777, -3.445, 1))) FROM src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### [-3.445,0.777,1,1.325,2.003,2.333,9] -PREHOOK: query: -- Evaluate function against LIST valued keys -SELECT sort_array(array(array(2, 9, 7), array(3, 5, 4), array(1, 6, 8))) FROM src tablesample (1 rows) +PREHOOK: query: SELECT sort_array(array(array(2, 9, 7), array(3, 5, 4), array(1, 6, 8))) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- Evaluate function against LIST valued keys -SELECT sort_array(array(array(2, 9, 7), array(3, 5, 4), array(1, 6, 8))) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT sort_array(array(array(2, 9, 7), array(3, 5, 4), array(1, 6, 8))) FROM src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### [[1,6,8],[2,9,7],[3,5,4]] -PREHOOK: query: -- Evaluate function against STRUCT valued keys -SELECT sort_array(array(struct(2, 9, 7), struct(3, 5, 4), struct(1, 6, 8))) FROM src tablesample (1 rows) +PREHOOK: query: SELECT sort_array(array(struct(2, 9, 7), struct(3, 5, 4), struct(1, 6, 8))) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- Evaluate function against STRUCT valued keys -SELECT sort_array(array(struct(2, 9, 7), struct(3, 5, 4), struct(1, 6, 8))) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT sort_array(array(struct(2, 9, 7), struct(3, 5, 4), struct(1, 6, 8))) FROM src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### [{"col1":1,"col2":6,"col3":8},{"col1":2,"col2":9,"col3":7},{"col1":3,"col2":5,"col3":4}] -PREHOOK: query: -- Evaluate function against MAP valued keys -SELECT sort_array(array(map("b", 2, "a", 9, "c", 7), map("c", 3, "b", 5, "a", 1), map("a", 1, "c", 6, "b", 8))) FROM src tablesample (1 rows) +PREHOOK: query: SELECT sort_array(array(map("b", 2, "a", 9, "c", 7), map("c", 3, "b", 5, "a", 1), map("a", 1, "c", 6, "b", 8))) FROM src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- Evaluate function against MAP valued keys -SELECT sort_array(array(map("b", 2, "a", 9, "c", 7), map("c", 3, "b", 5, "a", 1), map("a", 1, "c", 6, "b", 8))) FROM src tablesample (1 rows) +POSTHOOK: query: SELECT sort_array(array(map("b", 2, "a", 9, "c", 7), map("c", 3, "b", 5, "a", 1), map("a", 1, "c", 6, "b", 8))) FROM src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### [{"a":1,"b":5,"c":3},{"a":1,"b":8,"c":6},{"a":9,"b":2,"c":7}] -PREHOOK: query: -- Test it against data in a table. -CREATE TABLE dest1 ( +PREHOOK: query: CREATE TABLE dest1 ( tinyints ARRAY<TINYINT>, smallints ARRAY<SMALLINT>, ints ARRAY<INT>,
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_translate.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_translate.q.out b/ql/src/test/results/clientpositive/udf_translate.q.out index 32c0c43..9004565 100644 --- a/ql/src/test/results/clientpositive/udf_translate.q.out +++ b/ql/src/test/results/clientpositive/udf_translate.q.out @@ -22,13 +22,11 @@ For example, translate('abcdef', 'ada', '192') returns '1bc9ef' replaces 'a' with '1' and 'd' with '9' ignoring the second occurence of 'a' in the from string mapping it to '2' Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFTranslate Function type:BUILTIN -PREHOOK: query: -- Create some tables to serve some input data -CREATE TABLE table_input(input STRING) +PREHOOK: query: CREATE TABLE table_input(input STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_input -POSTHOOK: query: -- Create some tables to serve some input data -CREATE TABLE table_input(input STRING) +POSTHOOK: query: CREATE TABLE table_input(input STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@table_input http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_trunc.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_trunc.q.out b/ql/src/test/results/clientpositive/udf_trunc.q.out index 2320dd7..7874d52 100644 --- a/ql/src/test/results/clientpositive/udf_trunc.q.out +++ b/ql/src/test/results/clientpositive/udf_trunc.q.out @@ -28,8 +28,7 @@ OK 1234567891 Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDFTrunc Function type:BUILTIN -PREHOOK: query: --test string with 'MM' as format -EXPLAIN +PREHOOK: query: EXPLAIN SELECT TRUNC('2014-01-01', 'MM'), TRUNC('2014-01-14', 'MM'), http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/udf_unhex.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_unhex.q.out b/ql/src/test/results/clientpositive/udf_unhex.q.out index c60645c..9b7c626 100644 --- a/ql/src/test/results/clientpositive/udf_unhex.q.out +++ b/ql/src/test/results/clientpositive/udf_unhex.q.out @@ -23,9 +23,7 @@ any nonhexadecimal digits in the argument, it returns NULL. Also, if there are an odd number of characters a leading 0 is appended. Function class:org.apache.hadoop.hive.ql.udf.UDFUnhex Function type:BUILTIN -PREHOOK: query: -- Good inputs - -SELECT +PREHOOK: query: SELECT unhex('4D7953514C'), unhex('31323637'), unhex('61'), http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/uniquejoin.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/uniquejoin.q.out b/ql/src/test/results/clientpositive/uniquejoin.q.out index b71d5b1..fcfe4dc 100644 --- a/ql/src/test/results/clientpositive/uniquejoin.q.out +++ b/ql/src/test/results/clientpositive/uniquejoin.q.out @@ -46,18 +46,14 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@t3 -PREHOOK: query: -- SORT_QUERY_RESULTS - -FROM UNIQUEJOIN PRESERVE T1 a (a.key), PRESERVE T2 b (b.key), PRESERVE T3 c (c.key) +PREHOOK: query: FROM UNIQUEJOIN PRESERVE T1 a (a.key), PRESERVE T2 b (b.key), PRESERVE T3 c (c.key) SELECT a.key, b.key, c.key PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 PREHOOK: Input: default@t3 #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -FROM UNIQUEJOIN PRESERVE T1 a (a.key), PRESERVE T2 b (b.key), PRESERVE T3 c (c.key) +POSTHOOK: query: FROM UNIQUEJOIN PRESERVE T1 a (a.key), PRESERVE T2 b (b.key), PRESERVE T3 c (c.key) SELECT a.key, b.key, c.key POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out b/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out index 7e28586..36f2aa4 100644 --- a/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out +++ b/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out @@ -1,14 +1,10 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table acid_uami(i int, +PREHOOK: query: create table acid_uami(i int, de decimal(5,2), vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uami -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table acid_uami(i int, +POSTHOOK: query: create table acid_uami(i int, de decimal(5,2), vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/update_after_multiple_inserts_special_characters.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/update_after_multiple_inserts_special_characters.q.out b/ql/src/test/results/clientpositive/update_after_multiple_inserts_special_characters.q.out index 8b8359a..e690ac1 100644 --- a/ql/src/test/results/clientpositive/update_after_multiple_inserts_special_characters.q.out +++ b/ql/src/test/results/clientpositive/update_after_multiple_inserts_special_characters.q.out @@ -1,14 +1,10 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table `aci/d_u/ami`(i int, +PREHOOK: query: create table `aci/d_u/ami`(i int, `d?*de e` decimal(5,2), vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@aci/d_u/ami -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table `aci/d_u/ami`(i int, +POSTHOOK: query: create table `aci/d_u/ami`(i int, `d?*de e` decimal(5,2), vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/update_all_types.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/update_all_types.q.out b/ql/src/test/results/clientpositive/update_all_types.q.out index c5c1abb..db9f166 100644 --- a/ql/src/test/results/clientpositive/update_all_types.q.out +++ b/ql/src/test/results/clientpositive/update_all_types.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table acid_uat(ti tinyint, +PREHOOK: query: create table acid_uat(ti tinyint, si smallint, i int, j int, @@ -17,9 +15,7 @@ create table acid_uat(ti tinyint, PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uat -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table acid_uat(ti tinyint, +POSTHOOK: query: create table acid_uat(ti tinyint, si smallint, i int, j int, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/update_orig_table.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/update_orig_table.q.out b/ql/src/test/results/clientpositive/update_orig_table.q.out index 66533e1..5b22fad 100644 --- a/ql/src/test/results/clientpositive/update_orig_table.q.out +++ b/ql/src/test/results/clientpositive/update_orig_table.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table acid_uot( +PREHOOK: query: create table acid_uot( ctinyint TINYINT, csmallint SMALLINT, cint INT, @@ -17,9 +15,7 @@ PREHOOK: type: CREATETABLE #### A masked pattern was here #### PREHOOK: Output: database:default PREHOOK: Output: default@acid_uot -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table acid_uot( +POSTHOOK: query: create table acid_uot( ctinyint TINYINT, csmallint SMALLINT, cint INT, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/varchar_1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/varchar_1.q.out b/ql/src/test/results/clientpositive/varchar_1.q.out index 8c9f59f..57d8ee6 100644 --- a/ql/src/test/results/clientpositive/varchar_1.q.out +++ b/ql/src/test/results/clientpositive/varchar_1.q.out @@ -22,13 +22,11 @@ POSTHOOK: query: create table varchar1_1 (key string, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar1_1 -PREHOOK: query: -- load from file -load data local inpath '../../data/files/srcbucket0.txt' overwrite into table varchar1 +PREHOOK: query: load data local inpath '../../data/files/srcbucket0.txt' overwrite into table varchar1 PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@varchar1 -POSTHOOK: query: -- load from file -load data local inpath '../../data/files/srcbucket0.txt' overwrite into table varchar1 +POSTHOOK: query: load data local inpath '../../data/files/srcbucket0.txt' overwrite into table varchar1 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@varchar1 @@ -42,14 +40,12 @@ POSTHOOK: Input: default@varchar1 #### A masked pattern was here #### 0 val_0 0 val_0 -PREHOOK: query: -- insert overwrite, from same/different length varchar -insert overwrite table varchar1 +PREHOOK: query: insert overwrite table varchar1 select cast(key as varchar(10)), cast(value as varchar(15)) from src order by key, value limit 2 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@varchar1 -POSTHOOK: query: -- insert overwrite, from same/different length varchar -insert overwrite table varchar1 +POSTHOOK: query: insert overwrite table varchar1 select cast(key as varchar(10)), cast(value as varchar(15)) from src order by key, value limit 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@src @@ -66,14 +62,12 @@ POSTHOOK: Input: default@varchar1 #### A masked pattern was here #### 0 val_0 0 val_0 -PREHOOK: query: -- insert overwrite, from string -insert overwrite table varchar1 +PREHOOK: query: insert overwrite table varchar1 select key, value from src order by key, value limit 2 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@varchar1 -POSTHOOK: query: -- insert overwrite, from string -insert overwrite table varchar1 +POSTHOOK: query: insert overwrite table varchar1 select key, value from src order by key, value limit 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@src @@ -90,14 +84,12 @@ POSTHOOK: Input: default@varchar1 #### A masked pattern was here #### 0 val_0 0 val_0 -PREHOOK: query: -- insert string from varchar -insert overwrite table varchar1_1 +PREHOOK: query: insert overwrite table varchar1_1 select key, value from varchar1 order by key, value limit 2 PREHOOK: type: QUERY PREHOOK: Input: default@varchar1 PREHOOK: Output: default@varchar1_1 -POSTHOOK: query: -- insert string from varchar -insert overwrite table varchar1_1 +POSTHOOK: query: insert overwrite table varchar1_1 select key, value from varchar1 order by key, value limit 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar1 @@ -114,14 +106,12 @@ POSTHOOK: Input: default@varchar1_1 #### A masked pattern was here #### 0 val_0 0 val_0 -PREHOOK: query: -- respect string length -insert overwrite table varchar1 +PREHOOK: query: insert overwrite table varchar1 select key, cast(value as varchar(3)) from src order by key, value limit 2 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@varchar1 -POSTHOOK: query: -- respect string length -insert overwrite table varchar1 +POSTHOOK: query: insert overwrite table varchar1 select key, cast(value as varchar(3)) from src order by key, value limit 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@src http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/varchar_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/varchar_2.q.out b/ql/src/test/results/clientpositive/varchar_2.q.out index db819c7..8c81ccc 100644 --- a/ql/src/test/results/clientpositive/varchar_2.q.out +++ b/ql/src/test/results/clientpositive/varchar_2.q.out @@ -47,8 +47,7 @@ val_10 10 1 val_100 200 2 val_103 206 2 val_104 208 2 -PREHOOK: query: -- should match the query from src -select value, sum(cast(key as int)), count(*) numrows +PREHOOK: query: select value, sum(cast(key as int)), count(*) numrows from varchar_2 group by value order by value asc @@ -56,8 +55,7 @@ limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@varchar_2 #### A masked pattern was here #### -POSTHOOK: query: -- should match the query from src -select value, sum(cast(key as int)), count(*) numrows +POSTHOOK: query: select value, sum(cast(key as int)), count(*) numrows from varchar_2 group by value order by value asc @@ -91,8 +89,7 @@ val_97 194 2 val_96 96 1 val_95 190 2 val_92 92 1 -PREHOOK: query: -- should match the query from src -select value, sum(cast(key as int)), count(*) numrows +PREHOOK: query: select value, sum(cast(key as int)), count(*) numrows from varchar_2 group by value order by value desc @@ -100,8 +97,7 @@ limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@varchar_2 #### A masked pattern was here #### -POSTHOOK: query: -- should match the query from src -select value, sum(cast(key as int)), count(*) numrows +POSTHOOK: query: select value, sum(cast(key as int)), count(*) numrows from varchar_2 group by value order by value desc http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/varchar_join1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/varchar_join1.q.out b/ql/src/test/results/clientpositive/varchar_join1.q.out index 9736fb1..b433a68 100644 --- a/ql/src/test/results/clientpositive/varchar_join1.q.out +++ b/ql/src/test/results/clientpositive/varchar_join1.q.out @@ -76,27 +76,23 @@ POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table va POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@varchar_join1_str -PREHOOK: query: -- Join varchar with same length varchar -select * from varchar_join1_vc1 a join varchar_join1_vc1 b on (a.c2 = b.c2) order by a.c1 +PREHOOK: query: select * from varchar_join1_vc1 a join varchar_join1_vc1 b on (a.c2 = b.c2) order by a.c1 PREHOOK: type: QUERY PREHOOK: Input: default@varchar_join1_vc1 #### A masked pattern was here #### -POSTHOOK: query: -- Join varchar with same length varchar -select * from varchar_join1_vc1 a join varchar_join1_vc1 b on (a.c2 = b.c2) order by a.c1 +POSTHOOK: query: select * from varchar_join1_vc1 a join varchar_join1_vc1 b on (a.c2 = b.c2) order by a.c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_join1_vc1 #### A masked pattern was here #### 1 abc 1 abc 2 abc 2 abc 3 abc 3 abc -PREHOOK: query: -- Join varchar with different length varchar -select * from varchar_join1_vc1 a join varchar_join1_vc2 b on (a.c2 = b.c2) order by a.c1 +PREHOOK: query: select * from varchar_join1_vc1 a join varchar_join1_vc2 b on (a.c2 = b.c2) order by a.c1 PREHOOK: type: QUERY PREHOOK: Input: default@varchar_join1_vc1 PREHOOK: Input: default@varchar_join1_vc2 #### A masked pattern was here #### -POSTHOOK: query: -- Join varchar with different length varchar -select * from varchar_join1_vc1 a join varchar_join1_vc2 b on (a.c2 = b.c2) order by a.c1 +POSTHOOK: query: select * from varchar_join1_vc1 a join varchar_join1_vc2 b on (a.c2 = b.c2) order by a.c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_join1_vc1 POSTHOOK: Input: default@varchar_join1_vc2 @@ -104,14 +100,12 @@ POSTHOOK: Input: default@varchar_join1_vc2 1 abc 1 abc 2 abc 2 abc 3 abc 3 abc -PREHOOK: query: -- Join varchar with string -select * from varchar_join1_vc1 a join varchar_join1_str b on (a.c2 = b.c2) order by a.c1 +PREHOOK: query: select * from varchar_join1_vc1 a join varchar_join1_str b on (a.c2 = b.c2) order by a.c1 PREHOOK: type: QUERY PREHOOK: Input: default@varchar_join1_str PREHOOK: Input: default@varchar_join1_vc1 #### A masked pattern was here #### -POSTHOOK: query: -- Join varchar with string -select * from varchar_join1_vc1 a join varchar_join1_str b on (a.c2 = b.c2) order by a.c1 +POSTHOOK: query: select * from varchar_join1_vc1 a join varchar_join1_str b on (a.c2 = b.c2) order by a.c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_join1_str POSTHOOK: Input: default@varchar_join1_vc1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/varchar_nested_types.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/varchar_nested_types.q.out b/ql/src/test/results/clientpositive/varchar_nested_types.q.out index e911425..fdc9e00 100644 --- a/ql/src/test/results/clientpositive/varchar_nested_types.q.out +++ b/ql/src/test/results/clientpositive/varchar_nested_types.q.out @@ -42,13 +42,11 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@varchar_nested_1 POSTHOOK: Lineage: varchar_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- arrays -create table varchar_nested_array (c1 array<varchar(20)>) +PREHOOK: query: create table varchar_nested_array (c1 array<varchar(20)>) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@varchar_nested_array -POSTHOOK: query: -- arrays -create table varchar_nested_array (c1 array<varchar(20)>) +POSTHOOK: query: create table varchar_nested_array (c1 array<varchar(20)>) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_nested_array @@ -79,13 +77,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_nested_array #### A masked pattern was here #### ["val_0","val_0"] -PREHOOK: query: -- maps -create table varchar_nested_map (c1 map<int, varchar(20)>) +PREHOOK: query: create table varchar_nested_map (c1 map<int, varchar(20)>) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@varchar_nested_map -POSTHOOK: query: -- maps -create table varchar_nested_map (c1 map<int, varchar(20)>) +POSTHOOK: query: create table varchar_nested_map (c1 map<int, varchar(20)>) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_nested_map @@ -116,13 +112,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_nested_map #### A masked pattern was here #### {0:"val_0"} -PREHOOK: query: -- structs -create table varchar_nested_struct (c1 struct<a:int, b:varchar(20), c:string>) +PREHOOK: query: create table varchar_nested_struct (c1 struct<a:int, b:varchar(20), c:string>) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@varchar_nested_struct -POSTHOOK: query: -- structs -create table varchar_nested_struct (c1 struct<a:int, b:varchar(20), c:string>) +POSTHOOK: query: create table varchar_nested_struct (c1 struct<a:int, b:varchar(20), c:string>) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_nested_struct @@ -159,15 +153,13 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_nested_struct #### A masked pattern was here #### {"a":0,"b":"val_0","c":"val_0"} -PREHOOK: query: -- nested type with create table as -create table varchar_nested_cta as +PREHOOK: query: create table varchar_nested_cta as select * from varchar_nested_struct PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@varchar_nested_struct PREHOOK: Output: database:default PREHOOK: Output: default@varchar_nested_cta -POSTHOOK: query: -- nested type with create table as -create table varchar_nested_cta as +POSTHOOK: query: create table varchar_nested_cta as select * from varchar_nested_struct POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@varchar_nested_struct @@ -190,15 +182,13 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_nested_cta #### A masked pattern was here #### {"a":0,"b":"val_0","c":"val_0"} -PREHOOK: query: -- nested type with view -create table varchar_nested_view as +PREHOOK: query: create table varchar_nested_view as select * from varchar_nested_struct PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@varchar_nested_struct PREHOOK: Output: database:default PREHOOK: Output: default@varchar_nested_view -POSTHOOK: query: -- nested type with view -create table varchar_nested_view as +POSTHOOK: query: create table varchar_nested_view as select * from varchar_nested_struct POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@varchar_nested_struct http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/varchar_serde.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/varchar_serde.q.out b/ql/src/test/results/clientpositive/varchar_serde.q.out index 5f3f2ed..62797e0 100644 --- a/ql/src/test/results/clientpositive/varchar_serde.q.out +++ b/ql/src/test/results/clientpositive/varchar_serde.q.out @@ -22,10 +22,7 @@ PREHOOK: query: drop table if exists varchar_serde_orc PREHOOK: type: DROPTABLE POSTHOOK: query: drop table if exists varchar_serde_orc POSTHOOK: type: DROPTABLE -PREHOOK: query: -- --- RegexSerDe --- -create table varchar_serde_regex ( +PREHOOK: query: create table varchar_serde_regex ( key varchar(10), value varchar(20) ) @@ -37,10 +34,7 @@ stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@varchar_serde_regex -POSTHOOK: query: -- --- RegexSerDe --- -create table varchar_serde_regex ( +POSTHOOK: query: create table varchar_serde_regex ( key varchar(10), value varchar(20) ) @@ -86,20 +80,14 @@ val_1 2 val_10 1 val_100 2 val_101 2 -PREHOOK: query: -- --- LazyBinary --- -create table varchar_serde_lb ( +PREHOOK: query: create table varchar_serde_lb ( key varchar(10), value varchar(20) ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@varchar_serde_lb -POSTHOOK: query: -- --- LazyBinary --- -create table varchar_serde_lb ( +POSTHOOK: query: create table varchar_serde_lb ( key varchar(10), value varchar(20) ) @@ -152,20 +140,14 @@ val_1 2 val_10 1 val_100 2 val_101 2 -PREHOOK: query: -- --- LazySimple --- -create table varchar_serde_ls ( +PREHOOK: query: create table varchar_serde_ls ( key varchar(10), value varchar(20) ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@varchar_serde_ls -POSTHOOK: query: -- --- LazySimple --- -create table varchar_serde_ls ( +POSTHOOK: query: create table varchar_serde_ls ( key varchar(10), value varchar(20) ) @@ -218,20 +200,14 @@ val_1 2 val_10 1 val_100 2 val_101 2 -PREHOOK: query: -- --- Columnar --- -create table varchar_serde_c ( +PREHOOK: query: create table varchar_serde_c ( key varchar(10), value varchar(20) ) stored as rcfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@varchar_serde_c -POSTHOOK: query: -- --- Columnar --- -create table varchar_serde_c ( +POSTHOOK: query: create table varchar_serde_c ( key varchar(10), value varchar(20) ) stored as rcfile @@ -284,20 +260,14 @@ val_1 2 val_10 1 val_100 2 val_101 2 -PREHOOK: query: -- --- LazyBinaryColumnar --- -create table varchar_serde_lbc ( +PREHOOK: query: create table varchar_serde_lbc ( key varchar(10), value varchar(20) ) stored as rcfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@varchar_serde_lbc -POSTHOOK: query: -- --- LazyBinaryColumnar --- -create table varchar_serde_lbc ( +POSTHOOK: query: create table varchar_serde_lbc ( key varchar(10), value varchar(20) ) stored as rcfile @@ -350,20 +320,14 @@ val_1 2 val_10 1 val_100 2 val_101 2 -PREHOOK: query: -- --- ORC --- -create table varchar_serde_orc ( +PREHOOK: query: create table varchar_serde_orc ( key varchar(10), value varchar(20) ) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@varchar_serde_orc -POSTHOOK: query: -- --- ORC --- -create table varchar_serde_orc ( +POSTHOOK: query: create table varchar_serde_orc ( key varchar(10), value varchar(20) ) stored as orc http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/varchar_union1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/varchar_union1.q.out b/ql/src/test/results/clientpositive/varchar_union1.q.out index 9a67de3..a52e6e8 100644 --- a/ql/src/test/results/clientpositive/varchar_union1.q.out +++ b/ql/src/test/results/clientpositive/varchar_union1.q.out @@ -76,8 +76,7 @@ POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table va POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@varchar_union1_str -PREHOOK: query: -- union varchar with same length varchar -select * from ( +PREHOOK: query: select * from ( select * from varchar_union1_vc1 union all select * from varchar_union1_vc1 limit 1 @@ -85,8 +84,7 @@ select * from ( PREHOOK: type: QUERY PREHOOK: Input: default@varchar_union1_vc1 #### A masked pattern was here #### -POSTHOOK: query: -- union varchar with same length varchar -select * from ( +POSTHOOK: query: select * from ( select * from varchar_union1_vc1 union all select * from varchar_union1_vc1 limit 1 @@ -95,8 +93,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_union1_vc1 #### A masked pattern was here #### 1 abc -PREHOOK: query: -- union varchar with different length varchar -select * from ( +PREHOOK: query: select * from ( select * from varchar_union1_vc1 union all select * from varchar_union1_vc2 limit 1 @@ -105,8 +102,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@varchar_union1_vc1 PREHOOK: Input: default@varchar_union1_vc2 #### A masked pattern was here #### -POSTHOOK: query: -- union varchar with different length varchar -select * from ( +POSTHOOK: query: select * from ( select * from varchar_union1_vc1 union all select * from varchar_union1_vc2 limit 1 @@ -116,8 +112,7 @@ POSTHOOK: Input: default@varchar_union1_vc1 POSTHOOK: Input: default@varchar_union1_vc2 #### A masked pattern was here #### 1 abc -PREHOOK: query: -- union varchar with string -select * from ( +PREHOOK: query: select * from ( select * from varchar_union1_vc1 union all select * from varchar_union1_str limit 1 @@ -126,8 +121,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@varchar_union1_str PREHOOK: Input: default@varchar_union1_vc1 #### A masked pattern was here #### -POSTHOOK: query: -- union varchar with string -select * from ( +POSTHOOK: query: select * from ( select * from varchar_union1_vc1 union all select * from varchar_union1_str limit 1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_aggregate_9.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_aggregate_9.q.out b/ql/src/test/results/clientpositive/vector_aggregate_9.q.out index 19f8093..6dc5479 100644 --- a/ql/src/test/results/clientpositive/vector_aggregate_9.q.out +++ b/ql/src/test/results/clientpositive/vector_aggregate_9.q.out @@ -152,15 +152,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- SORT_QUERY_RESULTS - -select min(dc), max(dc), sum(dc), avg(dc) from vectortab2korc +PREHOOK: query: select min(dc), max(dc), sum(dc), avg(dc) from vectortab2korc PREHOOK: type: QUERY PREHOOK: Input: default@vectortab2korc #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -select min(dc), max(dc), sum(dc), avg(dc) from vectortab2korc +POSTHOOK: query: select min(dc), max(dc), sum(dc), avg(dc) from vectortab2korc POSTHOOK: type: QUERY POSTHOOK: Input: default@vectortab2korc #### A masked pattern was here #### http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out b/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out index 2110d43..850278e 100644 --- a/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out +++ b/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out @@ -6,8 +6,7 @@ PREHOOK: query: DROP TABLE hundredorc PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE hundredorc POSTHOOK: type: DROPTABLE -PREHOOK: query: -- data setup -CREATE TABLE over1k(t tinyint, +PREHOOK: query: CREATE TABLE over1k(t tinyint, si smallint, i int, b bigint, @@ -23,8 +22,7 @@ STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@over1k -POSTHOOK: query: -- data setup -CREATE TABLE over1k(t tinyint, +POSTHOOK: query: CREATE TABLE over1k(t tinyint, si smallint, i int, b bigint, @@ -302,15 +300,11 @@ POSTHOOK: Input: default@hundredorc 3 xylophone band 2 yard duty 3 zync studies -PREHOOK: query: -- HIVE-14045: Involve a binary vector scratch column for small table result (Native Vector MapJoin). - -EXPLAIN +PREHOOK: query: EXPLAIN SELECT t1.i, t1.bin, t2.bin FROM hundredorc t1 JOIN hundredorc t2 ON t1.i = t2.i PREHOOK: type: QUERY -POSTHOOK: query: -- HIVE-14045: Involve a binary vector scratch column for small table result (Native Vector MapJoin). - -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT t1.i, t1.bin, t2.bin FROM hundredorc t1 JOIN hundredorc t2 ON t1.i = t2.i POSTHOOK: type: QUERY http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_cast_constant.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_cast_constant.q.out b/ql/src/test/results/clientpositive/vector_cast_constant.q.out index 5cd8085..7a31b14 100644 --- a/ql/src/test/results/clientpositive/vector_cast_constant.q.out +++ b/ql/src/test/results/clientpositive/vector_cast_constant.q.out @@ -6,8 +6,7 @@ PREHOOK: query: DROP TABLE over1korc PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE over1korc POSTHOOK: type: DROPTABLE -PREHOOK: query: -- data setup -CREATE TABLE over1k(t tinyint, +PREHOOK: query: CREATE TABLE over1k(t tinyint, si smallint, i int, b bigint, @@ -23,8 +22,7 @@ STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@over1k -POSTHOOK: query: -- data setup -CREATE TABLE over1k(t tinyint, +POSTHOOK: query: CREATE TABLE over1k(t tinyint, si smallint, i int, b bigint, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_char_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_char_2.q.out b/ql/src/test/results/clientpositive/vector_char_2.q.out index dfe545b..4aad1e2 100644 --- a/ql/src/test/results/clientpositive/vector_char_2.q.out +++ b/ql/src/test/results/clientpositive/vector_char_2.q.out @@ -135,8 +135,7 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- should match the query from src -select value, sum(cast(key as int)), count(*) numrows +PREHOOK: query: select value, sum(cast(key as int)), count(*) numrows from char_2 group by value order by value asc @@ -144,8 +143,7 @@ limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@char_2 #### A masked pattern was here #### -POSTHOOK: query: -- should match the query from src -select value, sum(cast(key as int)), count(*) numrows +POSTHOOK: query: select value, sum(cast(key as int)), count(*) numrows from char_2 group by value order by value asc @@ -267,8 +265,7 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- should match the query from src -select value, sum(cast(key as int)), count(*) numrows +PREHOOK: query: select value, sum(cast(key as int)), count(*) numrows from char_2 group by value order by value desc @@ -276,8 +273,7 @@ limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@char_2 #### A masked pattern was here #### -POSTHOOK: query: -- should match the query from src -select value, sum(cast(key as int)), count(*) numrows +POSTHOOK: query: select value, sum(cast(key as int)), count(*) numrows from char_2 group by value order by value desc http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out b/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out index 6528f75..c3b7d23 100644 --- a/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out +++ b/ql/src/test/results/clientpositive/vector_char_mapjoin1.q.out @@ -124,11 +124,9 @@ POSTHOOK: Output: database:default POSTHOOK: Output: default@char_join1_str_orc POSTHOOK: Lineage: char_join1_str_orc.c1 SIMPLE [(char_join1_str)char_join1_str.FieldSchema(name:c1, type:int, comment:null), ] POSTHOOK: Lineage: char_join1_str_orc.c2 SIMPLE [(char_join1_str)char_join1_str.FieldSchema(name:c2, type:string, comment:null), ] -PREHOOK: query: -- Join char with same length char -explain select * from char_join1_vc1_orc a join char_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1 +PREHOOK: query: explain select * from char_join1_vc1_orc a join char_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1 PREHOOK: type: QUERY -POSTHOOK: query: -- Join char with same length char -explain select * from char_join1_vc1_orc a join char_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1 +POSTHOOK: query: explain select * from char_join1_vc1_orc a join char_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-5 is a root stage @@ -207,15 +205,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- SORT_QUERY_RESULTS - -select * from char_join1_vc1_orc a join char_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1 +PREHOOK: query: select * from char_join1_vc1_orc a join char_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1 PREHOOK: type: QUERY PREHOOK: Input: default@char_join1_vc1_orc #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -select * from char_join1_vc1_orc a join char_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1 +POSTHOOK: query: select * from char_join1_vc1_orc a join char_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@char_join1_vc1_orc #### A masked pattern was here #### @@ -224,11 +218,9 @@ POSTHOOK: Input: default@char_join1_vc1_orc 2 abc 1 abc 2 abc 2 abc 3 abc 3 abc -PREHOOK: query: -- Join char with different length char -explain select * from char_join1_vc1_orc a join char_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1 +PREHOOK: query: explain select * from char_join1_vc1_orc a join char_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1 PREHOOK: type: QUERY -POSTHOOK: query: -- Join char with different length char -explain select * from char_join1_vc1_orc a join char_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1 +POSTHOOK: query: explain select * from char_join1_vc1_orc a join char_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-5 is a root stage @@ -307,16 +299,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- SORT_QUERY_RESULTS - -select * from char_join1_vc1_orc a join char_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1 +PREHOOK: query: select * from char_join1_vc1_orc a join char_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1 PREHOOK: type: QUERY PREHOOK: Input: default@char_join1_vc1_orc PREHOOK: Input: default@char_join1_vc2_orc #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -select * from char_join1_vc1_orc a join char_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1 +POSTHOOK: query: select * from char_join1_vc1_orc a join char_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@char_join1_vc1_orc POSTHOOK: Input: default@char_join1_vc2_orc @@ -326,11 +314,9 @@ POSTHOOK: Input: default@char_join1_vc2_orc 2 abc 1 abc 2 abc 2 abc 3 abc 3 abc -PREHOOK: query: -- Join char with string -explain select * from char_join1_vc1_orc a join char_join1_str_orc b on (a.c2 = b.c2) order by a.c1 +PREHOOK: query: explain select * from char_join1_vc1_orc a join char_join1_str_orc b on (a.c2 = b.c2) order by a.c1 PREHOOK: type: QUERY -POSTHOOK: query: -- Join char with string -explain select * from char_join1_vc1_orc a join char_join1_str_orc b on (a.c2 = b.c2) order by a.c1 +POSTHOOK: query: explain select * from char_join1_vc1_orc a join char_join1_str_orc b on (a.c2 = b.c2) order by a.c1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-5 is a root stage @@ -409,16 +395,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- SORT_QUERY_RESULTS - -select * from char_join1_vc1_orc a join char_join1_str_orc b on (a.c2 = b.c2) order by a.c1 +PREHOOK: query: select * from char_join1_vc1_orc a join char_join1_str_orc b on (a.c2 = b.c2) order by a.c1 PREHOOK: type: QUERY PREHOOK: Input: default@char_join1_str_orc PREHOOK: Input: default@char_join1_vc1_orc #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -select * from char_join1_vc1_orc a join char_join1_str_orc b on (a.c2 = b.c2) order by a.c1 +POSTHOOK: query: select * from char_join1_vc1_orc a join char_join1_str_orc b on (a.c2 = b.c2) order by a.c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@char_join1_str_orc POSTHOOK: Input: default@char_join1_vc1_orc http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_char_simple.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_char_simple.q.out b/ql/src/test/results/clientpositive/vector_char_simple.q.out index e1dedae..ddbc4f0 100644 --- a/ql/src/test/results/clientpositive/vector_char_simple.q.out +++ b/ql/src/test/results/clientpositive/vector_char_simple.q.out @@ -99,16 +99,14 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- should match the query from src -select key, value +PREHOOK: query: select key, value from char_2 order by key asc limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@char_2 #### A masked pattern was here #### -POSTHOOK: query: -- should match the query from src -select key, value +POSTHOOK: query: select key, value from char_2 order by key asc limit 5 @@ -193,16 +191,14 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- should match the query from src -select key, value +PREHOOK: query: select key, value from char_2 order by key desc limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@char_2 #### A masked pattern was here #### -POSTHOOK: query: -- should match the query from src -select key, value +POSTHOOK: query: select key, value from char_2 order by key desc limit 5 @@ -222,15 +218,13 @@ POSTHOOK: query: drop table char_2 POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@char_2 POSTHOOK: Output: default@char_2 -PREHOOK: query: -- Implicit conversion. Occurs in reduce-side under Tez. -create table char_3 ( +PREHOOK: query: create table char_3 ( field char(12) ) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@char_3 -POSTHOOK: query: -- Implicit conversion. Occurs in reduce-side under Tez. -create table char_3 ( +POSTHOOK: query: create table char_3 ( field char(12) ) stored as orc POSTHOOK: type: CREATETABLE http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_coalesce.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_coalesce.q.out b/ql/src/test/results/clientpositive/vector_coalesce.q.out index 0101b66..6344ddc 100644 --- a/ql/src/test/results/clientpositive/vector_coalesce.q.out +++ b/ql/src/test/results/clientpositive/vector_coalesce.q.out @@ -1,14 +1,10 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -EXPLAIN SELECT cdouble, cstring1, cint, cfloat, csmallint, coalesce(cdouble, cstring1, cint, cfloat, csmallint) as c +PREHOOK: query: EXPLAIN SELECT cdouble, cstring1, cint, cfloat, csmallint, coalesce(cdouble, cstring1, cint, cfloat, csmallint) as c FROM alltypesorc WHERE (cdouble IS NULL) ORDER BY cdouble, cstring1, cint, cfloat, csmallint, c LIMIT 10 PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - -EXPLAIN SELECT cdouble, cstring1, cint, cfloat, csmallint, coalesce(cdouble, cstring1, cint, cfloat, csmallint) as c +POSTHOOK: query: EXPLAIN SELECT cdouble, cstring1, cint, cfloat, csmallint, coalesce(cdouble, cstring1, cint, cfloat, csmallint) as c FROM alltypesorc WHERE (cdouble IS NULL) ORDER BY cdouble, cstring1, cint, cfloat, csmallint, c http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_complex_join.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_complex_join.q.out b/ql/src/test/results/clientpositive/vector_complex_join.q.out index 2d32039..92cb5d5 100644 --- a/ql/src/test/results/clientpositive/vector_complex_join.q.out +++ b/ql/src/test/results/clientpositive/vector_complex_join.q.out @@ -1,12 +1,8 @@ -PREHOOK: query: -- From HIVE-10729. Not expected to vectorize this query. --- -CREATE TABLE test (a INT, b MAP<INT, STRING>) STORED AS ORC +PREHOOK: query: CREATE TABLE test (a INT, b MAP<INT, STRING>) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@test -POSTHOOK: query: -- From HIVE-10729. Not expected to vectorize this query. --- -CREATE TABLE test (a INT, b MAP<INT, STRING>) STORED AS ORC +POSTHOOK: query: CREATE TABLE test (a INT, b MAP<INT, STRING>) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@test http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_count.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_count.q.out b/ql/src/test/results/clientpositive/vector_count.q.out index 734ef39..e829ad8 100644 --- a/ql/src/test/results/clientpositive/vector_count.q.out +++ b/ql/src/test/results/clientpositive/vector_count.q.out @@ -1,12 +1,8 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table abcd_txt (a int, b int, c int, d int) +PREHOOK: query: create table abcd_txt (a int, b int, c int, d int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@abcd_txt -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table abcd_txt (a int, b int, c int, d int) +POSTHOOK: query: create table abcd_txt (a int, b int, c int, d int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@abcd_txt http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_data_types.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_data_types.q.out b/ql/src/test/results/clientpositive/vector_data_types.q.out index 804d9e6..63e545f 100644 --- a/ql/src/test/results/clientpositive/vector_data_types.q.out +++ b/ql/src/test/results/clientpositive/vector_data_types.q.out @@ -6,8 +6,7 @@ PREHOOK: query: DROP TABLE over1korc PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE over1korc POSTHOOK: type: DROPTABLE -PREHOOK: query: -- data setup -CREATE TABLE over1k(t tinyint, +PREHOOK: query: CREATE TABLE over1k(t tinyint, si smallint, i int, b bigint, @@ -23,8 +22,7 @@ STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@over1k -POSTHOOK: query: -- data setup -CREATE TABLE over1k(t tinyint, +POSTHOOK: query: CREATE TABLE over1k(t tinyint, si smallint, i int, b bigint, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_date_1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_date_1.q.out b/ql/src/test/results/clientpositive/vector_date_1.q.out index df3efa7..0cce38e 100644 --- a/ql/src/test/results/clientpositive/vector_date_1.q.out +++ b/ql/src/test/results/clientpositive/vector_date_1.q.out @@ -46,8 +46,7 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@vector_date_1 POSTHOOK: Lineage: vector_date_1.dt1 SIMPLE [] POSTHOOK: Lineage: vector_date_1.dt2 SIMPLE [] -PREHOOK: query: -- column-to-column comparison in select clause -explain +PREHOOK: query: explain select dt1, dt2, -- should be all true @@ -61,8 +60,7 @@ select dt2 > dt1 from vector_date_1 order by dt1 PREHOOK: type: QUERY -POSTHOOK: query: -- column-to-column comparison in select clause -explain +POSTHOOK: query: explain select dt1, dt2, -- should be all true @@ -250,8 +248,7 @@ POSTHOOK: Input: default@vector_date_1 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1999-12-31 2000-01-01 false false false false false false false false 2001-01-01 2001-06-01 false false false false false false false false -PREHOOK: query: -- column-to-literal/literal-to-column comparison in select clause -explain +PREHOOK: query: explain select dt1, -- should be all true @@ -265,8 +262,7 @@ select date '1970-01-01' < dt1 from vector_date_1 order by dt1 PREHOOK: type: QUERY -POSTHOOK: query: -- column-to-literal/literal-to-column comparison in select clause -explain +POSTHOOK: query: explain select dt1, -- should be all true @@ -454,9 +450,7 @@ POSTHOOK: Input: default@vector_date_1 NULL NULL NULL NULL NULL NULL NULL NULL NULL 1999-12-31 false false false false false false false false 2001-01-01 false false false false false false false false -PREHOOK: query: -- column-to-column comparisons in predicate --- all rows with non-null dt1 should be returned -explain +PREHOOK: query: explain select dt1, dt2 from vector_date_1 @@ -469,9 +463,7 @@ where and dt2 >= dt1 order by dt1 PREHOOK: type: QUERY -POSTHOOK: query: -- column-to-column comparisons in predicate --- all rows with non-null dt1 should be returned -explain +POSTHOOK: query: explain select dt1, dt2 from vector_date_1 @@ -557,9 +549,7 @@ POSTHOOK: Input: default@vector_date_1 #### A masked pattern was here #### 1999-12-31 2000-01-01 2001-01-01 2001-06-01 -PREHOOK: query: -- column-to-literal/literal-to-column comparison in predicate --- only a single row should be returned -explain +PREHOOK: query: explain select dt1, dt2 from vector_date_1 @@ -574,9 +564,7 @@ where and date '1970-01-01' <= dt1 order by dt1 PREHOOK: type: QUERY -POSTHOOK: query: -- column-to-literal/literal-to-column comparison in predicate --- only a single row should be returned -explain +POSTHOOK: query: explain select dt1, dt2 from vector_date_1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out b/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out index b022435..626ff87 100644 --- a/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out +++ b/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out @@ -20,20 +20,14 @@ POSTHOOK: Lineage: decimal_vgby.cdecimal1 EXPRESSION [(alltypesorc)alltypesorc.F POSTHOOK: Lineage: decimal_vgby.cdecimal2 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] POSTHOOK: Lineage: decimal_vgby.cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] POSTHOOK: Lineage: decimal_vgby.cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] -PREHOOK: query: -- SORT_QUERY_RESULTS - --- First only do simple aggregations that output primitives only -EXPLAIN SELECT cint, +PREHOOK: query: EXPLAIN SELECT cint, COUNT(cdecimal1), MAX(cdecimal1), MIN(cdecimal1), SUM(cdecimal1), COUNT(cdecimal2), MAX(cdecimal2), MIN(cdecimal2), SUM(cdecimal2) FROM decimal_vgby GROUP BY cint HAVING COUNT(*) > 1 PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - --- First only do simple aggregations that output primitives only -EXPLAIN SELECT cint, +POSTHOOK: query: EXPLAIN SELECT cint, COUNT(cdecimal1), MAX(cdecimal1), MIN(cdecimal1), SUM(cdecimal1), COUNT(cdecimal2), MAX(cdecimal2), MIN(cdecimal2), SUM(cdecimal2) FROM decimal_vgby @@ -122,16 +116,14 @@ POSTHOOK: Input: default@decimal_vgby 6981 3 5831542.2692483780 -515.6210729730 5830511.0271024320 3 6984454.21109769200000 -617.56077692307690 6983219.08954384584620 762 2 5831542.2692483780 1531.2194054054 5833073.4886537834 2 6984454.21109769200000 1833.94569230769250 6986288.15678999969250 NULL 3072 9318.4351351351 -4298.1513513514 5018444.1081079808 3072 11160.71538461538500 -5147.90769230769300 6010604.30769230735360 -PREHOOK: query: -- Now add the others... -EXPLAIN SELECT cint, +PREHOOK: query: EXPLAIN SELECT cint, COUNT(cdecimal1), MAX(cdecimal1), MIN(cdecimal1), SUM(cdecimal1), AVG(cdecimal1), STDDEV_POP(cdecimal1), STDDEV_SAMP(cdecimal1), COUNT(cdecimal2), MAX(cdecimal2), MIN(cdecimal2), SUM(cdecimal2), AVG(cdecimal2), STDDEV_POP(cdecimal2), STDDEV_SAMP(cdecimal2) FROM decimal_vgby GROUP BY cint HAVING COUNT(*) > 1 PREHOOK: type: QUERY -POSTHOOK: query: -- Now add the others... -EXPLAIN SELECT cint, +POSTHOOK: query: EXPLAIN SELECT cint, COUNT(cdecimal1), MAX(cdecimal1), MIN(cdecimal1), SUM(cdecimal1), AVG(cdecimal1), STDDEV_POP(cdecimal1), STDDEV_SAMP(cdecimal1), COUNT(cdecimal2), MAX(cdecimal2), MIN(cdecimal2), SUM(cdecimal2), AVG(cdecimal2), STDDEV_POP(cdecimal2), STDDEV_SAMP(cdecimal2) FROM decimal_vgby http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out b/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out index 316dabc..7e0c240 100644 --- a/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out +++ b/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out @@ -1,13 +1,9 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE decimal_test STORED AS ORC AS SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc +PREHOOK: query: CREATE TABLE decimal_test STORED AS ORC AS SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@alltypesorc PREHOOK: Output: database:default PREHOOK: Output: default@decimal_test -POSTHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE decimal_test STORED AS ORC AS SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc +POSTHOOK: query: CREATE TABLE decimal_test STORED AS ORC AS SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: database:default http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_decimal_round_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_decimal_round_2.q.out b/ql/src/test/results/clientpositive/vector_decimal_round_2.q.out index 4973f0c..be190c7 100644 --- a/ql/src/test/results/clientpositive/vector_decimal_round_2.q.out +++ b/ql/src/test/results/clientpositive/vector_decimal_round_2.q.out @@ -24,32 +24,14 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_1_orc #### A masked pattern was here #### 55555.000000000000000000 -PREHOOK: query: -- EXPLAIN --- SELECT dec, round(null), round(null, 0), round(125, null), --- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; - --- SELECT dec, round(null), round(null, 0), round(125, null), --- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; - -EXPLAIN +PREHOOK: query: EXPLAIN SELECT round(dec) as d, round(dec, 0), round(dec, 1), round(dec, 2), round(dec, 3), round(dec, -1), round(dec, -2), round(dec, -3), round(dec, -4), round(dec, -5), round(dec, -6), round(dec, -7), round(dec, -8) FROM decimal_tbl_1_orc ORDER BY d PREHOOK: type: QUERY -POSTHOOK: query: -- EXPLAIN --- SELECT dec, round(null), round(null, 0), round(125, null), --- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; - --- SELECT dec, round(null), round(null, 0), round(125, null), --- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; - -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT round(dec) as d, round(dec, 0), round(dec, 1), round(dec, 2), round(dec, 3), round(dec, -1), round(dec, -2), round(dec, -3), round(dec, -4), http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_distinct_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_distinct_2.q.out b/ql/src/test/results/clientpositive/vector_distinct_2.q.out index dba2e6e..8fb5c50 100644 --- a/ql/src/test/results/clientpositive/vector_distinct_2.q.out +++ b/ql/src/test/results/clientpositive/vector_distinct_2.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table vectortab2k( +PREHOOK: query: create table vectortab2k( t tinyint, si smallint, i int, @@ -19,9 +17,7 @@ STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@vectortab2k -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table vectortab2k( +POSTHOOK: query: create table vectortab2k( t tinyint, si smallint, i int, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_empty_where.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_empty_where.q.out b/ql/src/test/results/clientpositive/vector_empty_where.q.out index 8f694da..ac7ee0c 100644 --- a/ql/src/test/results/clientpositive/vector_empty_where.q.out +++ b/ql/src/test/results/clientpositive/vector_empty_where.q.out @@ -1,9 +1,7 @@ -PREHOOK: query: -- HIVE- -explain +PREHOOK: query: explain select count (distinct cint) from alltypesorc where cstring1 PREHOOK: type: QUERY -POSTHOOK: query: -- HIVE- -explain +POSTHOOK: query: explain select count (distinct cint) from alltypesorc where cstring1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_groupby4.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_groupby4.q.out b/ql/src/test/results/clientpositive/vector_groupby4.q.out index 8041511..cf65d7a 100644 --- a/ql/src/test/results/clientpositive/vector_groupby4.q.out +++ b/ql/src/test/results/clientpositive/vector_groupby4.q.out @@ -10,15 +10,11 @@ POSTHOOK: Output: database:default POSTHOOK: Output: default@srcorc POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE dest1(c1 STRING) STORED AS ORC +PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE dest1(c1 STRING) STORED AS ORC +POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS ORC 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/vector_groupby6.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_groupby6.q.out b/ql/src/test/results/clientpositive/vector_groupby6.q.out index 63fe8f3..ecb361c 100644 --- a/ql/src/test/results/clientpositive/vector_groupby6.q.out +++ b/ql/src/test/results/clientpositive/vector_groupby6.q.out @@ -10,15 +10,11 @@ POSTHOOK: Output: database:default POSTHOOK: Output: default@srcorc POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE dest1(c1 STRING) STORED AS ORC +PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE dest1(c1 STRING) STORED AS ORC +POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS ORC 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/vector_groupby_3.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_groupby_3.q.out b/ql/src/test/results/clientpositive/vector_groupby_3.q.out index 38eeeef..be37cac 100644 --- a/ql/src/test/results/clientpositive/vector_groupby_3.q.out +++ b/ql/src/test/results/clientpositive/vector_groupby_3.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table vectortab2k( +PREHOOK: query: create table vectortab2k( t tinyint, si smallint, i int, @@ -19,9 +17,7 @@ STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@vectortab2k -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table vectortab2k( +POSTHOOK: query: create table vectortab2k( t tinyint, si smallint, i int, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out b/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out index 8ab20c8..1652996 100644 --- a/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out @@ -1,14 +1,12 @@ Warning: Map Join MAPJOIN[35][bigTable=?] in task 'Stage-8:MAPRED' is a cross product -PREHOOK: query: -- HIVE-12738 -- We are checking if a MapJoin after a GroupBy will work properly. -explain +PREHOOK: query: explain select * from src where not key in (select key from src) order by key PREHOOK: type: QUERY -POSTHOOK: query: -- HIVE-12738 -- We are checking if a MapJoin after a GroupBy will work properly. -explain +POSTHOOK: query: explain select * from src where not key in http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_grouping_sets.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_grouping_sets.q.out b/ql/src/test/results/clientpositive/vector_grouping_sets.q.out index 598ab38..58d1f87 100644 --- a/ql/src/test/results/clientpositive/vector_grouping_sets.q.out +++ b/ql/src/test/results/clientpositive/vector_grouping_sets.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- We are not expecting either query to vectorize due to use of pruneing grouping set id, --- or use of GROUPING__ID virtual column. -create table store_txt +PREHOOK: query: create table store_txt ( s_store_sk int, s_store_id string, @@ -37,9 +35,7 @@ stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@store_txt -POSTHOOK: query: -- We are not expecting either query to vectorize due to use of pruneing grouping set id, --- or use of GROUPING__ID virtual column. -create table store_txt +POSTHOOK: query: create table store_txt ( s_store_sk int, s_store_id string, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_include_no_sel.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_include_no_sel.q.out b/ql/src/test/results/clientpositive/vector_include_no_sel.q.out index 697d422..e2dcb5d 100644 --- a/ql/src/test/results/clientpositive/vector_include_no_sel.q.out +++ b/ql/src/test/results/clientpositive/vector_include_no_sel.q.out @@ -1,13 +1,4 @@ -PREHOOK: query: -- HIVE-13872 --- Looking for TableScan immediately followed by ReduceSink (no intervening SEL operator). --- This caused problems for Vectorizer not eliminating columns which are not included. --- The input file format didn't fill in those vectorized columns and thus caused NPE in --- ReduceSink. --- Only a problem when NOT CBO because of CBO rule-based transforms. --- --- Using a cross-product. - -create table store_sales_txt +PREHOOK: query: create table store_sales_txt ( ss_sold_date_sk int, ss_sold_time_sk int, @@ -38,16 +29,7 @@ stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@store_sales_txt -POSTHOOK: query: -- HIVE-13872 --- Looking for TableScan immediately followed by ReduceSink (no intervening SEL operator). --- This caused problems for Vectorizer not eliminating columns which are not included. --- The input file format didn't fill in those vectorized columns and thus caused NPE in --- ReduceSink. --- Only a problem when NOT CBO because of CBO rule-based transforms. --- --- Using a cross-product. - -create table store_sales_txt +POSTHOOK: query: create table store_sales_txt ( ss_sold_date_sk int, ss_sold_time_sk int, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_interval_1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_interval_1.q.out b/ql/src/test/results/clientpositive/vector_interval_1.q.out index 11eae55..38e2ca0 100644 --- a/ql/src/test/results/clientpositive/vector_interval_1.q.out +++ b/ql/src/test/results/clientpositive/vector_interval_1.q.out @@ -38,16 +38,14 @@ POSTHOOK: Lineage: vector_interval_1.dt EXPRESSION [] POSTHOOK: Lineage: vector_interval_1.str1 EXPRESSION [] POSTHOOK: Lineage: vector_interval_1.str2 EXPRESSION [] POSTHOOK: Lineage: vector_interval_1.ts EXPRESSION [] -PREHOOK: query: -- constants/cast from string -explain +PREHOOK: query: explain select str1, interval '1-2' year to month, interval_year_month(str1), interval '1 2:3:4' day to second, interval_day_time(str2) from vector_interval_1 order by str1 PREHOOK: type: QUERY -POSTHOOK: query: -- constants/cast from string -explain +POSTHOOK: query: explain select str1, interval '1-2' year to month, interval_year_month(str1), @@ -112,8 +110,7 @@ POSTHOOK: Input: default@vector_interval_1 #### A masked pattern was here #### NULL 1-2 NULL 1 02:03:04.000000000 NULL 1-2 1-2 1-2 1 02:03:04.000000000 1 02:03:04.000000000 -PREHOOK: query: -- interval arithmetic -explain +PREHOOK: query: explain select dt, interval '1-2' year to month + interval '1-2' year to month, @@ -124,8 +121,7 @@ select interval '1-2' year to month - interval_year_month(str1) from vector_interval_1 order by dt PREHOOK: type: QUERY -POSTHOOK: query: -- interval arithmetic -explain +POSTHOOK: query: explain select dt, interval '1-2' year to month + interval '1-2' year to month, @@ -290,8 +286,7 @@ POSTHOOK: Input: default@vector_interval_1 #### A masked pattern was here #### NULL 2 04:06:08.000000000 NULL NULL 0 00:00:00.000000000 NULL NULL 2001-01-01 2 04:06:08.000000000 2 04:06:08.000000000 2 04:06:08.000000000 0 00:00:00.000000000 0 00:00:00.000000000 0 00:00:00.000000000 -PREHOOK: query: -- date-interval arithmetic -explain +PREHOOK: query: explain select dt, dt + interval '1-2' year to month, @@ -308,8 +303,7 @@ select dt - interval_day_time(str2) from vector_interval_1 order by dt PREHOOK: type: QUERY -POSTHOOK: query: -- date-interval arithmetic -explain +POSTHOOK: query: explain select dt, dt + interval '1-2' year to month, @@ -404,8 +398,7 @@ POSTHOOK: Input: default@vector_interval_1 #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 2001-01-01 2002-03-01 2002-03-01 2002-03-01 2002-03-01 1999-11-01 1999-11-01 2001-01-02 02:03:04 2001-01-02 02:03:04 2001-01-02 02:03:04 2001-01-02 02:03:04 2000-12-30 21:56:56 2000-12-30 21:56:56 -PREHOOK: query: -- timestamp-interval arithmetic -explain +PREHOOK: query: explain select ts, ts + interval '1-2' year to month, @@ -422,8 +415,7 @@ select ts - interval_day_time(str2) from vector_interval_1 order by ts PREHOOK: type: QUERY -POSTHOOK: query: -- timestamp-interval arithmetic -explain +POSTHOOK: query: explain select ts, ts + interval '1-2' year to month, @@ -518,8 +510,7 @@ POSTHOOK: Input: default@vector_interval_1 #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 2001-01-01 01:02:03 2002-03-01 01:02:03 2002-03-01 01:02:03 2002-03-01 01:02:03 2002-03-01 01:02:03 1999-11-01 01:02:03 1999-11-01 01:02:03 2001-01-02 03:05:07 2001-01-02 03:05:07 2001-01-02 03:05:07 2001-01-02 03:05:07 2000-12-30 22:58:59 2000-12-30 22:58:59 -PREHOOK: query: -- timestamp-timestamp arithmetic -explain +PREHOOK: query: explain select ts, ts - ts, @@ -527,8 +518,7 @@ select ts - timestamp '2001-01-01 01:02:03' from vector_interval_1 order by ts PREHOOK: type: QUERY -POSTHOOK: query: -- timestamp-timestamp arithmetic -explain +POSTHOOK: query: explain select ts, ts - ts, @@ -596,8 +586,7 @@ POSTHOOK: Input: default@vector_interval_1 #### A masked pattern was here #### NULL NULL NULL NULL 2001-01-01 01:02:03 0 00:00:00.000000000 0 00:00:00.000000000 0 00:00:00.000000000 -PREHOOK: query: -- date-date arithmetic -explain +PREHOOK: query: explain select dt, dt - dt, @@ -605,8 +594,7 @@ select dt - date '2001-01-01' from vector_interval_1 order by dt PREHOOK: type: QUERY -POSTHOOK: query: -- date-date arithmetic -explain +POSTHOOK: query: explain select dt, dt - dt, @@ -674,8 +662,7 @@ POSTHOOK: Input: default@vector_interval_1 #### A masked pattern was here #### NULL NULL NULL NULL 2001-01-01 0 00:00:00.000000000 0 00:00:00.000000000 0 00:00:00.000000000 -PREHOOK: query: -- date-timestamp arithmetic -explain +PREHOOK: query: explain select dt, ts - dt, @@ -686,8 +673,7 @@ select date '2001-01-01' - ts from vector_interval_1 order by dt PREHOOK: type: QUERY -POSTHOOK: query: -- date-timestamp arithmetic -explain +POSTHOOK: query: explain select dt, ts - dt, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out b/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out index 84d84d0..dd4b7d1 100644 --- a/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out +++ b/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out @@ -35,8 +35,7 @@ POSTHOOK: Output: default@interval_arithmetic_1 POSTHOOK: Lineage: interval_arithmetic_1.dateval EXPRESSION [(unique_timestamps)unique_timestamps.FieldSchema(name:tsval, type:timestamp, comment:null), ] POSTHOOK: Lineage: interval_arithmetic_1.tsval SIMPLE [(unique_timestamps)unique_timestamps.FieldSchema(name:tsval, type:timestamp, comment:null), ] tsval tsval -PREHOOK: query: -- interval year-month arithmetic -explain +PREHOOK: query: explain select dateval, dateval - interval '2-2' year to month, @@ -48,8 +47,7 @@ select from interval_arithmetic_1 order by dateval PREHOOK: type: QUERY -POSTHOOK: query: -- interval year-month arithmetic -explain +POSTHOOK: query: explain select dateval, dateval - interval '2-2' year to month, @@ -530,8 +528,7 @@ POSTHOOK: Input: default@interval_arithmetic_1 _c0 _c1 5-5 -1-1 5-5 -1-1 -PREHOOK: query: -- interval day-time arithmetic -explain +PREHOOK: query: explain select dateval, dateval - interval '99 11:22:33.123456789' day to second, @@ -543,8 +540,7 @@ select from interval_arithmetic_1 order by dateval PREHOOK: type: QUERY -POSTHOOK: query: -- interval day-time arithmetic -explain +POSTHOOK: query: explain select dateval, dateval - interval '99 11:22:33.123456789' day to second, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorization_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vectorization_2.q.out b/ql/src/test/results/clientpositive/vectorization_2.q.out index e9df371..709a75f 100644 --- a/ql/src/test/results/clientpositive/vectorization_2.q.out +++ b/ql/src/test/results/clientpositive/vectorization_2.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -SELECT AVG(csmallint), +PREHOOK: query: SELECT AVG(csmallint), (AVG(csmallint) % -563), (AVG(csmallint) + 762), SUM(cfloat), @@ -24,9 +22,7 @@ WHERE (((ctimestamp1 < ctimestamp2) PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -SELECT AVG(csmallint), +POSTHOOK: query: SELECT AVG(csmallint), (AVG(csmallint) % -563), (AVG(csmallint) + 762), SUM(cfloat), http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorization_3.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vectorization_3.q.out b/ql/src/test/results/clientpositive/vectorization_3.q.out index 73b2cdd..2398dee 100644 --- a/ql/src/test/results/clientpositive/vectorization_3.q.out +++ b/ql/src/test/results/clientpositive/vectorization_3.q.out @@ -1,7 +1,5 @@ WARNING: Comparing a bigint and a double may result in a loss of precision. -PREHOOK: query: -- SORT_QUERY_RESULTS - -SELECT STDDEV_SAMP(csmallint), +PREHOOK: query: SELECT STDDEV_SAMP(csmallint), (STDDEV_SAMP(csmallint) - 10.175), STDDEV_POP(ctinyint), (STDDEV_SAMP(csmallint) * (STDDEV_SAMP(csmallint) - 10.175)), @@ -27,9 +25,7 @@ WHERE (((cint <= cfloat) PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -SELECT STDDEV_SAMP(csmallint), +POSTHOOK: query: SELECT STDDEV_SAMP(csmallint), (STDDEV_SAMP(csmallint) - 10.175), STDDEV_POP(ctinyint), (STDDEV_SAMP(csmallint) * (STDDEV_SAMP(csmallint) - 10.175)), http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorization_4.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vectorization_4.q.out b/ql/src/test/results/clientpositive/vectorization_4.q.out index 0181588..0d6829f 100644 --- a/ql/src/test/results/clientpositive/vectorization_4.q.out +++ b/ql/src/test/results/clientpositive/vectorization_4.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -SELECT SUM(cint), +PREHOOK: query: SELECT SUM(cint), (SUM(cint) * -563), (-3728 + SUM(cint)), STDDEV_POP(cdouble), @@ -24,9 +22,7 @@ WHERE (((csmallint >= cint) PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -SELECT SUM(cint), +POSTHOOK: query: SELECT SUM(cint), (SUM(cint) * -563), (-3728 + SUM(cint)), STDDEV_POP(cdouble), http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorization_5.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vectorization_5.q.out b/ql/src/test/results/clientpositive/vectorization_5.q.out index f661fc3..914a626 100644 --- a/ql/src/test/results/clientpositive/vectorization_5.q.out +++ b/ql/src/test/results/clientpositive/vectorization_5.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -SELECT MAX(csmallint), +PREHOOK: query: SELECT MAX(csmallint), (MAX(csmallint) * -75), COUNT(*), ((MAX(csmallint) * -75) / COUNT(*)), @@ -21,9 +19,7 @@ WHERE (((cboolean2 IS NOT NULL) PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -SELECT MAX(csmallint), +POSTHOOK: query: SELECT MAX(csmallint), (MAX(csmallint) * -75), COUNT(*), ((MAX(csmallint) * -75) / COUNT(*)), http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorization_7.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vectorization_7.q.out b/ql/src/test/results/clientpositive/vectorization_7.q.out index 25e7657..1875908 100644 --- a/ql/src/test/results/clientpositive/vectorization_7.q.out +++ b/ql/src/test/results/clientpositive/vectorization_7.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -EXPLAIN +PREHOOK: query: EXPLAIN SELECT cboolean1, cbigint, csmallint, @@ -27,9 +25,7 @@ WHERE ((ctinyint != 0) ORDER BY cboolean1, cbigint, csmallint, ctinyint, ctimestamp1, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 25 PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT cboolean1, cbigint, csmallint, @@ -183,8 +179,7 @@ NULL NULL -7196 -61 1969-12-31 15:59:44.823 NULL NULL 0 7196 61 78 NULL NULL 61 NULL NULL -7196 1 1969-12-31 15:59:48.361 NULL NULL 0 7196 -1 16 NULL NULL -1 0 NULL NULL -7196 14 1969-12-31 15:59:50.291 NULL NULL 0 7196 -14 3 NULL NULL -14 0 NULL NULL -7196 22 1969-12-31 15:59:52.699 NULL NULL 0 7196 -22 -5 NULL NULL -22 0 -PREHOOK: query: -- double compare timestamp -EXPLAIN +PREHOOK: query: EXPLAIN SELECT cboolean1, cbigint, csmallint, @@ -211,8 +206,7 @@ WHERE ((ctinyint != 0) ORDER BY cboolean1, cbigint, csmallint, ctinyint, ctimestamp1, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 25 PREHOOK: type: QUERY -POSTHOOK: query: -- double compare timestamp -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT cboolean1, cbigint, csmallint, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorization_8.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vectorization_8.q.out b/ql/src/test/results/clientpositive/vectorization_8.q.out index 3fa8f53..1c46759 100644 --- a/ql/src/test/results/clientpositive/vectorization_8.q.out +++ b/ql/src/test/results/clientpositive/vectorization_8.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -EXPLAIN +PREHOOK: query: EXPLAIN SELECT ctimestamp1, cdouble, cboolean1, @@ -25,9 +23,7 @@ WHERE (((cstring2 IS NOT NULL) ORDER BY ctimestamp1, cdouble, cboolean1, cstring1, cfloat, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT ctimestamp1, cdouble, cboolean1, @@ -170,8 +166,7 @@ POSTHOOK: Input: default@alltypesorc 1969-12-31 15:59:43.783 -200.0 NULL NULL -11.0 200.0 -5438.15 51400.0 NULL 1.2116287E7 200.0 9.611 11.0 NULL 1969-12-31 15:59:43.807 -7196.0 NULL NULL 42.0 7196.0 1557.8500000000004 1849372.0 NULL -5.98226333E8 7196.0 -43.389 -42.0 NULL 1969-12-31 15:59:43.82 -7196.0 NULL NULL -30.0 7196.0 1557.8500000000004 1849372.0 NULL 1.329550715E9 7196.0 28.611 30.0 NULL -PREHOOK: query: -- double compare timestamp -EXPLAIN +PREHOOK: query: EXPLAIN SELECT ctimestamp1, cdouble, cboolean1, @@ -196,8 +191,7 @@ WHERE (((cstring2 IS NOT NULL) ORDER BY ctimestamp1, cdouble, cboolean1, cstring1, cfloat, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: -- double compare timestamp -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT ctimestamp1, cdouble, cboolean1, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorization_9.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vectorization_9.q.out b/ql/src/test/results/clientpositive/vectorization_9.q.out index ece5154..d93d810 100644 --- a/ql/src/test/results/clientpositive/vectorization_9.q.out +++ b/ql/src/test/results/clientpositive/vectorization_9.q.out @@ -1,6 +1,4 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -EXPLAIN +PREHOOK: query: EXPLAIN SELECT cstring1, cdouble, ctimestamp1, @@ -20,9 +18,7 @@ WHERE ((cstring2 LIKE '%b%') OR (cstring1 < 'a'))) GROUP BY cstring1, cdouble, ctimestamp1 PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT cstring1, cdouble, ctimestamp1, http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorization_div0.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vectorization_div0.q.out b/ql/src/test/results/clientpositive/vectorization_div0.q.out index 63af5c9..db79fe7 100644 --- a/ql/src/test/results/clientpositive/vectorization_div0.q.out +++ b/ql/src/test/results/clientpositive/vectorization_div0.q.out @@ -1,9 +1,7 @@ -PREHOOK: query: -- TODO: add more stuff here after HIVE-5918 is fixed, such as cbigint and constants -explain +PREHOOK: query: explain select cdouble / 0.0 from alltypesorc limit 100 PREHOOK: type: QUERY -POSTHOOK: query: -- TODO: add more stuff here after HIVE-5918 is fixed, such as cbigint and constants -explain +POSTHOOK: query: explain select cdouble / 0.0 from alltypesorc limit 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -147,17 +145,11 @@ NULL NULL NULL NULL -PREHOOK: query: -- There are no zeros in the table, but there is 988888, so use it as zero - --- TODO: add more stuff here after HIVE-5918 is fixed, such as cbigint and constants as numerators -explain +PREHOOK: query: explain select (cbigint - 988888L) as s1, cdouble / (cbigint - 988888L) as s2, 1.2 / (cbigint - 988888L) from alltypesorc where cbigint > 0 and cbigint < 100000000 order by s1, s2 limit 100 PREHOOK: type: QUERY -POSTHOOK: query: -- There are no zeros in the table, but there is 988888, so use it as zero - --- TODO: add more stuff here after HIVE-5918 is fixed, such as cbigint and constants as numerators -explain +POSTHOOK: query: explain select (cbigint - 988888L) as s1, cdouble / (cbigint - 988888L) as s2, 1.2 / (cbigint - 988888L) from alltypesorc where cbigint > 0 and cbigint < 100000000 order by s1, s2 limit 100 POSTHOOK: type: QUERY @@ -318,15 +310,11 @@ POSTHOOK: Input: default@alltypesorc 59347745 NULL 0.000000020219807846111 60229567 NULL 0.000000019923769334088 60330397 NULL 0.000000019890470801974 -PREHOOK: query: -- There are no zeros in the table, but there is -200.0, so use it as zero - -explain +PREHOOK: query: explain select (cdouble + 200.0) as s1, cbigint / (cdouble + 200.0) as s2, (cdouble + 200.0) / (cdouble + 200.0), cbigint / (cdouble + 200.0), 3 / (cdouble + 200.0), 1.2 / (cdouble + 200.0) from alltypesorc where cdouble >= -500 and cdouble < -199 order by s1, s2 limit 100 PREHOOK: type: QUERY -POSTHOOK: query: -- There are no zeros in the table, but there is -200.0, so use it as zero - -explain +POSTHOOK: query: explain select (cdouble + 200.0) as s1, cbigint / (cdouble + 200.0) as s2, (cdouble + 200.0) / (cdouble + 200.0), cbigint / (cdouble + 200.0), 3 / (cdouble + 200.0), 1.2 / (cdouble + 200.0) from alltypesorc where cdouble >= -500 and cdouble < -199 order by s1, s2 limit 100 POSTHOOK: type: QUERY
