hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pxi...@apache.org
Subject [16/20] hive git commit: IVE-15297: Hive should not split semicolon within quoted string literals (Pengcheng Xiong, reviewed by Ashutosh Chauhan) (addendum I)
Date Thu, 19 Jan 2017 04:29:28 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_update.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_update.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_update.q.out
index dd06347..2bcb6d5 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_update.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_update.q.out
@@ -1,23 +1,9 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
---
--- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Partitioned
--- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID.
--- Also, we don't do EXPLAINs on ACID files because the transaction id causes Q file statistics differences...
---
-
-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: ORC, ACID Non-Vectorized, MapWork, Partitioned
--- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID.
--- Also, we don't do EXPLAINs on ACID files because the transaction id causes Q file statistics differences...
---
-
-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
@@ -48,19 +34,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_2
-PREHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... UPDATE New Columns
----
-CREATE TABLE partitioned_update_1(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE partitioned_update_1(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@partitioned_update_1
-POSTHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... UPDATE New Columns
----
-CREATE TABLE partitioned_update_1(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE partitioned_update_1(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@partitioned_update_1
@@ -76,13 +54,11 @@ POSTHOOK: Lineage: partitioned_update_1 PARTITION(part=1).a SIMPLE [(schema_evol
 POSTHOOK: Lineage: partitioned_update_1 PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: partitioned_update_1 PARTITION(part=1).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 partitioned_update_1 add columns(c int, d string)
+PREHOOK: query: alter table partitioned_update_1 add columns(c int, d string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@partitioned_update_1
 PREHOOK: Output: default@partitioned_update_1
-POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table partitioned_update_1 add columns(c int, d string)
+POSTHOOK: query: alter table partitioned_update_1 add columns(c int, d string)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@partitioned_update_1
 POSTHOOK: Output: default@partitioned_update_1
@@ -142,16 +118,14 @@ insert_num	part	a	b	c	d
 113	1	40000	new	40000	Delaware
 114	1	-128	new	-128	smaller than Scotland
 115	1	32768	new	32768	major glaciation
-PREHOOK: query: -- UPDATE New Columns
-update partitioned_update_1 set c=99
+PREHOOK: query: update partitioned_update_1 set c=99
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partitioned_update_1
 PREHOOK: Input: default@partitioned_update_1@part=1
 PREHOOK: Input: default@partitioned_update_1@part=2
 PREHOOK: Output: default@partitioned_update_1@part=1
 PREHOOK: Output: default@partitioned_update_1@part=2
-POSTHOOK: query: -- UPDATE New Columns
-update partitioned_update_1 set c=99
+POSTHOOK: query: update partitioned_update_1 set c=99
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partitioned_update_1
 POSTHOOK: Input: default@partitioned_update_1@part=1
@@ -231,19 +205,11 @@ POSTHOOK: query: DROP TABLE partitioned_update_1
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@partitioned_update_1
 POSTHOOK: Output: default@partitioned_update_1
-PREHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where old column
----
-CREATE TABLE partitioned_delete_1(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE partitioned_delete_1(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@partitioned_delete_1
-POSTHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where old column
----
-CREATE TABLE partitioned_delete_1(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE partitioned_delete_1(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@partitioned_delete_1
@@ -259,13 +225,11 @@ POSTHOOK: Lineage: partitioned_delete_1 PARTITION(part=1).a SIMPLE [(schema_evol
 POSTHOOK: Lineage: partitioned_delete_1 PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_1 PARTITION(part=1).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 partitioned_delete_1 add columns(c int, d string)
+PREHOOK: query: alter table partitioned_delete_1 add columns(c int, d string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@partitioned_delete_1
 PREHOOK: Output: default@partitioned_delete_1
-POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table partitioned_delete_1 add columns(c int, d string)
+POSTHOOK: query: alter table partitioned_delete_1 add columns(c int, d string)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@partitioned_delete_1
 POSTHOOK: Output: default@partitioned_delete_1
@@ -325,16 +289,14 @@ part	a	b	c	d
 2	17	new	17	feather weight
 2	400	new	400	window  
 2	NULL	new	NULL	baffling
-PREHOOK: query: -- DELETE where old column
-delete from partitioned_delete_1 where insert_num = 102 or insert_num = 104 or insert_num = 106
+PREHOOK: query: delete from partitioned_delete_1 where insert_num = 102 or insert_num = 104 or insert_num = 106
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partitioned_delete_1
 PREHOOK: Input: default@partitioned_delete_1@part=1
 PREHOOK: Input: default@partitioned_delete_1@part=2
 PREHOOK: Output: default@partitioned_delete_1@part=1
 PREHOOK: Output: default@partitioned_delete_1@part=2
-POSTHOOK: query: -- DELETE where old column
-delete from partitioned_delete_1 where insert_num = 102 or insert_num = 104 or insert_num = 106
+POSTHOOK: query: delete from partitioned_delete_1 where insert_num = 102 or insert_num = 104 or insert_num = 106
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partitioned_delete_1
 POSTHOOK: Input: default@partitioned_delete_1@part=1
@@ -408,19 +370,11 @@ POSTHOOK: query: DROP TABLE partitioned_delete_1
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@partitioned_delete_1
 POSTHOOK: Output: default@partitioned_delete_1
-PREHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where new column
----
-CREATE TABLE partitioned_delete_2(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE partitioned_delete_2(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@partitioned_delete_2
-POSTHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where new column
----
-CREATE TABLE partitioned_delete_2(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE partitioned_delete_2(insert_num int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@partitioned_delete_2
@@ -436,13 +390,11 @@ POSTHOOK: Lineage: partitioned_delete_2 PARTITION(part=1).a SIMPLE [(schema_evol
 POSTHOOK: Lineage: partitioned_delete_2 PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_2 PARTITION(part=1).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 partitioned_delete_2 add columns(c int, d string)
+PREHOOK: query: alter table partitioned_delete_2 add columns(c int, d string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@partitioned_delete_2
 PREHOOK: Output: default@partitioned_delete_2
-POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table partitioned_delete_2 add columns(c int, d string)
+POSTHOOK: query: alter table partitioned_delete_2 add columns(c int, d string)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@partitioned_delete_2
 POSTHOOK: Output: default@partitioned_delete_2
@@ -502,16 +454,14 @@ insert_num	part	a	b	c	d
 113	1	40000	new	40000	Delaware
 114	1	-128	new	-128	smaller than Scotland
 115	1	32768	new	32768	major glaciation
-PREHOOK: query: -- DELETE where new column
-delete from partitioned_delete_2 where insert_num = 108 or insert_num > 113
+PREHOOK: query: delete from partitioned_delete_2 where insert_num = 108 or insert_num > 113
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partitioned_delete_2
 PREHOOK: Input: default@partitioned_delete_2@part=1
 PREHOOK: Input: default@partitioned_delete_2@part=2
 PREHOOK: Output: default@partitioned_delete_2@part=1
 PREHOOK: Output: default@partitioned_delete_2@part=2
-POSTHOOK: query: -- DELETE where new column
-delete from partitioned_delete_2 where insert_num = 108 or insert_num > 113
+POSTHOOK: query: delete from partitioned_delete_2 where insert_num = 108 or insert_num > 113
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partitioned_delete_2
 POSTHOOK: Input: default@partitioned_delete_2@part=1
@@ -585,11 +535,9 @@ POSTHOOK: query: DROP TABLE partitioned_delete_2
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@partitioned_delete_2
 POSTHOOK: Output: default@partitioned_delete_2
-PREHOOK: query: --following tests is moved from system tests
-drop table if exists missing_ddl_2
+PREHOOK: query: drop table if exists missing_ddl_2
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: --following tests is moved from system tests
-drop table if exists missing_ddl_2
+POSTHOOK: query: drop table if exists missing_ddl_2
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table missing_ddl_2(name string, age int)
 PREHOOK: type: CREATETABLE
@@ -1694,11 +1642,9 @@ POSTHOOK: Lineage: all100kjson_textfile_orc PARTITION(t=0).s SIMPLE [(alltypesor
 POSTHOOK: Lineage: all100kjson_textfile_orc PARTITION(t=0).si SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ]
 POSTHOOK: Lineage: all100kjson_textfile_orc PARTITION(t=0).ts SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ]
 csmallint	cint	cbigint	cfloat	cdouble	cstring1	cboolean1	ctimestamp1	ctinyint
-PREHOOK: query: -- HIVE-11977: Hive should handle an external avro table with zero length files present
-DROP TABLE IF EXISTS emptyavro
+PREHOOK: query: DROP TABLE IF EXISTS emptyavro
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: -- HIVE-11977: Hive should handle an external avro table with zero length files present
-DROP TABLE IF EXISTS emptyavro
+POSTHOOK: query: DROP TABLE IF EXISTS emptyavro
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: CREATE TABLE emptyavro (i int)
                PARTITIONED BY (s string)

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
index a1d9706..ce33ed0 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
@@ -1,23 +1,9 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
---
--- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Table
--- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID.
--- Also, we don't do EXPLAINs on ACID files because the transaction id causes Q file statistics differences...
---
-
-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: ORC, ACID Non-Vectorized, MapWork, Table
--- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID.
--- Also, we don't do EXPLAINs on ACID files because the transaction id causes Q file statistics differences...
---
-
-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) clustered by (a) into 2 buckets STORED AS ORC  TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE table_add_int_permute_select(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC  TBLPROPERTIES ('transactional'='true')
 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) clustered by (a) into 2 buckets STORED AS ORC  TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE table_add_int_permute_select(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC  TBLPROPERTIES ('transactional'='true')
 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
@@ -85,13 +55,11 @@ POSTHOOK: Lineage: table_add_int_permute_select.b SIMPLE [(values__tmp__table__1
 POSTHOOK: Lineage: table_add_int_permute_select.c EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col4, type:string, comment:), ]
 POSTHOOK: Lineage: table_add_int_permute_select.insert_num EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
 _col0	_col1	_col2	_col3
-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 ####
@@ -140,17 +108,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)  clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE table_add_int_string_permute_select(insert_num int, a INT, b STRING)  clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 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)  clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE table_add_int_string_permute_select(insert_num int, a INT, b STRING)  clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_add_int_string_permute_select
@@ -166,13 +128,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
@@ -188,13 +148,11 @@ POSTHOOK: Lineage: table_add_int_string_permute_select.c EXPRESSION [(values__tm
 POSTHOOK: Lineage: table_add_int_string_permute_select.d SIMPLE [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col5, type:string, comment:), ]
 POSTHOOK: Lineage: table_add_int_string_permute_select.insert_num EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
 _col0	_col1	_col2	_col3	_col4
-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 ####
@@ -303,25 +261,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)  clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE table_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING)  clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 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)  clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE table_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING)  clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_string_group_double
@@ -339,13 +283,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
@@ -384,25 +326,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) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+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) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 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) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+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) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_date_group_string_group_date_group
@@ -427,13 +355,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
@@ -479,18 +405,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,
@@ -498,18 +413,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,
@@ -570,8 +474,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),
@@ -579,8 +482,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),
@@ -648,14 +550,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,
@@ -663,14 +558,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,
@@ -726,8 +614,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),
@@ -735,8 +622,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),
@@ -799,30 +685,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) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 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) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
@@ -872,16 +742,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)
@@ -938,18 +806,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,
@@ -958,18 +815,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,
@@ -1031,8 +877,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,
@@ -1041,8 +886,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,
@@ -1111,24 +955,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) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 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) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
@@ -1169,13 +1003,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/schema_evol_orc_acid_table_update.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update.q.out
index 0420a8c..2292dcb 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update.q.out
@@ -1,23 +1,9 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
---
--- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Table
--- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID.
--- Also, we don't do EXPLAINs on ACID files because the transaction id causes Q file statistics differences...
---
-
-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: ORC, ACID Non-Vectorized, MapWork, Table
--- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID.
--- Also, we don't do EXPLAINs on ACID files because the transaction id causes Q file statistics differences...
---
-
-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
@@ -48,19 +34,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_2
-PREHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... UPDATE New Columns
----
-CREATE TABLE table5(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE table5(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@table5
-POSTHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... UPDATE New Columns
----
-CREATE TABLE table5(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE table5(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table5
@@ -76,13 +54,11 @@ POSTHOOK: Lineage: table5.a SIMPLE [(schema_evolution_data)schema_evolution_data
 POSTHOOK: Lineage: table5.b SIMPLE []
 POSTHOOK: Lineage: table5.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 table5 add columns(c int, d string)
+PREHOOK: query: alter table table5 add columns(c int, d string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@table5
 PREHOOK: Output: default@table5
-POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table table5 add columns(c int, d string)
+POSTHOOK: query: alter table table5 add columns(c int, d string)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@table5
 POSTHOOK: Output: default@table5
@@ -124,13 +100,11 @@ a	b	c	d
 82153733	new	82153733	Antarctic peninsula
 NULL	new	NULL	baffling
 NULL	original	NULL	NULL
-PREHOOK: query: -- UPDATE New Columns
-update table5 set c=99
+PREHOOK: query: update table5 set c=99
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table5
 PREHOOK: Output: default@table5
-POSTHOOK: query: -- UPDATE New Columns
-update table5 set c=99
+POSTHOOK: query: update table5 set c=99
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table5
 POSTHOOK: Output: default@table5
@@ -195,19 +169,11 @@ POSTHOOK: query: DROP TABLE table5
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@table5
 POSTHOOK: Output: default@table5
-PREHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where old column
----
-CREATE TABLE table6(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE table6(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@table6
-POSTHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where old column
----
-CREATE TABLE table6(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE table6(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table6
@@ -223,13 +189,11 @@ POSTHOOK: Lineage: table6.a SIMPLE [(schema_evolution_data)schema_evolution_data
 POSTHOOK: Lineage: table6.b SIMPLE []
 POSTHOOK: Lineage: table6.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 table6 add columns(c int, d string)
+PREHOOK: query: alter table table6 add columns(c int, d string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@table6
 PREHOOK: Output: default@table6
-POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table table6 add columns(c int, d string)
+POSTHOOK: query: alter table table6 add columns(c int, d string)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@table6
 POSTHOOK: Output: default@table6
@@ -285,13 +249,11 @@ a	b	c	d
 82153733	new	82153733	Antarctic peninsula
 NULL	new	NULL	baffling
 NULL	original	NULL	NULL
-PREHOOK: query: -- DELETE where old column
-delete from table6 where insert_num = 102 or insert_num = 104 or insert_num = 106
+PREHOOK: query: delete from table6 where insert_num = 102 or insert_num = 104 or insert_num = 106
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table6
 PREHOOK: Output: default@table6
-POSTHOOK: query: -- DELETE where old column
-delete from table6 where insert_num = 102 or insert_num = 104 or insert_num = 106
+POSTHOOK: query: delete from table6 where insert_num = 102 or insert_num = 104 or insert_num = 106
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table6
 POSTHOOK: Output: default@table6
@@ -350,19 +312,11 @@ POSTHOOK: query: DROP TABLE table6
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@table6
 POSTHOOK: Output: default@table6
-PREHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where new column
----
-CREATE TABLE table7(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE table7(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@table7
-POSTHOOK: query: --
---
--- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where new column
----
-CREATE TABLE table7(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE table7(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table7
@@ -378,13 +332,11 @@ POSTHOOK: Lineage: table7.a SIMPLE [(schema_evolution_data)schema_evolution_data
 POSTHOOK: Lineage: table7.b SIMPLE []
 POSTHOOK: Lineage: table7.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 table7 add columns(c int, d string)
+PREHOOK: query: alter table table7 add columns(c int, d string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@table7
 PREHOOK: Output: default@table7
-POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table table7 add columns(c int, d string)
+POSTHOOK: query: alter table table7 add columns(c int, d string)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@table7
 POSTHOOK: Output: default@table7
@@ -440,13 +392,11 @@ a	b	c	d
 82153733	new	82153733	Antarctic peninsula
 NULL	new	NULL	baffling
 NULL	original	NULL	NULL
-PREHOOK: query: -- DELETE where new column
-delete from table7 where insert_num = 107 or insert_num >= 110
+PREHOOK: query: delete from table7 where insert_num = 107 or insert_num >= 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table7
 PREHOOK: Output: default@table7
-POSTHOOK: query: -- DELETE where new column
-delete from table7 where insert_num = 107 or insert_num >= 110
+POSTHOOK: query: delete from table7 where insert_num = 107 or insert_num >= 110
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table7
 POSTHOOK: Output: default@table7


Mime
View raw message