http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union_top_level.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/union_top_level.q.out b/ql/src/test/results/clientpositive/llap/union_top_level.q.out index 6ea1f7e..b48ab83 100644 --- a/ql/src/test/results/clientpositive/llap/union_top_level.q.out +++ b/ql/src/test/results/clientpositive/llap/union_top_level.q.out @@ -1,17 +1,11 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - --- top level -explain +PREHOOK: query: explain select * from (select key, 0 as value from src where key % 3 == 0 limit 3)a union all select * from (select key, 1 as value from src where key % 3 == 1 limit 3)b union all select * from (select key, 2 as value from src where key % 3 == 2 limit 3)c PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - --- top level -explain +POSTHOOK: query: explain select * from (select key, 0 as value from src where key % 3 == 0 limit 3)a union all select * from (select key, 1 as value from src where key % 3 == 1 limit 3)b @@ -419,8 +413,7 @@ POSTHOOK: Input: default@src 0 val_0 10 val_10 10 val_10 -PREHOOK: query: -- ctas -explain +PREHOOK: query: explain create table union_top as select * from (select key, 0 as value from src where key % 3 == 0 limit 3)a union all @@ -428,8 +421,7 @@ select * from (select key, 1 as value from src where key % 3 == 1 limit 3)b union all select * from (select key, 2 as value from src where key % 3 == 2 limit 3)c PREHOOK: type: CREATETABLE_AS_SELECT -POSTHOOK: query: -- ctas -explain +POSTHOOK: query: explain create table union_top as select * from (select key, 0 as value from src where key % 3 == 0 limit 3)a union all @@ -655,8 +647,7 @@ PREHOOK: Output: default@union_top POSTHOOK: query: truncate table union_top POSTHOOK: type: TRUNCATETABLE POSTHOOK: Output: default@union_top -PREHOOK: query: -- insert into -explain +PREHOOK: query: explain insert into table union_top select * from (select key, 0 as value from src where key % 3 == 0 limit 3)a union all @@ -664,8 +655,7 @@ select * from (select key, 1 as value from src where key % 3 == 1 limit 3)b union all select * from (select key, 2 as value from src where key % 3 == 2 limit 3)c PREHOOK: type: QUERY -POSTHOOK: query: -- insert into -explain +POSTHOOK: query: explain insert into table union_top select * from (select key, 0 as value from src where key % 3 == 0 limit 3)a union all @@ -1097,8 +1087,7 @@ POSTHOOK: Input: default@union_top 409 1 484 1 86 2 -PREHOOK: query: -- create view -explain +PREHOOK: query: explain create view union_top_view as select * from (select key, 0 as value from src where key % 3 == 0 limit 3)a union all @@ -1106,8 +1095,7 @@ select * from (select key, 1 as value from src where key % 3 == 1 limit 3)b union all select * from (select key, 2 as value from src where key % 3 == 2 limit 3)c PREHOOK: type: CREATEVIEW -POSTHOOK: query: -- create view -explain +POSTHOOK: query: explain create view union_top_view as select * from (select key, 0 as value from src where key % 3 == 0 limit 3)a union all
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/update_after_multiple_inserts.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/update_after_multiple_inserts.q.out b/ql/src/test/results/clientpositive/llap/update_after_multiple_inserts.q.out index 7e28586..36f2aa4 100644 --- a/ql/src/test/results/clientpositive/llap/update_after_multiple_inserts.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/update_all_types.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/update_all_types.q.out b/ql/src/test/results/clientpositive/llap/update_all_types.q.out index c5c1abb..db9f166 100644 --- a/ql/src/test/results/clientpositive/llap/update_all_types.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/varchar_udf1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/varchar_udf1.q.out b/ql/src/test/results/clientpositive/llap/varchar_udf1.q.out index e5cfce5..8162305 100644 --- a/ql/src/test/results/clientpositive/llap/varchar_udf1.q.out +++ b/ql/src/test/results/clientpositive/llap/varchar_udf1.q.out @@ -24,8 +24,7 @@ POSTHOOK: Lineage: varchar_udf_1.c1 SIMPLE [(src)src.FieldSchema(name:key, type: POSTHOOK: Lineage: varchar_udf_1.c2 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: varchar_udf_1.c3 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: varchar_udf_1.c4 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- UDFs with varchar support -select +PREHOOK: query: select concat(c1, c2), concat(c3, c4), concat(c1, c2) = concat(c3, c4) @@ -33,8 +32,7 @@ from varchar_udf_1 limit 1 PREHOOK: type: QUERY PREHOOK: Input: default@varchar_udf_1 #### A masked pattern was here #### -POSTHOOK: query: -- UDFs with varchar support -select +POSTHOOK: query: select concat(c1, c2), concat(c3, c4), concat(c1, c2) = concat(c3, c4) @@ -77,8 +75,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_udf_1 #### A masked pattern was here #### val_238 val_238 true -PREHOOK: query: -- Scalar UDFs -select +PREHOOK: query: select ascii(c2), ascii(c4), ascii(c2) = ascii(c4) @@ -86,8 +83,7 @@ from varchar_udf_1 limit 1 PREHOOK: type: QUERY PREHOOK: Input: default@varchar_udf_1 #### A masked pattern was here #### -POSTHOOK: query: -- Scalar UDFs -select +POSTHOOK: query: select ascii(c2), ascii(c4), ascii(c2) = ascii(c4) @@ -396,16 +392,14 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@varchar_udf_1 #### A masked pattern was here #### val_238 val_238 true -PREHOOK: query: -- Aggregate Functions -select +PREHOOK: query: select compute_stats(c2, 16), compute_stats(c4, 16) from varchar_udf_1 PREHOOK: type: QUERY PREHOOK: Input: default@varchar_udf_1 #### A masked pattern was here #### -POSTHOOK: query: -- Aggregate Functions -select +POSTHOOK: query: select compute_stats(c2, 16), compute_stats(c4, 16) from varchar_udf_1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out b/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out index 39db2d9..8482ed9 100644 --- a/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out @@ -1,10 +1,6 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -drop table varchar_udf_1 +PREHOOK: query: drop table varchar_udf_1 PREHOOK: type: DROPTABLE -POSTHOOK: query: -- SORT_QUERY_RESULTS - -drop table varchar_udf_1 +POSTHOOK: query: drop table varchar_udf_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table varchar_udf_1 (c1 string, c2 string, c3 varchar(10), c4 varchar(20)) STORED AS ORC PREHOOK: type: CREATETABLE http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out b/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out index d4a9747..27be57a 100644 --- a/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out @@ -161,15 +161,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/llap/vector_auto_smb_mapjoin_14.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_auto_smb_mapjoin_14.q.out b/ql/src/test/results/clientpositive/llap/vector_auto_smb_mapjoin_14.q.out index 00b1aa7..8f54c65 100644 --- a/ql/src/test/results/clientpositive/llap/vector_auto_smb_mapjoin_14.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_auto_smb_mapjoin_14.q.out @@ -1,12 +1,8 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS ORC +PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@tbl1 -POSTHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS ORC +POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 @@ -42,14 +38,12 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@tbl2 POSTHOOK: Lineage: tbl2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tbl2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- The join is being performed as part of sub-query. It should be converted to a sort-merge join -explain +PREHOOK: query: explain select count(*) from ( select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key ) subq1 PREHOOK: type: QUERY -POSTHOOK: query: -- The join is being performed as part of sub-query. It should be converted to a sort-merge join -explain +POSTHOOK: query: explain select count(*) from ( select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key ) subq1 @@ -101,8 +95,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 22 -PREHOOK: query: -- The join is being performed as part of more than one sub-query. It should be converted to a sort-merge join -explain +PREHOOK: query: explain select count(*) from ( select key, count(*) from @@ -112,8 +105,7 @@ select count(*) from group by key ) subq2 PREHOOK: type: QUERY -POSTHOOK: query: -- The join is being performed as part of more than one sub-query. It should be converted to a sort-merge join -explain +POSTHOOK: query: explain select count(*) from ( select key, count(*) from @@ -189,9 +181,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 6 -PREHOOK: query: -- A join is being performed across different sub-queries, where a join is being performed in each of them. --- Each sub-query should be converted to a sort-merge join. -explain +PREHOOK: query: explain select src1.key, src1.cnt1, src2.cnt1 from ( select key, count(*) as cnt1 from @@ -208,9 +198,7 @@ join ) src2 on src1.key = src2.key PREHOOK: type: QUERY -POSTHOOK: query: -- A join is being performed across different sub-queries, where a join is being performed in each of them. --- Each sub-query should be converted to a sort-merge join. -explain +POSTHOOK: query: explain select src1.key, src1.cnt1, src2.cnt1 from ( select key, count(*) as cnt1 from @@ -337,18 +325,14 @@ POSTHOOK: Input: default@tbl2 5 9 9 8 1 1 9 1 1 -PREHOOK: query: -- The subquery itself is being joined. Since the sub-query only contains selects and filters, it should --- be converted to a sort-merge join. -explain +PREHOOK: query: explain select count(*) from (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 join (select a.key as key, a.value as value from tbl2 a where key < 6) subq2 on subq1.key = subq2.key PREHOOK: type: QUERY -POSTHOOK: query: -- The subquery itself is being joined. Since the sub-query only contains selects and filters, it should --- be converted to a sort-merge join. -explain +POSTHOOK: query: explain select count(*) from (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 join @@ -406,9 +390,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 20 -PREHOOK: query: -- The subquery itself is being joined. Since the sub-query only contains selects and filters, it should --- be converted to a sort-merge join, although there is more than one level of sub-query -explain +PREHOOK: query: explain select count(*) from ( select * from @@ -420,9 +402,7 @@ select count(*) from join tbl2 b on subq2.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: -- The subquery itself is being joined. Since the sub-query only contains selects and filters, it should --- be converted to a sort-merge join, although there is more than one level of sub-query -explain +POSTHOOK: query: explain select count(*) from ( select * from @@ -495,9 +475,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 20 -PREHOOK: query: -- Both the tables are nested sub-queries i.e more then 1 level of sub-query. --- The join should be converted to a sort-merge join -explain +PREHOOK: query: explain select count(*) from ( select * from @@ -516,9 +494,7 @@ select count(*) from ) subq4 on subq2.key = subq4.key PREHOOK: type: QUERY -POSTHOOK: query: -- Both the tables are nested sub-queries i.e more then 1 level of sub-query. --- The join should be converted to a sort-merge join -explain +POSTHOOK: query: explain select count(*) from ( select * from @@ -610,20 +586,14 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@tbl1 #### A masked pattern was here #### 20 -PREHOOK: query: -- The subquery itself is being joined. Since the sub-query only contains selects and filters and the join key --- is not getting modified, it should be converted to a sort-merge join. Note that the sub-query modifies one --- item, but that is not part of the join key. -explain +PREHOOK: query: explain select count(*) from (select a.key as key, concat(a.value, a.value) as value from tbl1 a where key < 8) subq1 join (select a.key as key, concat(a.value, a.value) as value from tbl2 a where key < 8) subq2 on subq1.key = subq2.key PREHOOK: type: QUERY -POSTHOOK: query: -- The subquery itself is being joined. Since the sub-query only contains selects and filters and the join key --- is not getting modified, it should be converted to a sort-merge join. Note that the sub-query modifies one --- item, but that is not part of the join key. -explain +POSTHOOK: query: explain select count(*) from (select a.key as key, concat(a.value, a.value) as value from tbl1 a where key < 8) subq1 join @@ -681,18 +651,14 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 20 -PREHOOK: query: -- Since the join key is modified by the sub-query, neither sort-merge join not bucketized map-side --- join should be performed -explain +PREHOOK: query: explain select count(*) from (select a.key +1 as key, concat(a.value, a.value) as value from tbl1 a) subq1 join (select a.key +1 as key, concat(a.value, a.value) as value from tbl2 a) subq2 on subq1.key = subq2.key PREHOOK: type: QUERY -POSTHOOK: query: -- Since the join key is modified by the sub-query, neither sort-merge join not bucketized map-side --- join should be performed -explain +POSTHOOK: query: explain select count(*) from (select a.key +1 as key, concat(a.value, a.value) as value from tbl1 a) subq1 join @@ -757,16 +723,12 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 22 -PREHOOK: query: -- One of the tables is a sub-query and the other is not. --- It should be converted to a sort-merge join. -explain +PREHOOK: query: explain select count(*) from (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 join tbl2 a on subq1.key = a.key PREHOOK: type: QUERY -POSTHOOK: query: -- One of the tables is a sub-query and the other is not. --- It should be converted to a sort-merge join. -explain +POSTHOOK: query: explain select count(*) from (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 join tbl2 a on subq1.key = a.key @@ -818,9 +780,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 20 -PREHOOK: query: -- There are more than 2 inputs to the join, all of them being sub-queries. --- It should be converted to to a sort-merge join -explain +PREHOOK: query: explain select count(*) from (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 join @@ -830,9 +790,7 @@ select count(*) from (select a.key as key, a.value as value from tbl2 a where key < 6) subq3 on (subq1.key = subq3.key) PREHOOK: type: QUERY -POSTHOOK: query: -- There are more than 2 inputs to the join, all of them being sub-queries. --- It should be converted to to a sort-merge join -explain +POSTHOOK: query: explain select count(*) from (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 join @@ -905,9 +863,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 56 -PREHOOK: query: -- The join is being performed on a nested sub-query, and an aggregation is performed after that. --- The join should be converted to a sort-merge join -explain +PREHOOK: query: explain select count(*) from ( select subq2.key as key, subq2.value as value1, b.value as value2 from ( @@ -920,9 +876,7 @@ select count(*) from ( join tbl2 b on subq2.key = b.key) a PREHOOK: type: QUERY -POSTHOOK: query: -- The join is being performed on a nested sub-query, and an aggregation is performed after that. --- The join should be converted to a sort-merge join -explain +POSTHOOK: query: explain select count(*) from ( select subq2.key as key, subq2.value as value1, b.value as value2 from ( @@ -1014,18 +968,14 @@ POSTHOOK: query: CREATE TABLE dest2(key int, val1 string, val2 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 -PREHOOK: query: -- The join is followed by a multi-table insert. It should be converted to --- a sort-merge join -explain +PREHOOK: query: explain from ( select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key ) subq1 insert overwrite table dest1 select key, val1 insert overwrite table dest2 select key, val1, val2 PREHOOK: type: QUERY -POSTHOOK: query: -- The join is followed by a multi-table insert. It should be converted to --- a sort-merge join -explain +POSTHOOK: query: explain from ( select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key ) subq1 @@ -1174,18 +1124,14 @@ POSTHOOK: query: CREATE TABLE dest2(key int, cnt int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 -PREHOOK: query: -- The join is followed by a multi-table insert, and one of the inserts involves a reducer. --- It should be converted to a sort-merge join -explain +PREHOOK: query: explain from ( select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key ) subq1 insert overwrite table dest1 select key, val1 insert overwrite table dest2 select key, count(*) group by key PREHOOK: type: QUERY -POSTHOOK: query: -- The join is followed by a multi-table insert, and one of the inserts involves a reducer. --- It should be converted to a sort-merge join -explain +POSTHOOK: query: explain from ( select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key ) subq1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out b/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out index 3de8cc4..1ed359f 100644 --- a/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out @@ -1,17 +1,9 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS --- --- Verify the VectorUDFAdaptor to GenericUDFBetween works for PROJECTION and FILTER. --- -create table if not exists TSINT_txt ( RNUM int , CSINT smallint ) +PREHOOK: query: create table if not exists TSINT_txt ( RNUM int , CSINT smallint ) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n' PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@TSINT_txt -POSTHOOK: query: -- SORT_QUERY_RESULTS --- --- Verify the VectorUDFAdaptor to GenericUDFBetween works for PROJECTION and FILTER. --- -create table if not exists TSINT_txt ( RNUM int , CSINT smallint ) +POSTHOOK: query: create table if not exists TSINT_txt ( RNUM int , CSINT smallint ) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n' POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/vector_between_in.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_between_in.q.out b/ql/src/test/results/clientpositive/llap/vector_between_in.q.out index 6a523f1..9928252 100644 --- a/ql/src/test/results/clientpositive/llap/vector_between_in.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_between_in.q.out @@ -709,13 +709,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_date_test #### A masked pattern was here #### 6172 -PREHOOK: query: -- projections - -EXPLAIN SELECT c0, count(1) from (SELECT cdate IN (CAST("1969-10-26" AS DATE), CAST("1969-07-14" AS DATE)) as c0 FROM decimal_date_test) tab GROUP BY c0 ORDER BY c0 +PREHOOK: query: EXPLAIN SELECT c0, count(1) from (SELECT cdate IN (CAST("1969-10-26" AS DATE), CAST("1969-07-14" AS DATE)) as c0 FROM decimal_date_test) tab GROUP BY c0 ORDER BY c0 PREHOOK: type: QUERY -POSTHOOK: query: -- projections - -EXPLAIN SELECT c0, count(1) from (SELECT cdate IN (CAST("1969-10-26" AS DATE), CAST("1969-07-14" AS DATE)) as c0 FROM decimal_date_test) tab GROUP BY c0 ORDER BY c0 +POSTHOOK: query: EXPLAIN SELECT c0, count(1) from (SELECT cdate IN (CAST("1969-10-26" AS DATE), CAST("1969-07-14" AS DATE)) as c0 FROM decimal_date_test) tab GROUP BY c0 ORDER BY c0 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out b/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out index a510e38..5a12817 100644 --- a/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out +++ b/ql/src/test/results/clientpositive/llap/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, @@ -318,15 +316,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/llap/vector_cast_constant.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_cast_constant.q.out b/ql/src/test/results/clientpositive/llap/vector_cast_constant.q.out index cd67e7e..9a2456f 100644 --- a/ql/src/test/results/clientpositive/llap/vector_cast_constant.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_char_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_char_2.q.out b/ql/src/test/results/clientpositive/llap/vector_char_2.q.out index b7b2ba5..bdcf7d8 100644 --- a/ql/src/test/results/clientpositive/llap/vector_char_2.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_char_mapjoin1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out b/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out index 1af8b3d..f2a386e 100644 --- a/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out +++ b/ql/src/test/results/clientpositive/llap/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-1 is a root stage @@ -213,15 +211,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 #### @@ -230,11 +224,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-1 is a root stage @@ -319,16 +311,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 @@ -338,11 +326,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-1 is a root stage @@ -427,16 +413,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/llap/vector_coalesce.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_coalesce.q.out b/ql/src/test/results/clientpositive/llap/vector_coalesce.q.out index c7897f7..f505be9 100644 --- a/ql/src/test/results/clientpositive/llap/vector_coalesce.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_complex_join.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_complex_join.q.out b/ql/src/test/results/clientpositive/llap/vector_complex_join.q.out index 6c2f2bb..89507ee 100644 --- a/ql/src/test/results/clientpositive/llap/vector_complex_join.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_count.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_count.q.out b/ql/src/test/results/clientpositive/llap/vector_count.q.out index 3b9d9f9..9ef5c2b 100644 --- a/ql/src/test/results/clientpositive/llap/vector_count.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_count_distinct.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_count_distinct.q.out b/ql/src/test/results/clientpositive/llap/vector_count_distinct.q.out index 3d67664..743b1fc 100644 --- a/ql/src/test/results/clientpositive/llap/vector_count_distinct.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_count_distinct.q.out @@ -90,9 +90,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/web_sales_2k' OVERWRIT POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@web_sales_txt -PREHOOK: query: ------------------------------------------------------------------------------------------ - -create table web_sales +PREHOOK: query: create table web_sales ( ws_sold_date_sk int, ws_sold_time_sk int, @@ -137,9 +135,7 @@ tblproperties ("orc.stripe.size"="33554432", "orc.compress.size"="16384") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@web_sales -POSTHOOK: query: ------------------------------------------------------------------------------------------ - -create table web_sales +POSTHOOK: query: create table web_sales ( ws_sold_date_sk int, ws_sold_time_sk int, @@ -1229,14 +1225,10 @@ POSTHOOK: Lineage: web_sales PARTITION(ws_web_site_sk=9).ws_sold_time_sk SIMPLE POSTHOOK: Lineage: web_sales PARTITION(ws_web_site_sk=9).ws_warehouse_sk SIMPLE [(web_sales_txt)web_sales_txt.FieldSchema(name:ws_warehouse_sk, type:int, comment:null), ] POSTHOOK: Lineage: web_sales PARTITION(ws_web_site_sk=9).ws_web_page_sk SIMPLE [(web_sales_txt)web_sales_txt.FieldSchema(name:ws_web_page_sk, type:int, comment:null), ] POSTHOOK: Lineage: web_sales PARTITION(ws_web_site_sk=9).ws_wholesale_cost SIMPLE [(web_sales_txt)web_sales_txt.FieldSchema(name:ws_wholesale_cost, type:decimal(7,2), comment:null), ] -PREHOOK: query: ------------------------------------------------------------------------------------------ - -explain +PREHOOK: query: explain select count(distinct ws_order_number) from web_sales PREHOOK: type: QUERY -POSTHOOK: query: ------------------------------------------------------------------------------------------ - -explain +POSTHOOK: query: explain select count(distinct ws_order_number) from web_sales POSTHOOK: type: QUERY STAGE DEPENDENCIES: http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/vector_data_types.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_data_types.q.out b/ql/src/test/results/clientpositive/llap/vector_data_types.q.out index a7a74c3..045f536 100644 --- a/ql/src/test/results/clientpositive/llap/vector_data_types.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_date_1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_date_1.q.out b/ql/src/test/results/clientpositive/llap/vector_date_1.q.out index 64d5be7..9943064 100644 --- a/ql/src/test/results/clientpositive/llap/vector_date_1.q.out +++ b/ql/src/test/results/clientpositive/llap/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 @@ -268,8 +266,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 @@ -283,8 +280,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 @@ -490,9 +486,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 @@ -505,9 +499,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 @@ -602,9 +594,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 @@ -619,9 +609,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/llap/vector_decimal_aggregate.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_aggregate.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_aggregate.q.out index 6faf453..a8d1e05 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_aggregate.q.out +++ b/ql/src/test/results/clientpositive/llap/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 @@ -131,16 +125,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/llap/vector_decimal_mapjoin.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_mapjoin.q.out index 361c46b..eddb4dc 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_mapjoin.q.out @@ -147,16 +147,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/llap/vector_decimal_math_funcs.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_math_funcs.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_math_funcs.q.out index 6d5b578..ec9caf9 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_math_funcs.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_math_funcs.q.out @@ -12,9 +12,7 @@ POSTHOOK: Lineage: decimal_test.cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSc POSTHOOK: Lineage: decimal_test.cdecimal1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] POSTHOOK: Lineage: decimal_test.cdecimal2 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] POSTHOOK: Lineage: decimal_test.cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] -PREHOOK: query: -- Test math functions in vectorized mode to verify they run correctly end-to-end. - -explain +PREHOOK: query: explain select cdecimal1 ,Round(cdecimal1, 2) @@ -46,14 +44,12 @@ select -- Test nesting ,cos(-sin(log(cdecimal1)) + 3.14159) from decimal_test --- limit output to a reasonably small number of rows + where cbigint % 500 = 0 --- test use of a math function in the WHERE clause + and sin(cdecimal1) >= -1.0 PREHOOK: type: QUERY -POSTHOOK: query: -- Test math functions in vectorized mode to verify they run correctly end-to-end. - -explain +POSTHOOK: query: explain select cdecimal1 ,Round(cdecimal1, 2) @@ -85,9 +81,9 @@ select -- Test nesting ,cos(-sin(log(cdecimal1)) + 3.14159) from decimal_test --- limit output to a reasonably small number of rows + where cbigint % 500 = 0 --- test use of a math function in the WHERE clause + and sin(cdecimal1) >= -1.0 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -138,9 +134,9 @@ PREHOOK: query: select -- Test nesting ,cos(-sin(log(cdecimal1)) + 3.14159) from decimal_test --- limit output to a reasonably small number of rows + where cbigint % 500 = 0 --- test use of a math function in the WHERE clause + and sin(cdecimal1) >= -1.0 PREHOOK: type: QUERY PREHOOK: Input: default@decimal_test @@ -176,9 +172,9 @@ POSTHOOK: query: select -- Test nesting ,cos(-sin(log(cdecimal1)) + 3.14159) from decimal_test --- limit output to a reasonably small number of rows + where cbigint % 500 = 0 --- test use of a math function in the WHERE clause + and sin(cdecimal1) >= -1.0 POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_test http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/vector_decimal_round_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_round_2.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_round_2.q.out index c653e5c..29ec85b 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_round_2.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_decimal_udf.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_udf.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_udf.q.out index 87fde0e..e9ee6da 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_udf.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_udf.q.out @@ -48,11 +48,9 @@ POSTHOOK: Input: default@decimal_udf_txt POSTHOOK: Output: default@decimal_udf POSTHOOK: Lineage: decimal_udf.key SIMPLE [(decimal_udf_txt)decimal_udf_txt.FieldSchema(name:key, type:decimal(20,10), comment:null), ] POSTHOOK: Lineage: decimal_udf.value SIMPLE [(decimal_udf_txt)decimal_udf_txt.FieldSchema(name:value, type:int, comment:null), ] -PREHOOK: query: -- addition -EXPLAIN SELECT key + key FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT key + key FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- addition -EXPLAIN SELECT key + key FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT key + key FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -386,11 +384,9 @@ NULL 2.0 -1.2345678891234567E9 1.2345678911234567E9 -PREHOOK: query: -- substraction -EXPLAIN SELECT key - key FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT key - key FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- substraction -EXPLAIN SELECT key - key FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT key - key FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -724,11 +720,9 @@ NULL 0.0 -1.2345678911234567E9 1.2345678891234567E9 -PREHOOK: query: -- multiplication -EXPLAIN SELECT key * key FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT key * key FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- multiplication -EXPLAIN SELECT key * key FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT key * key FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1134,11 +1128,9 @@ NULL 2.0 -2.4691357802469134E9 2.4691357802469134E9 -PREHOOK: query: -- division -EXPLAIN SELECT key / 0 FROM DECIMAL_UDF limit 1 +PREHOOK: query: EXPLAIN SELECT key / 0 FROM DECIMAL_UDF limit 1 PREHOOK: type: QUERY -POSTHOOK: query: -- division -EXPLAIN SELECT key / 0 FROM DECIMAL_UDF limit 1 +POSTHOOK: query: EXPLAIN SELECT key / 0 FROM DECIMAL_UDF limit 1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1549,11 +1541,9 @@ NULL 1.5 -6.172839440617284E8 6.172839460617284E8 -PREHOOK: query: -- abs -EXPLAIN SELECT abs(key) FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT abs(key) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- abs -EXPLAIN SELECT abs(key) FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT abs(key) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1635,11 +1625,9 @@ NULL 1.0000000000 1234567890.1234567890 1234567890.1234567800 -PREHOOK: query: -- avg -EXPLAIN SELECT value, sum(key) / count(key), avg(key), sum(key) FROM DECIMAL_UDF GROUP BY value ORDER BY value +PREHOOK: query: EXPLAIN SELECT value, sum(key) / count(key), avg(key), sum(key) FROM DECIMAL_UDF GROUP BY value ORDER BY value PREHOOK: type: QUERY -POSTHOOK: query: -- avg -EXPLAIN SELECT value, sum(key) / count(key), avg(key), sum(key) FROM DECIMAL_UDF GROUP BY value ORDER BY value +POSTHOOK: query: EXPLAIN SELECT value, sum(key) / count(key), avg(key), sum(key) FROM DECIMAL_UDF GROUP BY value ORDER BY value POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1741,11 +1729,9 @@ POSTHOOK: Input: default@decimal_udf 200 200.000000000000000000 200.00000000000000 200.0000000000 4400 -4400.000000000000000000 -4400.00000000000000 -4400.0000000000 1234567890 1234567890.123456780000000000 1234567890.12345678000000 1234567890.1234567800 -PREHOOK: query: -- negative -EXPLAIN SELECT -key FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT -key FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- negative -EXPLAIN SELECT -key FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT -key FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1827,11 +1813,9 @@ NULL -1.0000000000 1234567890.1234567890 -1234567890.1234567800 -PREHOOK: query: -- positive -EXPLAIN SELECT +key FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT +key FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- positive -EXPLAIN SELECT +key FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT +key FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-0 is a root stage @@ -1894,11 +1878,9 @@ NULL 1.0000000000 -1234567890.1234567890 1234567890.1234567800 -PREHOOK: query: -- ceiling -EXPlAIN SELECT CEIL(key) FROM DECIMAL_UDF +PREHOOK: query: EXPlAIN SELECT CEIL(key) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- ceiling -EXPlAIN SELECT CEIL(key) FROM DECIMAL_UDF +POSTHOOK: query: EXPlAIN SELECT CEIL(key) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1980,11 +1962,9 @@ NULL 1 -1234567890 1234567891 -PREHOOK: query: -- floor -EXPLAIN SELECT FLOOR(key) FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT FLOOR(key) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- floor -EXPLAIN SELECT FLOOR(key) FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT FLOOR(key) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2066,11 +2046,9 @@ NULL 1 -1234567891 1234567890 -PREHOOK: query: -- round -EXPLAIN SELECT ROUND(key, 2) FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT ROUND(key, 2) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- round -EXPLAIN SELECT ROUND(key, 2) FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT ROUND(key, 2) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2152,11 +2130,9 @@ NULL 1.00 -1234567890.12 1234567890.12 -PREHOOK: query: -- power -EXPLAIN SELECT POWER(key, 2) FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT POWER(key, 2) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- power -EXPLAIN SELECT POWER(key, 2) FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT POWER(key, 2) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2238,11 +2214,9 @@ NULL 1.0 1.52415787532388352E18 1.52415787532388352E18 -PREHOOK: query: -- modulo -EXPLAIN SELECT (key + 1) % (key / 2) FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT (key + 1) % (key / 2) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- modulo -EXPLAIN SELECT (key + 1) % (key / 2) FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT (key + 1) % (key / 2) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2324,11 +2298,9 @@ NULL 0.000000000000 -617283944.061728394500 1.000000000000 -PREHOOK: query: -- stddev, var -EXPLAIN SELECT value, stddev(key), variance(key) FROM DECIMAL_UDF GROUP BY value +PREHOOK: query: EXPLAIN SELECT value, stddev(key), variance(key) FROM DECIMAL_UDF GROUP BY value PREHOOK: type: QUERY -POSTHOOK: query: -- stddev, var -EXPLAIN SELECT value, stddev(key), variance(key) FROM DECIMAL_UDF GROUP BY value +POSTHOOK: query: EXPLAIN SELECT value, stddev(key), variance(key) FROM DECIMAL_UDF GROUP BY value POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2413,11 +2385,9 @@ POSTHOOK: Input: default@decimal_udf 200 0.0 0.0 4400 0.0 0.0 1234567890 0.0 0.0 -PREHOOK: query: -- stddev_samp, var_samp -EXPLAIN SELECT value, stddev_samp(key), var_samp(key) FROM DECIMAL_UDF GROUP BY value +PREHOOK: query: EXPLAIN SELECT value, stddev_samp(key), var_samp(key) FROM DECIMAL_UDF GROUP BY value PREHOOK: type: QUERY -POSTHOOK: query: -- stddev_samp, var_samp -EXPLAIN SELECT value, stddev_samp(key), var_samp(key) FROM DECIMAL_UDF GROUP BY value +POSTHOOK: query: EXPLAIN SELECT value, stddev_samp(key), var_samp(key) FROM DECIMAL_UDF GROUP BY value POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2502,11 +2472,9 @@ POSTHOOK: Input: default@decimal_udf 200 0.0 0.0 4400 0.0 0.0 1234567890 0.0 0.0 -PREHOOK: query: -- histogram -EXPLAIN SELECT histogram_numeric(key, 3) FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT histogram_numeric(key, 3) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- histogram -EXPLAIN SELECT histogram_numeric(key, 3) FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT histogram_numeric(key, 3) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2571,11 +2539,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_udf #### A masked pattern was here #### [{"x":-1.2345678901234567E9,"y":1.0},{"x":-144.50057142857142,"y":35.0},{"x":1.2345678901234567E9,"y":1.0}] -PREHOOK: query: -- min -EXPLAIN SELECT MIN(key) FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT MIN(key) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- min -EXPLAIN SELECT MIN(key) FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT MIN(key) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2640,11 +2606,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_udf #### A masked pattern was here #### -1234567890.1234567890 -PREHOOK: query: -- max -EXPLAIN SELECT MAX(key) FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT MAX(key) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- max -EXPLAIN SELECT MAX(key) FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT MAX(key) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2709,11 +2673,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_udf #### A masked pattern was here #### 1234567890.1234567800 -PREHOOK: query: -- count -EXPLAIN SELECT COUNT(key) FROM DECIMAL_UDF +PREHOOK: query: EXPLAIN SELECT COUNT(key) FROM DECIMAL_UDF PREHOOK: type: QUERY -POSTHOOK: query: -- count -EXPLAIN SELECT COUNT(key) FROM DECIMAL_UDF +POSTHOOK: query: EXPLAIN SELECT COUNT(key) FROM DECIMAL_UDF POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/vector_distinct_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_distinct_2.q.out b/ql/src/test/results/clientpositive/llap/vector_distinct_2.q.out index 188c624..620b99e 100644 --- a/ql/src/test/results/clientpositive/llap/vector_distinct_2.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_groupby4.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_groupby4.q.out b/ql/src/test/results/clientpositive/llap/vector_groupby4.q.out index 1e24e81..9ecfa56 100644 --- a/ql/src/test/results/clientpositive/llap/vector_groupby4.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_groupby6.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_groupby6.q.out b/ql/src/test/results/clientpositive/llap/vector_groupby6.q.out index 758f70c..4c6e038 100644 --- a/ql/src/test/results/clientpositive/llap/vector_groupby6.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_groupby_3.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_groupby_3.q.out b/ql/src/test/results/clientpositive/llap/vector_groupby_3.q.out index fb5dfe6..742cebc 100644 --- a/ql/src/test/results/clientpositive/llap/vector_groupby_3.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_groupby_mapjoin.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out index 3ab6eb9..d2bc732 100644 --- a/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out @@ -1,14 +1,12 @@ Warning: Map Join MAPJOIN[28][bigTable=?] in task 'Map 1' 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/llap/vector_grouping_sets.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out b/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out index 2fb434c..77a0695 100644 --- a/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_include_no_sel.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_include_no_sel.q.out b/ql/src/test/results/clientpositive/llap/vector_include_no_sel.q.out index e939c67..f52e7b5 100644 --- a/ql/src/test/results/clientpositive/llap/vector_include_no_sel.q.out +++ b/ql/src/test/results/clientpositive/llap/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/llap/vector_interval_1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out b/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out index 995c229..207e9bb 100644 --- a/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out +++ b/ql/src/test/results/clientpositive/llap/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), @@ -121,8 +119,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, @@ -133,8 +130,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, @@ -317,8 +313,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, @@ -335,8 +330,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, @@ -440,8 +434,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, @@ -458,8 +451,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, @@ -563,8 +555,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, @@ -572,8 +563,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, @@ -650,8 +640,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, @@ -659,8 +648,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, @@ -737,8 +725,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, @@ -749,8 +736,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/llap/vector_interval_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_interval_2.q.out b/ql/src/test/results/clientpositive/llap/vector_interval_2.q.out index 23a977e..d84737c 100644 --- a/ql/src/test/results/clientpositive/llap/vector_interval_2.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_interval_2.q.out @@ -42,9 +42,7 @@ POSTHOOK: Lineage: vector_interval_2.str2 EXPRESSION [] POSTHOOK: Lineage: vector_interval_2.str3 EXPRESSION [] POSTHOOK: Lineage: vector_interval_2.str4 EXPRESSION [] POSTHOOK: Lineage: vector_interval_2.ts EXPRESSION [] -PREHOOK: query: -- interval comparisons in select clause - -explain +PREHOOK: query: explain select str1, -- Should all be true @@ -76,9 +74,7 @@ select interval '1-2' year to month != interval_year_month(str2) from vector_interval_2 order by str1 PREHOOK: type: QUERY -POSTHOOK: query: -- interval comparisons in select clause - -explain +POSTHOOK: query: explain select str1, -- Should all be true @@ -722,8 +718,7 @@ POSTHOOK: Input: default@vector_interval_2 #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 2:3:4 false false false false false false false false false false false false false false false false false false -PREHOOK: query: -- interval expressions in predicates -explain +PREHOOK: query: explain select ts from vector_interval_2 where interval_year_month(str1) = interval_year_month(str1) @@ -748,8 +743,7 @@ where and interval '1-3' year to month > interval_year_month(str1) order by ts PREHOOK: type: QUERY -POSTHOOK: query: -- interval expressions in predicates -explain +POSTHOOK: query: explain select ts from vector_interval_2 where interval_year_month(str1) = interval_year_month(str1) @@ -1320,8 +1314,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@vector_interval_2 #### A masked pattern was here #### 2001-01-01 01:02:03 -PREHOOK: query: -- day to second expressions in predicate -explain +PREHOOK: query: explain select ts from vector_interval_2 where timestamp '2001-01-01 01:02:03' = dt + interval '0 1:2:3' day to second @@ -1346,8 +1339,7 @@ where and ts > dt - interval '0 1:2:4' day to second order by ts PREHOOK: type: QUERY -POSTHOOK: query: -- day to second expressions in predicate -explain +POSTHOOK: query: explain select ts from vector_interval_2 where timestamp '2001-01-01 01:02:03' = dt + interval '0 1:2:3' day to second http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/vector_interval_arithmetic.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_interval_arithmetic.q.out b/ql/src/test/results/clientpositive/llap/vector_interval_arithmetic.q.out index 2898803..391c775 100644 --- a/ql/src/test/results/clientpositive/llap/vector_interval_arithmetic.q.out +++ b/ql/src/test/results/clientpositive/llap/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, @@ -566,8 +564,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, @@ -579,8 +576,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,
