http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out index c3426dc..82bc8a4 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out @@ -1,23 +1,9 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS --- --- FILE VARIATION: TEXTFILE, Non-Vectorized, MapWork, Table --- NOTE: the use of hive.vectorized.use.row.serde.deserialize above which enables doing --- vectorized reading of TEXTFILE format files using the row SERDE methods. --- - -CREATE TABLE schema_evolution_data(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string) +PREHOOK: query: CREATE TABLE schema_evolution_data(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@schema_evolution_data -POSTHOOK: query: -- SORT_QUERY_RESULTS --- --- FILE VARIATION: TEXTFILE, Non-Vectorized, MapWork, Table --- NOTE: the use of hive.vectorized.use.row.serde.deserialize above which enables doing --- vectorized reading of TEXTFILE format files using the row SERDE methods. --- - -CREATE TABLE schema_evolution_data(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string) +POSTHOOK: query: CREATE TABLE schema_evolution_data(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -30,25 +16,11 @@ POSTHOOK: query: load data local inpath '../../data/files/schema_evolution/schem POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@schema_evolution_data -PREHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE ADD COLUMNS --- --- --- SUBSECTION: ALTER TABLE ADD COLUMNS: INT PERMUTE SELECT --- --- -CREATE TABLE table_add_int_permute_select(insert_num int, a INT, b STRING) +PREHOOK: query: CREATE TABLE table_add_int_permute_select(insert_num int, a INT, b STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_add_int_permute_select -POSTHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE ADD COLUMNS --- --- --- SUBSECTION: ALTER TABLE ADD COLUMNS: INT PERMUTE SELECT --- --- -CREATE TABLE table_add_int_permute_select(insert_num int, a INT, b STRING) +POSTHOOK: query: CREATE TABLE table_add_int_permute_select(insert_num int, a INT, b STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@table_add_int_permute_select @@ -64,13 +36,11 @@ POSTHOOK: Lineage: table_add_int_permute_select.a SIMPLE [(schema_evolution_data POSTHOOK: Lineage: table_add_int_permute_select.b SIMPLE [] POSTHOOK: Lineage: table_add_int_permute_select.insert_num SIMPLE [(schema_evolution_data)schema_evolution_data.FieldSchema(name:insert_num, type:int, comment:null), ] insert_num int1 _c2 -PREHOOK: query: -- Table-Non-Cascade ADD COLUMNS ... -alter table table_add_int_permute_select add columns(c int) +PREHOOK: query: alter table table_add_int_permute_select add columns(c int) PREHOOK: type: ALTERTABLE_ADDCOLS PREHOOK: Input: default@table_add_int_permute_select PREHOOK: Output: default@table_add_int_permute_select -POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ... -alter table table_add_int_permute_select add columns(c int) +POSTHOOK: query: alter table table_add_int_permute_select add columns(c int) POSTHOOK: type: ALTERTABLE_ADDCOLS POSTHOOK: Input: default@table_add_int_permute_select POSTHOOK: Output: default@table_add_int_permute_select @@ -105,13 +75,11 @@ Stage-0 TableScan [TS_0] (rows=5 width=20) default@table_add_int_permute_select,table_add_int_permute_select,Tbl:COMPLETE,Col:NONE,Output:["insert_num","a","b"] -PREHOOK: query: -- SELECT permutation columns to make sure NULL defaulting works right -select insert_num,a,b from table_add_int_permute_select +PREHOOK: query: select insert_num,a,b from table_add_int_permute_select PREHOOK: type: QUERY PREHOOK: Input: default@table_add_int_permute_select #### A masked pattern was here #### -POSTHOOK: query: -- SELECT permutation columns to make sure NULL defaulting works right -select insert_num,a,b from table_add_int_permute_select +POSTHOOK: query: select insert_num,a,b from table_add_int_permute_select POSTHOOK: type: QUERY POSTHOOK: Input: default@table_add_int_permute_select #### A masked pattern was here #### @@ -160,17 +128,11 @@ POSTHOOK: query: drop table table_add_int_permute_select POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@table_add_int_permute_select POSTHOOK: Output: default@table_add_int_permute_select -PREHOOK: query: -- SUBSECTION: ALTER TABLE ADD COLUMNS: INT, STRING, PERMUTE SELECT --- --- -CREATE TABLE table_add_int_string_permute_select(insert_num int, a INT, b STRING) +PREHOOK: query: CREATE TABLE table_add_int_string_permute_select(insert_num int, a INT, b STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_add_int_string_permute_select -POSTHOOK: query: -- SUBSECTION: ALTER TABLE ADD COLUMNS: INT, STRING, PERMUTE SELECT --- --- -CREATE TABLE table_add_int_string_permute_select(insert_num int, a INT, b STRING) +POSTHOOK: query: CREATE TABLE table_add_int_string_permute_select(insert_num int, a INT, b STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@table_add_int_string_permute_select @@ -186,13 +148,11 @@ POSTHOOK: Lineage: table_add_int_string_permute_select.a SIMPLE [(schema_evoluti POSTHOOK: Lineage: table_add_int_string_permute_select.b SIMPLE [] POSTHOOK: Lineage: table_add_int_string_permute_select.insert_num SIMPLE [(schema_evolution_data)schema_evolution_data.FieldSchema(name:insert_num, type:int, comment:null), ] insert_num int1 _c2 -PREHOOK: query: -- Table-Non-Cascade ADD COLUMNS ... -alter table table_add_int_string_permute_select add columns(c int, d string) +PREHOOK: query: alter table table_add_int_string_permute_select add columns(c int, d string) PREHOOK: type: ALTERTABLE_ADDCOLS PREHOOK: Input: default@table_add_int_string_permute_select PREHOOK: Output: default@table_add_int_string_permute_select -POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ... -alter table table_add_int_string_permute_select add columns(c int, d string) +POSTHOOK: query: alter table table_add_int_string_permute_select add columns(c int, d string) POSTHOOK: type: ALTERTABLE_ADDCOLS POSTHOOK: Input: default@table_add_int_string_permute_select POSTHOOK: Output: default@table_add_int_string_permute_select @@ -228,13 +188,11 @@ Stage-0 TableScan [TS_0] (rows=5 width=20) default@table_add_int_string_permute_select,table_add_int_string_permute_select,Tbl:COMPLETE,Col:NONE,Output:["insert_num","a","b"] -PREHOOK: query: -- SELECT permutation columns to make sure NULL defaulting works right -select insert_num,a,b from table_add_int_string_permute_select +PREHOOK: query: select insert_num,a,b from table_add_int_string_permute_select PREHOOK: type: QUERY PREHOOK: Input: default@table_add_int_string_permute_select #### A masked pattern was here #### -POSTHOOK: query: -- SELECT permutation columns to make sure NULL defaulting works right -select insert_num,a,b from table_add_int_string_permute_select +POSTHOOK: query: select insert_num,a,b from table_add_int_string_permute_select POSTHOOK: type: QUERY POSTHOOK: Input: default@table_add_int_string_permute_select #### A masked pattern was here #### @@ -343,25 +301,11 @@ POSTHOOK: query: drop table table_add_int_string_permute_select POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@table_add_int_string_permute_select POSTHOOK: Output: default@table_add_int_string_permute_select -PREHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE: (STRING, CHAR, VARCHAR) --- -CREATE TABLE table_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING) +PREHOOK: query: CREATE TABLE table_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_change_string_group_double -POSTHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE: (STRING, CHAR, VARCHAR) --- -CREATE TABLE table_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING) +POSTHOOK: query: CREATE TABLE table_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@table_change_string_group_double @@ -379,13 +323,11 @@ POSTHOOK: Lineage: table_change_string_group_double.c2 EXPRESSION [(schema_evolu POSTHOOK: Lineage: table_change_string_group_double.c3 EXPRESSION [(schema_evolution_data)schema_evolution_data.FieldSchema(name:double_str, type:string, comment:null), ] POSTHOOK: Lineage: table_change_string_group_double.insert_num SIMPLE [(schema_evolution_data)schema_evolution_data.FieldSchema(name:insert_num, type:int, comment:null), ] _col0 _col1 _col2 _col3 _col4 -PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_string_group_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING) +PREHOOK: query: alter table table_change_string_group_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING) PREHOOK: type: ALTERTABLE_REPLACECOLS PREHOOK: Input: default@table_change_string_group_double PREHOOK: Output: default@table_change_string_group_double -POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_string_group_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING) +POSTHOOK: query: alter table table_change_string_group_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING) POSTHOOK: type: ALTERTABLE_REPLACECOLS POSTHOOK: Input: default@table_change_string_group_double POSTHOOK: Output: default@table_change_string_group_double @@ -444,25 +386,11 @@ POSTHOOK: query: drop table table_change_string_group_double POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@table_change_string_group_double POSTHOOK: Output: default@table_change_string_group_double -PREHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP: DATE,TIMESTAMP, (STRING, CHAR, CHAR trunc, VARCHAR, VARCHAR trunc) --- -CREATE TABLE table_change_date_group_string_group_date_group(insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, b STRING) +PREHOOK: query: CREATE TABLE table_change_date_group_string_group_date_group(insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, b STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_change_date_group_string_group_date_group -POSTHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP: DATE,TIMESTAMP, (STRING, CHAR, CHAR trunc, VARCHAR, VARCHAR trunc) --- -CREATE TABLE table_change_date_group_string_group_date_group(insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, b STRING) +POSTHOOK: query: CREATE TABLE table_change_date_group_string_group_date_group(insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, b STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@table_change_date_group_string_group_date_group @@ -487,13 +415,11 @@ POSTHOOK: Lineage: table_change_date_group_string_group_date_group.c8 SIMPLE [(s POSTHOOK: Lineage: table_change_date_group_string_group_date_group.c9 SIMPLE [(schema_evolution_data)schema_evolution_data.FieldSchema(name:timestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: table_change_date_group_string_group_date_group.insert_num SIMPLE [(schema_evolution_data)schema_evolution_data.FieldSchema(name:insert_num, type:int, comment:null), ] insert_num date1 date1 date1 date1 date1 timestamp1 timestamp1 timestamp1 timestamp1 timestamp1 _c11 -PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_date_group_string_group_date_group replace columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 VARCHAR(50), c10 VARCHAR(15), b STRING) +PREHOOK: query: alter table table_change_date_group_string_group_date_group replace columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 VARCHAR(50), c10 VARCHAR(15), b STRING) PREHOOK: type: ALTERTABLE_REPLACECOLS PREHOOK: Input: default@table_change_date_group_string_group_date_group PREHOOK: Output: default@table_change_date_group_string_group_date_group -POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_date_group_string_group_date_group replace columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 VARCHAR(50), c10 VARCHAR(15), b STRING) +POSTHOOK: query: alter table table_change_date_group_string_group_date_group replace columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 VARCHAR(50), c10 VARCHAR(15), b STRING) POSTHOOK: type: ALTERTABLE_REPLACECOLS POSTHOOK: Input: default@table_change_date_group_string_group_date_group POSTHOOK: Output: default@table_change_date_group_string_group_date_group @@ -539,18 +465,7 @@ POSTHOOK: query: drop table table_change_date_group_string_group_date_group POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@table_change_date_group_string_group_date_group POSTHOOK: Output: default@table_change_date_group_string_group_date_group -PREHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: --- (TINYINT, SMALLINT, INT, BIGINT), STRING and --- (TINYINT, SMALLINT, INT, BIGINT), CHAR and CHAR trunc and --- (TINYINT, SMALLINT, INT, BIGINT), VARCHAR and VARCHAR trunc --- --- -CREATE TABLE table_change_numeric_group_string_group_multi_ints_string_group(insert_num int, +PREHOOK: query: CREATE TABLE table_change_numeric_group_string_group_multi_ints_string_group(insert_num int, c1 tinyint, c2 smallint, c3 int, c4 bigint, c5 tinyint, c6 smallint, c7 int, c8 bigint, c9 tinyint, c10 smallint, c11 int, c12 bigint, c13 tinyint, c14 smallint, c15 int, c16 bigint, c17 tinyint, c18 smallint, c19 int, c20 bigint, @@ -558,18 +473,7 @@ CREATE TABLE table_change_numeric_group_string_group_multi_ints_string_group(ins PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_change_numeric_group_string_group_multi_ints_string_group -POSTHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: --- (TINYINT, SMALLINT, INT, BIGINT), STRING and --- (TINYINT, SMALLINT, INT, BIGINT), CHAR and CHAR trunc and --- (TINYINT, SMALLINT, INT, BIGINT), VARCHAR and VARCHAR trunc --- --- -CREATE TABLE table_change_numeric_group_string_group_multi_ints_string_group(insert_num int, +POSTHOOK: query: CREATE TABLE table_change_numeric_group_string_group_multi_ints_string_group(insert_num int, c1 tinyint, c2 smallint, c3 int, c4 bigint, c5 tinyint, c6 smallint, c7 int, c8 bigint, c9 tinyint, c10 smallint, c11 int, c12 bigint, c13 tinyint, c14 smallint, c15 int, c16 bigint, c17 tinyint, c18 smallint, c19 int, c20 bigint, @@ -630,8 +534,7 @@ insert_num c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c2 103 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL original 104 23 834 203332 888888857923222 23 834 203332 888888857923222 23 834 203332 888888857923222 23 834 203332 888888857923222 23 834 203332 888888857923222 original 105 -99 -28300 -999992 -222282153733 -99 -28300 -999992 -222282153733 -99 -28300 -999992 -222282153733 -99 -28300 -999992 -222282153733 -99 -28300 -999992 -222282153733 original -PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_numeric_group_string_group_multi_ints_string_group replace columns (insert_num int, +PREHOOK: query: alter table table_change_numeric_group_string_group_multi_ints_string_group replace columns (insert_num int, c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 CHAR(50), c6 CHAR(50), c7 CHAR(50), c8 CHAR(50), c9 CHAR(5), c10 CHAR(5), c11 CHAR(5), c12 CHAR(5), c13 VARCHAR(50), c14 VARCHAR(50), c15 VARCHAR(50), c16 VARCHAR(50), c17 VARCHAR(5), c18 VARCHAR(5), c19 VARCHAR(5), c20 VARCHAR(5), @@ -639,8 +542,7 @@ alter table table_change_numeric_group_string_group_multi_ints_string_group repl PREHOOK: type: ALTERTABLE_REPLACECOLS PREHOOK: Input: default@table_change_numeric_group_string_group_multi_ints_string_group PREHOOK: Output: default@table_change_numeric_group_string_group_multi_ints_string_group -POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_numeric_group_string_group_multi_ints_string_group replace columns (insert_num int, +POSTHOOK: query: alter table table_change_numeric_group_string_group_multi_ints_string_group replace columns (insert_num int, c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 CHAR(50), c6 CHAR(50), c7 CHAR(50), c8 CHAR(50), c9 CHAR(5), c10 CHAR(5), c11 CHAR(5), c12 CHAR(5), c13 VARCHAR(50), c14 VARCHAR(50), c15 VARCHAR(50), c16 VARCHAR(50), c17 VARCHAR(5), c18 VARCHAR(5), c19 VARCHAR(5), c20 VARCHAR(5), @@ -728,14 +630,7 @@ POSTHOOK: query: drop table table_change_numeric_group_string_group_multi_ints_s POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@table_change_numeric_group_string_group_multi_ints_string_group POSTHOOK: Output: default@table_change_numeric_group_string_group_multi_ints_string_group -PREHOOK: query: -- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: --- (DECIMAL, FLOAT, DOUBLE), STRING and --- (DECIMAL, FLOAT, DOUBLE), CHAR and CHAR trunc and --- (DECIMAL, FLOAT, DOUBLE), VARCHAR and VARCHAR trunc --- --- -CREATE TABLE table_change_numeric_group_string_group_floating_string_group(insert_num int, +PREHOOK: query: CREATE TABLE table_change_numeric_group_string_group_floating_string_group(insert_num int, c1 decimal(38,18), c2 float, c3 double, c4 decimal(38,18), c5 float, c6 double, c7 decimal(38,18), c8 float, c9 double, c10 decimal(38,18), c11 float, c12 double, c13 decimal(38,18), c14 float, c15 double, @@ -743,14 +638,7 @@ CREATE TABLE table_change_numeric_group_string_group_floating_string_group(inser PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_change_numeric_group_string_group_floating_string_group -POSTHOOK: query: -- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: --- (DECIMAL, FLOAT, DOUBLE), STRING and --- (DECIMAL, FLOAT, DOUBLE), CHAR and CHAR trunc and --- (DECIMAL, FLOAT, DOUBLE), VARCHAR and VARCHAR trunc --- --- -CREATE TABLE table_change_numeric_group_string_group_floating_string_group(insert_num int, +POSTHOOK: query: CREATE TABLE table_change_numeric_group_string_group_floating_string_group(insert_num int, c1 decimal(38,18), c2 float, c3 double, c4 decimal(38,18), c5 float, c6 double, c7 decimal(38,18), c8 float, c9 double, c10 decimal(38,18), c11 float, c12 double, c13 decimal(38,18), c14 float, c15 double, @@ -806,8 +694,7 @@ insert_num c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 b 103 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL original 104 66475.561431000000000000 -100.35978 30.774 66475.561431000000000000 -100.35978 30.774 66475.561431000000000000 -100.35978 30.774 66475.561431000000000000 -100.35978 30.774 66475.561431000000000000 -100.35978 30.774 original 105 9250340.750000000000000000 NULL 46114.28 9250340.750000000000000000 NULL 46114.28 9250340.750000000000000000 NULL 46114.28 9250340.750000000000000000 NULL 46114.28 9250340.750000000000000000 NULL 46114.28 original -PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_numeric_group_string_group_floating_string_group replace columns (insert_num int, +PREHOOK: query: alter table table_change_numeric_group_string_group_floating_string_group replace columns (insert_num int, c1 STRING, c2 STRING, c3 STRING, c4 CHAR(50), c5 CHAR(50), c6 CHAR(50), c7 CHAR(7), c8 CHAR(7), c9 CHAR(7), c10 VARCHAR(50), c11 VARCHAR(50), c12 VARCHAR(50), c13 VARCHAR(7), c14 VARCHAR(7), c15 VARCHAR(7), @@ -815,8 +702,7 @@ alter table table_change_numeric_group_string_group_floating_string_group replac PREHOOK: type: ALTERTABLE_REPLACECOLS PREHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group PREHOOK: Output: default@table_change_numeric_group_string_group_floating_string_group -POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_numeric_group_string_group_floating_string_group replace columns (insert_num int, +POSTHOOK: query: alter table table_change_numeric_group_string_group_floating_string_group replace columns (insert_num int, c1 STRING, c2 STRING, c3 STRING, c4 CHAR(50), c5 CHAR(50), c6 CHAR(50), c7 CHAR(7), c8 CHAR(7), c9 CHAR(7), c10 VARCHAR(50), c11 VARCHAR(50), c12 VARCHAR(50), c13 VARCHAR(7), c14 VARCHAR(7), c15 VARCHAR(7), @@ -899,30 +785,14 @@ POSTHOOK: query: drop table table_change_numeric_group_string_group_floating_str POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group POSTHOOK: Output: default@table_change_numeric_group_string_group_floating_string_group -PREHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP: STRING, (CHAR, CHAR trunc, VARCHAR, VARCHAR trunc) and --- CHAR, (VARCHAR, VARCHAR trunc, STRING) and VARCHAR, (CHAR, CHAR trunc, STRING) --- -CREATE TABLE table_change_string_group_string_group_string(insert_num int, +PREHOOK: query: CREATE TABLE table_change_string_group_string_group_string(insert_num int, c1 string, c2 string, c3 string, c4 string, c5 CHAR(50), c6 CHAR(50), c7 CHAR(50), c8 VARCHAR(50), c9 VARCHAR(50), c10 VARCHAR(50), b STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_change_string_group_string_group_string -POSTHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP: STRING, (CHAR, CHAR trunc, VARCHAR, VARCHAR trunc) and --- CHAR, (VARCHAR, VARCHAR trunc, STRING) and VARCHAR, (CHAR, CHAR trunc, STRING) --- -CREATE TABLE table_change_string_group_string_group_string(insert_num int, +POSTHOOK: query: CREATE TABLE table_change_string_group_string_group_string(insert_num int, c1 string, c2 string, c3 string, c4 string, c5 CHAR(50), c6 CHAR(50), c7 CHAR(50), c8 VARCHAR(50), c9 VARCHAR(50), c10 VARCHAR(50), b STRING) @@ -972,16 +842,14 @@ insert_num c1 c2 c3 c4 b 103 original 104 I cooked I cooked I cooked I cooked original 105 200 200 200 200 original -PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_string_group_string_group_string replace columns (insert_num int, +PREHOOK: query: alter table table_change_string_group_string_group_string replace columns (insert_num int, c1 CHAR(50), c2 CHAR(9), c3 VARCHAR(50), c4 CHAR(9), c5 VARCHAR(50), c6 VARCHAR(9), c7 STRING, c8 CHAR(50), c9 CHAR(9), c10 STRING, b STRING) PREHOOK: type: ALTERTABLE_REPLACECOLS PREHOOK: Input: default@table_change_string_group_string_group_string PREHOOK: Output: default@table_change_string_group_string_group_string -POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_string_group_string_group_string replace columns (insert_num int, +POSTHOOK: query: alter table table_change_string_group_string_group_string replace columns (insert_num int, c1 CHAR(50), c2 CHAR(9), c3 VARCHAR(50), c4 CHAR(9), c5 VARCHAR(50), c6 VARCHAR(9), c7 STRING, c8 CHAR(50), c9 CHAR(9), c10 STRING, b STRING) @@ -1038,18 +906,7 @@ POSTHOOK: query: drop table table_change_string_group_string_group_string POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@table_change_string_group_string_group_string POSTHOOK: Output: default@table_change_string_group_string_group_string -PREHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: --- TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE) and --- SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE) and --- INT, (BIGINT, DECIMAL, FLOAT, DOUBLE) and --- BIGINT, (DECIMAL, FLOAT, DOUBLE) --- -CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int, +PREHOOK: query: CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int, c1 tinyint, c2 tinyint, c3 tinyint, c4 tinyint, c5 tinyint, c6 tinyint, c7 smallint, c8 smallint, c9 smallint, c10 smallint, c11 smallint, c12 int, c13 int, c14 int, c15 int, @@ -1058,18 +915,7 @@ CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint -POSTHOOK: query: ------------------------------------------------------------------------------------------ --- SECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP --- --- --- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: --- TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE) and --- SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE) and --- INT, (BIGINT, DECIMAL, FLOAT, DOUBLE) and --- BIGINT, (DECIMAL, FLOAT, DOUBLE) --- -CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int, +POSTHOOK: query: CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int, c1 tinyint, c2 tinyint, c3 tinyint, c4 tinyint, c5 tinyint, c6 tinyint, c7 smallint, c8 smallint, c9 smallint, c10 smallint, c11 smallint, c12 int, c13 int, c14 int, c15 int, @@ -1131,8 +977,7 @@ insert_num c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 b 103 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL original 104 23 23 23 23 23 23 834 834 834 834 834 203332 203332 203332 203332 888888857923222 888888857923222 888888857923222 original 105 -99 -99 -99 -99 -99 -99 -28300 -28300 -28300 -28300 -28300 -999992 -999992 -999992 -999992 -222282153733 -222282153733 -222282153733 original -PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_lower_to_higher_numeric_group_tinyint_to_bigint replace columns (insert_num int, +PREHOOK: query: alter table table_change_lower_to_higher_numeric_group_tinyint_to_bigint replace columns (insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, c6 DOUBLE, c7 INT, c8 BIGINT, c9 decimal(38,18), c10 FLOAT, c11 DOUBLE, c12 BIGINT, c13 decimal(38,18), c14 FLOAT, c15 DOUBLE, @@ -1141,8 +986,7 @@ alter table table_change_lower_to_higher_numeric_group_tinyint_to_bigint replace PREHOOK: type: ALTERTABLE_REPLACECOLS PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint -POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_lower_to_higher_numeric_group_tinyint_to_bigint replace columns (insert_num int, +POSTHOOK: query: alter table table_change_lower_to_higher_numeric_group_tinyint_to_bigint replace columns (insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, c6 DOUBLE, c7 INT, c8 BIGINT, c9 decimal(38,18), c10 FLOAT, c11 DOUBLE, c12 BIGINT, c13 decimal(38,18), c14 FLOAT, c15 DOUBLE, @@ -1211,24 +1055,14 @@ POSTHOOK: query: drop table table_change_lower_to_higher_numeric_group_tinyint_t POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint -PREHOOK: query: -- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: --- DECIMAL, (FLOAT, DOUBLE) and --- FLOAT, (DOUBLE) --- -CREATE TABLE table_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int, +PREHOOK: query: CREATE TABLE table_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int, c1 decimal(38,18), c2 decimal(38,18), c3 float, b STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal_to_float -POSTHOOK: query: -- --- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: --- DECIMAL, (FLOAT, DOUBLE) and --- FLOAT, (DOUBLE) --- -CREATE TABLE table_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int, +POSTHOOK: query: CREATE TABLE table_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int, c1 decimal(38,18), c2 decimal(38,18), c3 float, b STRING) @@ -1269,13 +1103,11 @@ insert_num c1 c2 c3 b 103 NULL NULL NULL original 104 66475.561431000000000000 66475.561431000000000000 -100.35978 original 105 9250340.750000000000000000 9250340.750000000000000000 NULL original -PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_lower_to_higher_numeric_group_decimal_to_float replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) +PREHOOK: query: alter table table_change_lower_to_higher_numeric_group_decimal_to_float replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) PREHOOK: type: ALTERTABLE_REPLACECOLS PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal_to_float PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal_to_float -POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ... -alter table table_change_lower_to_higher_numeric_group_decimal_to_float replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) +POSTHOOK: query: alter table table_change_lower_to_higher_numeric_group_decimal_to_float replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) POSTHOOK: type: ALTERTABLE_REPLACECOLS POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal_to_float POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal_to_float
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out b/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out index 2eff533..6354007 100644 --- a/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out +++ b/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out @@ -1,10 +1,6 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -explain select distinct src.* from src +PREHOOK: query: explain select distinct src.* from src PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - -explain select distinct src.* from src +POSTHOOK: query: explain select distinct src.* from src POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -61,15 +57,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: -- SORT_QUERY_RESULTS - -select distinct src.* from src +PREHOOK: query: select distinct src.* from src PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: -- SORT_QUERY_RESULTS - -select distinct src.* from src +POSTHOOK: query: select distinct src.* from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/select_dummy_source.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/select_dummy_source.q.out b/ql/src/test/results/clientpositive/llap/select_dummy_source.q.out index fa99b76..7efd2ff 100644 --- a/ql/src/test/results/clientpositive/llap/select_dummy_source.q.out +++ b/ql/src/test/results/clientpositive/llap/select_dummy_source.q.out @@ -29,12 +29,10 @@ POSTHOOK: type: QUERY POSTHOOK: Input: _dummy_database@_dummy_table #### A masked pattern was here #### a 100 -PREHOOK: query: --evaluation -explain +PREHOOK: query: explain select 1 + 1 PREHOOK: type: QUERY -POSTHOOK: query: --evaluation -explain +POSTHOOK: query: explain select 1 + 1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -62,12 +60,10 @@ POSTHOOK: type: QUERY POSTHOOK: Input: _dummy_database@_dummy_table #### A masked pattern was here #### 2 -PREHOOK: query: -- explode (not possible for lateral view) -explain +PREHOOK: query: explain select explode(array('a', 'b')) PREHOOK: type: QUERY -POSTHOOK: query: -- explode (not possible for lateral view) -explain +POSTHOOK: query: explain select explode(array('a', 'b')) POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -194,12 +190,10 @@ POSTHOOK: Input: _dummy_database@_dummy_table #### A masked pattern was here #### a b -PREHOOK: query: -- subquery -explain +PREHOOK: query: explain select 2 + 3,x from (select 1 + 2 x) X PREHOOK: type: QUERY -POSTHOOK: query: -- subquery -explain +POSTHOOK: query: explain select 2 + 3,x from (select 1 + 2 x) X POSTHOOK: type: QUERY STAGE DEPENDENCIES: http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/semijoin.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/semijoin.q.out b/ql/src/test/results/clientpositive/llap/semijoin.q.out index ad43098..28fc1d5 100644 --- a/ql/src/test/results/clientpositive/llap/semijoin.q.out +++ b/ql/src/test/results/clientpositive/llap/semijoin.q.out @@ -1,13 +1,9 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -create table t1 as select cast(key as int) key, value from src where key <= 10 +PREHOOK: query: create table t1 as select cast(key as int) key, value from src where key <= 10 PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@src PREHOOK: Output: database:default PREHOOK: Output: default@t1 -POSTHOOK: query: -- SORT_QUERY_RESULTS - -create table t1 as select cast(key as int) key, value from src where key <= 10 +POSTHOOK: query: create table t1 as select cast(key as int) key, value from src where key <= 10 POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/skewjoin.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/skewjoin.q.out b/ql/src/test/results/clientpositive/llap/skewjoin.q.out index 617045c..6c62452 100644 --- a/ql/src/test/results/clientpositive/llap/skewjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/skewjoin.q.out @@ -1,12 +1,8 @@ -PREHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE +PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T1 -POSTHOOK: query: -- SORT_QUERY_RESULTS - -CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE +POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out b/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out index 2c255ed..76742ea 100644 --- a/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out +++ b/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out @@ -14,13 +14,11 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE tmp POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@tmpt1 -PREHOOK: query: -- testing skew on other data types - int -CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2)) +PREHOOK: query: CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2)) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T1 -POSTHOOK: query: -- testing skew on other data types - int -CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2)) +POSTHOOK: query: CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2)) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 @@ -68,22 +66,10 @@ POSTHOOK: Input: default@tmpt2 POSTHOOK: Output: default@t2 POSTHOOK: Lineage: t2.key EXPRESSION [(tmpt2)tmpt2.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t2.val SIMPLE [(tmpt2)tmpt2.FieldSchema(name:val, type:string, comment:null), ] -PREHOOK: query: -- The skewed key is a integer column. --- Otherwise this test is similar to skewjoinopt1.q --- Both the joined tables are skewed, and the joined column --- is an integer --- adding a order by at the end to make the results deterministic - -EXPLAIN +PREHOOK: query: EXPLAIN SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: -- The skewed key is a integer column. --- Otherwise this test is similar to skewjoinopt1.q --- Both the joined tables are skewed, and the joined column --- is an integer --- adding a order by at the end to make the results deterministic - -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -181,14 +167,10 @@ POSTHOOK: Input: default@t2 8 18 8 18 8 28 8 18 8 28 8 18 -PREHOOK: query: -- test outer joins also - -EXPLAIN +PREHOOK: query: EXPLAIN SELECT a.*, b.* FROM T1 a RIGHT OUTER JOIN T2 b ON a.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: -- test outer joins also - -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT a.*, b.* FROM T1 a RIGHT OUTER JOIN T2 b ON a.key = b.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -282,14 +264,10 @@ NULL NULL 5 15 8 18 8 18 8 28 8 18 8 28 8 18 -PREHOOK: query: -- an aggregation at the end should not change anything - -EXPLAIN +PREHOOK: query: EXPLAIN SELECT count(1) FROM T1 a JOIN T2 b ON a.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: -- an aggregation at the end should not change anything - -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT count(1) FROM T1 a JOIN T2 b ON a.key = b.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/smb_mapjoin_14.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_14.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_14.q.out index cafdf5d..a6c085a 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_14.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_14.q.out @@ -38,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 mapjoin 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 /*+mapjoin(a)*/ 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 mapjoin 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 /*+mapjoin(a)*/ a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key ) subq1 @@ -149,9 +147,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 22 -PREHOOK: query: -- The mapjoin is being performed as part of sub-query. It should be converted to a sort-merge join --- Add a order by at the end to make the results deterministic. -explain +PREHOOK: query: explain select key, count(*) from ( select /*+mapjoin(a)*/ a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key @@ -159,9 +155,7 @@ select key, count(*) from group by key order by key PREHOOK: type: QUERY -POSTHOOK: query: -- The mapjoin is being performed as part of sub-query. It should be converted to a sort-merge join --- Add a order by at the end to make the results deterministic. -explain +POSTHOOK: query: explain select key, count(*) from ( select /*+mapjoin(a)*/ a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key @@ -297,8 +291,7 @@ POSTHOOK: Input: default@tbl2 5 9 8 1 9 1 -PREHOOK: query: -- The mapjoin 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 @@ -308,8 +301,7 @@ select count(*) from group by key ) subq2 PREHOOK: type: QUERY -POSTHOOK: query: -- The mapjoin 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 @@ -453,18 +445,14 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 6 -PREHOOK: query: -- The subquery itself is being map-joined. Since the sub-query only contains selects and filters, it should --- be converted to a sort-merge join. -explain +PREHOOK: query: explain select /*+mapjoin(subq1)*/ 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 map-joined. Since the sub-query only contains selects and filters, it should --- be converted to a sort-merge join. -explain +POSTHOOK: query: explain select /*+mapjoin(subq1)*/ count(*) from (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 join @@ -582,9 +570,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 20 -PREHOOK: query: -- The subquery itself is being map-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 /*+mapjoin(subq2)*/ count(*) from ( select * from @@ -596,9 +582,7 @@ select /*+mapjoin(subq2)*/ count(*) from join tbl2 b on subq2.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: -- The subquery itself is being map-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 /*+mapjoin(subq2)*/ count(*) from ( select * from @@ -727,9 +711,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 20 -PREHOOK: query: -- Both the big table and the small table 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 /*+mapjoin(subq2)*/ count(*) from ( select * from @@ -748,9 +730,7 @@ select /*+mapjoin(subq2)*/ count(*) from ) subq4 on subq2.key = subq4.key PREHOOK: type: QUERY -POSTHOOK: query: -- Both the big table and the small table 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 /*+mapjoin(subq2)*/ count(*) from ( select * from @@ -902,20 +882,14 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@tbl1 #### A masked pattern was here #### 20 -PREHOOK: query: -- The subquery itself is being map-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 /*+mapjoin(subq1)*/ 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 map-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 /*+mapjoin(subq1)*/ count(*) from (select a.key as key, concat(a.value, a.value) as value from tbl1 a where key < 8) subq1 join @@ -1033,18 +1007,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 /*+mapjoin(subq1)*/ 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 /*+mapjoin(subq1)*/ count(*) from (select a.key +1 as key, concat(a.value, a.value) as value from tbl1 a) subq1 join @@ -1162,16 +1132,12 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 22 -PREHOOK: query: -- The small table is a sub-query and the big table is not. --- It should be converted to a sort-merge join. -explain +PREHOOK: query: explain select /*+mapjoin(subq1)*/ 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: -- The small table is a sub-query and the big table is not. --- It should be converted to a sort-merge join. -explain +POSTHOOK: query: explain select /*+mapjoin(subq1)*/ 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 @@ -1279,16 +1245,12 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 20 -PREHOOK: query: -- The big table is a sub-query and the small table is not. --- It should be converted to a sort-merge join. -explain +PREHOOK: query: explain select /*+mapjoin(a)*/ 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: -- The big table is a sub-query and the small table is not. --- It should be converted to a sort-merge join. -explain +POSTHOOK: query: explain select /*+mapjoin(a)*/ 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 @@ -1396,9 +1358,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 /*+mapjoin(subq1, subq2)*/ count(*) from (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 join @@ -1408,9 +1368,7 @@ select /*+mapjoin(subq1, subq2)*/ 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 /*+mapjoin(subq1, subq2)*/ count(*) from (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 join @@ -1558,9 +1516,7 @@ POSTHOOK: Input: default@tbl1 POSTHOOK: Input: default@tbl2 #### A masked pattern was here #### 56 -PREHOOK: query: -- The mapjoin 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 /*+mapjoin(subq2)*/ subq2.key as key, subq2.value as value1, b.value as value2 from ( @@ -1573,9 +1529,7 @@ select count(*) from ( join tbl2 b on subq2.key = b.key) a PREHOOK: type: QUERY -POSTHOOK: query: -- The mapjoin 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 /*+mapjoin(subq2)*/ subq2.key as key, subq2.value as value1, b.value as value2 from ( http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out index daf2497..11617c4 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out @@ -1,16 +1,8 @@ -PREHOOK: query: -- This test verifies that the sort merge join optimizer works when the tables are sorted on columns which is a superset --- of join columns - --- Create bucketed and sorted tables -CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS +PREHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@test_table1 -POSTHOOK: query: -- This test verifies that the sort merge join optimizer works when the tables are sorted on columns which is a superset --- of join columns - --- Create bucketed and sorted tables -CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS +POSTHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 @@ -40,12 +32,10 @@ POSTHOOK: Lineage: test_table1.key EXPRESSION [(src)src.FieldSchema(name:key, ty POSTHOOK: Lineage: test_table1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: test_table2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- it should be converted to a sort-merge join, since the first sort column (#join columns = 1) contains the join columns -EXPLAIN EXTENDED +PREHOOK: query: EXPLAIN EXTENDED SELECT /*+mapjoin(b)*/ * FROM test_table1 a JOIN test_table2 b ON a.key = b.key ORDER BY a.key LIMIT 10 PREHOOK: type: QUERY -POSTHOOK: query: -- it should be converted to a sort-merge join, since the first sort column (#join columns = 1) contains the join columns -EXPLAIN EXTENDED +POSTHOOK: query: EXPLAIN EXTENDED SELECT /*+mapjoin(b)*/ * FROM test_table1 a JOIN test_table2 b ON a.key = b.key ORDER BY a.key LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -312,13 +302,11 @@ POSTHOOK: query: DROP TABLE test_table2 POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@test_table2 POSTHOOK: Output: default@test_table2 -PREHOOK: query: -- Create bucketed and sorted tables -CREATE TABLE test_table1 (key INT, key2 INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, key2 ASC, value ASC) INTO 16 BUCKETS +PREHOOK: query: CREATE TABLE test_table1 (key INT, key2 INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, key2 ASC, value ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@test_table1 -POSTHOOK: query: -- Create bucketed and sorted tables -CREATE TABLE test_table1 (key INT, key2 INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, key2 ASC, value ASC) INTO 16 BUCKETS +POSTHOOK: query: CREATE TABLE test_table1 (key INT, key2 INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, key2 ASC, value ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 @@ -350,12 +338,10 @@ POSTHOOK: Lineage: test_table1.value SIMPLE [(src)src.FieldSchema(name:value, ty POSTHOOK: Lineage: test_table2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table2.key2 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- it should be converted to a sort-merge join, since the first 2 sort columns (#join columns = 2) contain the join columns -EXPLAIN EXTENDED +PREHOOK: query: EXPLAIN EXTENDED SELECT /*+mapjoin(b)*/ * FROM test_table1 a JOIN test_table2 b ON a.key = b.key and a.key2 = b.key2 ORDER BY a.key LIMIT 10 PREHOOK: type: QUERY -POSTHOOK: query: -- it should be converted to a sort-merge join, since the first 2 sort columns (#join columns = 2) contain the join columns -EXPLAIN EXTENDED +POSTHOOK: query: EXPLAIN EXTENDED SELECT /*+mapjoin(b)*/ * FROM test_table1 a JOIN test_table2 b ON a.key = b.key and a.key2 = b.key2 ORDER BY a.key LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -606,14 +592,10 @@ POSTHOOK: Input: default@test_table2 0 0 val_0 0 0 val_0 0 0 val_0 0 0 val_0 2 2 val_2 2 2 val_2 -PREHOOK: query: -- it should be converted to a sort-merge join, since the first 2 sort columns (#join columns = 2) contain the join columns --- even if the order is not the same -EXPLAIN EXTENDED +PREHOOK: query: EXPLAIN EXTENDED SELECT /*+mapjoin(b)*/ * FROM test_table1 a JOIN test_table2 b ON a.key2 = b.key2 and a.key = b.key ORDER BY a.key LIMIT 10 PREHOOK: type: QUERY -POSTHOOK: query: -- it should be converted to a sort-merge join, since the first 2 sort columns (#join columns = 2) contain the join columns --- even if the order is not the same -EXPLAIN EXTENDED +POSTHOOK: query: EXPLAIN EXTENDED SELECT /*+mapjoin(b)*/ * FROM test_table1 a JOIN test_table2 b ON a.key2 = b.key2 and a.key = b.key ORDER BY a.key LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -864,14 +846,10 @@ POSTHOOK: Input: default@test_table2 0 0 val_0 0 0 val_0 0 0 val_0 0 0 val_0 2 2 val_2 2 2 val_2 -PREHOOK: query: -- it should not be converted to a sort-merge join, since the first 2 sort columns (#join columns = 2) do not contain all --- the join columns -EXPLAIN EXTENDED +PREHOOK: query: EXPLAIN EXTENDED SELECT /*+mapjoin(b)*/ * FROM test_table1 a JOIN test_table2 b ON a.key = b.key and a.value = b.value ORDER BY a.key LIMIT 10 PREHOOK: type: QUERY -POSTHOOK: query: -- it should not be converted to a sort-merge join, since the first 2 sort columns (#join columns = 2) do not contain all --- the join columns -EXPLAIN EXTENDED +POSTHOOK: query: EXPLAIN EXTENDED SELECT /*+mapjoin(b)*/ * FROM test_table1 a JOIN test_table2 b ON a.key = b.key and a.value = b.value ORDER BY a.key LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/smb_mapjoin_17.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_17.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_17.q.out index c69be29..5d24834 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_17.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_17.q.out @@ -1,10 +1,8 @@ -PREHOOK: query: -- Create bucketed and sorted tables -CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS +PREHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@test_table1 -POSTHOOK: query: -- Create bucketed and sorted tables -CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS +POSTHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 @@ -160,8 +158,7 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@test_table8 POSTHOOK: Lineage: test_table8.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table8.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- Mapjoin followed by a aggregation should be performed in a single MR job upto 7 tables -EXPLAIN +PREHOOK: query: EXPLAIN SELECT /*+ mapjoin(b, c, d, e, f, g) */ count(*) FROM test_table1 a JOIN test_table2 b ON a.key = b.key JOIN test_table3 c ON a.key = c.key @@ -170,8 +167,7 @@ JOIN test_table5 e ON a.key = e.key JOIN test_table6 f ON a.key = f.key JOIN test_table7 g ON a.key = g.key PREHOOK: type: QUERY -POSTHOOK: query: -- Mapjoin followed by a aggregation should be performed in a single MR job upto 7 tables -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT /*+ mapjoin(b, c, d, e, f, g) */ count(*) FROM test_table1 a JOIN test_table2 b ON a.key = b.key JOIN test_table3 c ON a.key = c.key @@ -382,9 +378,7 @@ POSTHOOK: Input: default@test_table6 POSTHOOK: Input: default@test_table7 #### A masked pattern was here #### 4378 -PREHOOK: query: -- It should be automatically converted to a sort-merge join followed by a groupby in --- a single MR job -EXPLAIN +PREHOOK: query: EXPLAIN SELECT count(*) FROM test_table1 a LEFT OUTER JOIN test_table2 b ON a.key = b.key LEFT OUTER JOIN test_table3 c ON a.key = c.key @@ -393,9 +387,7 @@ LEFT OUTER JOIN test_table5 e ON a.key = e.key LEFT OUTER JOIN test_table6 f ON a.key = f.key LEFT OUTER JOIN test_table7 g ON a.key = g.key PREHOOK: type: QUERY -POSTHOOK: query: -- It should be automatically converted to a sort-merge join followed by a groupby in --- a single MR job -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT count(*) FROM test_table1 a LEFT OUTER JOIN test_table2 b ON a.key = b.key LEFT OUTER JOIN test_table3 c ON a.key = c.key @@ -740,8 +732,7 @@ POSTHOOK: Input: default@test_table7 POSTHOOK: Input: default@test_table8 #### A masked pattern was here #### 13126 -PREHOOK: query: -- outer join with max 16 aliases -EXPLAIN +PREHOOK: query: EXPLAIN SELECT a.* FROM test_table1 a LEFT OUTER JOIN test_table2 b ON a.key = b.key @@ -764,8 +755,7 @@ LEFT OUTER JOIN test_table6 r ON a.key = r.key LEFT OUTER JOIN test_table7 s ON a.key = s.key LEFT OUTER JOIN test_table8 t ON a.key = t.key PREHOOK: type: QUERY -POSTHOOK: query: -- outer join with max 16 aliases -EXPLAIN +POSTHOOK: query: EXPLAIN SELECT a.* FROM test_table1 a LEFT OUTER JOIN test_table2 b ON a.key = b.key http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out index c29a36b..e2d5e4e 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out @@ -1,11 +1,9 @@ -PREHOOK: query: -- Create two bucketed and sorted tables -CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) +PREHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@test_table1 -POSTHOOK: query: -- Create two bucketed and sorted tables -CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) +POSTHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -32,15 +30,11 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@test_table1@ds=1 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- Insert data into the bucketed table by selecting from another bucketed table --- This should be a map-only operation -EXPLAIN +PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '1') SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' PREHOOK: type: QUERY -POSTHOOK: query: -- Insert data into the bucketed table by selecting from another bucketed table --- This should be a map-only operation -EXPLAIN +POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '1') SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' POSTHOOK: type: QUERY @@ -213,17 +207,11 @@ POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### 253 -PREHOOK: query: -- Insert data into the bucketed table by selecting from another bucketed table --- This should be a map-only operation, one of the buckets should be empty - -EXPLAIN +PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '2') SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' and a.key = 238 PREHOOK: type: QUERY -POSTHOOK: query: -- Insert data into the bucketed table by selecting from another bucketed table --- This should be a map-only operation, one of the buckets should be empty - -EXPLAIN +POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '2') SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' and a.key = 238 POSTHOOK: type: QUERY http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out index 1b53fdb..c3b29ea 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out @@ -1,11 +1,9 @@ -PREHOOK: query: -- Create two bucketed and sorted tables -CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) +PREHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@test_table1 -POSTHOOK: query: -- Create two bucketed and sorted tables -CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) +POSTHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -32,15 +30,11 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@test_table1@ds=1 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: -- Insert data into the bucketed table by selecting from another bucketed table --- This should be a map-only operation -EXPLAIN +PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '1') SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' PREHOOK: type: QUERY -POSTHOOK: query: -- Insert data into the bucketed table by selecting from another bucketed table --- This should be a map-only operation -EXPLAIN +POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '1') SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' POSTHOOK: type: QUERY http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out index 4dd7f4b..7d7d96d 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out @@ -46,14 +46,10 @@ POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwr POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_3 -PREHOOK: query: -- SORT_QUERY_RESULTS - -explain +PREHOOK: query: explain select /*+mapjoin(a,b)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - -explain +POSTHOOK: query: explain select /*+mapjoin(a,b)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out index 152c3e0..1abe220 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out @@ -46,14 +46,10 @@ POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwr POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_3 -PREHOOK: query: -- SORT_QUERY_RESULTS - -explain +PREHOOK: query: explain select /*+mapjoin(a,c)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key PREHOOK: type: QUERY -POSTHOOK: query: -- SORT_QUERY_RESULTS - -explain +POSTHOOK: query: explain select /*+mapjoin(a,c)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key POSTHOOK: type: QUERY STAGE DEPENDENCIES:
