http://git-wip-us.apache.org/repos/asf/hive/blob/8230b579/ql/src/test/results/clientpositive/perf/query45.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/perf/query45.q.out b/ql/src/test/results/clientpositive/perf/query45.q.out deleted file mode 100644 index e2d0da5..0000000 --- a/ql/src/test/results/clientpositive/perf/query45.q.out +++ /dev/null @@ -1,121 +0,0 @@ -PREHOOK: query: explain select ca_zip, ca_county, sum(ws_sales_price) from web_sales JOIN customer ON web_sales.ws_bill_customer_sk = customer.c_customer_sk JOIN customer_address ON customer.c_current_addr_sk = customer_address.ca_address_sk JOIN date_dim ON web_sales.ws_sold_date_sk = date_dim.d_date_sk JOIN item ON web_sales.ws_item_sk = item.i_item_sk where ( item.i_item_id in (select i_item_id from item i2 where i2.i_item_sk in (2, 3, 5, 7, 11, 13, 17, 19, 23, 29) ) ) and d_qoy = 2 and d_year = 2000 group by ca_zip, ca_county order by ca_zip, ca_county limit 100 -PREHOOK: type: QUERY -POSTHOOK: query: explain select ca_zip, ca_county, sum(ws_sales_price) from web_sales JOIN customer ON web_sales.ws_bill_customer_sk = customer.c_customer_sk JOIN customer_address ON customer.c_current_addr_sk = customer_address.ca_address_sk JOIN date_dim ON web_sales.ws_sold_date_sk = date_dim.d_date_sk JOIN item ON web_sales.ws_item_sk = item.i_item_sk where ( item.i_item_id in (select i_item_id from item i2 where i2.i_item_sk in (2, 3, 5, 7, 11, 13, 17, 19, 23, 29) ) ) and d_qoy = 2 and d_year = 2000 group by ca_zip, ca_county order by ca_zip, ca_county limit 100 -POSTHOOK: type: QUERY -Plan optimized by CBO. - -Vertex dependency in root stage -Reducer 11 <- Map 10 (SIMPLE_EDGE) -Reducer 13 <- Map 12 (SIMPLE_EDGE), Map 14 (SIMPLE_EDGE) -Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE) -Reducer 3 <- Reducer 2 (SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE) -Reducer 4 <- Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Reducer 4 (SIMPLE_EDGE) -Reducer 8 <- Map 7 (SIMPLE_EDGE), Reducer 11 (SIMPLE_EDGE) -Reducer 9 <- Reducer 13 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE) - -Stage-0 - Fetch Operator - limit:100 - Stage-1 - Reducer 5 - File Output Operator [FS_47] - Limit [LIM_46] (rows=100 width=135) - Number of rows:100 - Select Operator [SEL_45] (rows=95833781 width=135) - Output:["_col0","_col1","_col2"] - <-Reducer 4 [SIMPLE_EDGE] - SHUFFLE [RS_44] - Group By Operator [GBY_42] (rows=95833781 width=135) - Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1 - <-Reducer 3 [SIMPLE_EDGE] - SHUFFLE [RS_41] - PartitionCols:_col0, _col1 - Group By Operator [GBY_40] (rows=191667562 width=135) - Output:["_col0","_col1","_col2"],aggregations:["sum(_col11)"],keys:_col4, _col3 - Select Operator [SEL_39] (rows=191667562 width=135) - Output:["_col4","_col3","_col11"] - Merge Join Operator [MERGEJOIN_74] (rows=191667562 width=135) - Conds:RS_36._col0=RS_37._col5(Inner),Output:["_col3","_col4","_col11"] - <-Reducer 2 [SIMPLE_EDGE] - SHUFFLE [RS_36] - PartitionCols:_col0 - Merge Join Operator [MERGEJOIN_70] (rows=88000001 width=860) - Conds:RS_33._col1=RS_34._col0(Inner),Output:["_col0","_col3","_col4"] - <-Map 1 [SIMPLE_EDGE] - SHUFFLE [RS_33] - PartitionCols:_col1 - Select Operator [SEL_2] (rows=80000000 width=860) - Output:["_col0","_col1"] - Filter Operator [FIL_64] (rows=80000000 width=860) - predicate:(c_customer_sk is not null and c_current_addr_sk is not null) - TableScan [TS_0] (rows=80000000 width=860) - default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"] - <-Map 6 [SIMPLE_EDGE] - SHUFFLE [RS_34] - PartitionCols:_col0 - Select Operator [SEL_5] (rows=40000000 width=1014) - Output:["_col0","_col1","_col2"] - Filter Operator [FIL_65] (rows=40000000 width=1014) - predicate:ca_address_sk is not null - TableScan [TS_3] (rows=40000000 width=1014) - default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county","ca_zip"] - <-Reducer 9 [SIMPLE_EDGE] - SHUFFLE [RS_37] - PartitionCols:_col5 - Merge Join Operator [MERGEJOIN_73] (rows=174243235 width=135) - Conds:RS_29._col0=RS_30._col1(Inner),Output:["_col5","_col6"] - <-Reducer 13 [SIMPLE_EDGE] - SHUFFLE [RS_30] - PartitionCols:_col1 - Merge Join Operator [MERGEJOIN_72] (rows=158402938 width=135) - Conds:RS_22._col0=RS_23._col0(Inner),Output:["_col1","_col2","_col3"] - <-Map 12 [SIMPLE_EDGE] - SHUFFLE [RS_22] - PartitionCols:_col0 - Select Operator [SEL_18] (rows=144002668 width=135) - Output:["_col0","_col1","_col2","_col3"] - Filter Operator [FIL_68] (rows=144002668 width=135) - predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and ws_item_sk is not null) - TableScan [TS_16] (rows=144002668 width=135) - default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk","ws_sales_price"] - <-Map 14 [SIMPLE_EDGE] - SHUFFLE [RS_23] - PartitionCols:_col0 - Select Operator [SEL_21] (rows=18262 width=1119) - Output:["_col0"] - Filter Operator [FIL_69] (rows=18262 width=1119) - predicate:((d_qoy = 2) and (d_year = 2000) and d_date_sk is not null) - TableScan [TS_19] (rows=73049 width=1119) - default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"] - <-Reducer 8 [SIMPLE_EDGE] - SHUFFLE [RS_29] - PartitionCols:_col0 - Merge Join Operator [MERGEJOIN_71] (rows=508200 width=1436) - Conds:RS_26._col1=RS_27._col0(Inner),Output:["_col0"] - <-Map 7 [SIMPLE_EDGE] - SHUFFLE [RS_26] - PartitionCols:_col1 - Select Operator [SEL_8] (rows=462000 width=1436) - Output:["_col0","_col1"] - Filter Operator [FIL_66] (rows=462000 width=1436) - predicate:i_item_sk is not null - TableScan [TS_6] (rows=462000 width=1436) - default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"] - <-Reducer 11 [SIMPLE_EDGE] - SHUFFLE [RS_27] - PartitionCols:_col0 - Group By Operator [GBY_14] (rows=115500 width=1436) - Output:["_col0"],keys:KEY._col0 - <-Map 10 [SIMPLE_EDGE] - SHUFFLE [RS_13] - PartitionCols:_col0 - Group By Operator [GBY_12] (rows=231000 width=1436) - Output:["_col0"],keys:i_item_id - Select Operator [SEL_11] (rows=231000 width=1436) - Output:["i_item_id"] - Filter Operator [FIL_67] (rows=231000 width=1436) - predicate:(i_item_sk) IN (2, 3, 5, 7, 11, 13, 17, 19, 23, 29) - TableScan [TS_9] (rows=462000 width=1436) - default@item,i2,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"] -
http://git-wip-us.apache.org/repos/asf/hive/blob/8230b579/ql/src/test/results/clientpositive/protectmode.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/protectmode.q.out b/ql/src/test/results/clientpositive/protectmode.q.out deleted file mode 100644 index 0326293..0000000 --- a/ql/src/test/results/clientpositive/protectmode.q.out +++ /dev/null @@ -1,409 +0,0 @@ -PREHOOK: query: -- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode - -drop table tbl1 -PREHOOK: type: DROPTABLE -POSTHOOK: query: -- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode - -drop table tbl1 -POSTHOOK: type: DROPTABLE -PREHOOK: query: drop table tbl2 -PREHOOK: type: DROPTABLE -POSTHOOK: query: drop table tbl2 -POSTHOOK: type: DROPTABLE -PREHOOK: query: create table tbl1 (col string) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@tbl1 -POSTHOOK: query: create table tbl1 (col string) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@tbl1 -PREHOOK: query: select * from tbl1 -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl1 -#### A masked pattern was here #### -POSTHOOK: query: select * from tbl1 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl1 -#### A masked pattern was here #### -PREHOOK: query: select col from tbl1 -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl1 -#### A masked pattern was here #### -POSTHOOK: query: select col from tbl1 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl1 -#### A masked pattern was here #### -PREHOOK: query: alter table tbl1 enable offline -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: alter table tbl1 enable offline -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl1 -POSTHOOK: Output: default@tbl1 -PREHOOK: query: desc extended tbl1 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl1 -POSTHOOK: query: desc extended tbl1 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl1 -col string - -#### A masked pattern was here #### -PREHOOK: query: alter table tbl1 disable offline -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: alter table tbl1 disable offline -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl1 -POSTHOOK: Output: default@tbl1 -PREHOOK: query: desc extended tbl1 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl1 -POSTHOOK: query: desc extended tbl1 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl1 -col string - -#### A masked pattern was here #### -PREHOOK: query: select * from tbl1 -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl1 -#### A masked pattern was here #### -POSTHOOK: query: select * from tbl1 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl1 -#### A masked pattern was here #### -PREHOOK: query: select col from tbl1 -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl1 -#### A masked pattern was here #### -POSTHOOK: query: select col from tbl1 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl1 -#### A masked pattern was here #### -PREHOOK: query: create table tbl2 (col string) partitioned by (p string) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@tbl2 -POSTHOOK: query: create table tbl2 (col string) partitioned by (p string) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@tbl2 -PREHOOK: query: alter table tbl2 add partition (p='p1') -PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 add partition (p='p1') -POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Output: default@tbl2 -POSTHOOK: Output: default@tbl2@p=p1 -PREHOOK: query: alter table tbl2 add partition (p='p2') -PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 add partition (p='p2') -POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Output: default@tbl2 -POSTHOOK: Output: default@tbl2@p=p2 -PREHOOK: query: alter table tbl2 add partition (p='p3') -PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 add partition (p='p3') -POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Output: default@tbl2 -POSTHOOK: Output: default@tbl2@p=p3 -PREHOOK: query: alter table tbl2 drop partition (p='not_exist') -PREHOOK: type: ALTERTABLE_DROPPARTS -PREHOOK: Input: default@tbl2 -POSTHOOK: query: alter table tbl2 drop partition (p='not_exist') -POSTHOOK: type: ALTERTABLE_DROPPARTS -POSTHOOK: Input: default@tbl2 -PREHOOK: query: select * from tbl2 where p='p1' -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl2 -PREHOOK: Input: default@tbl2@p=p1 -#### A masked pattern was here #### -POSTHOOK: query: select * from tbl2 where p='p1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p1 -#### A masked pattern was here #### -PREHOOK: query: select * from tbl2 where p='p2' -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl2 -PREHOOK: Input: default@tbl2@p=p2 -#### A masked pattern was here #### -POSTHOOK: query: select * from tbl2 where p='p2' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p2 -#### A masked pattern was here #### -PREHOOK: query: alter table tbl2 partition (p='p1') enable offline -PREHOOK: type: ALTERPARTITION_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2@p=p1 -POSTHOOK: query: alter table tbl2 partition (p='p1') enable offline -POSTHOOK: type: ALTERPARTITION_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p1 -POSTHOOK: Output: default@tbl2@p=p1 -PREHOOK: query: desc extended tbl2 partition (p='p1') -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl2 -POSTHOOK: query: desc extended tbl2 partition (p='p1') -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl2 -col string -p string - -# Partition Information -# col_name data_type comment - -p string - -#### A masked pattern was here #### -PREHOOK: query: alter table tbl2 enable offline -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 enable offline -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2 -PREHOOK: query: desc extended tbl2 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl2 -POSTHOOK: query: desc extended tbl2 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl2 -col string -p string - -# Partition Information -# col_name data_type comment - -p string - -#### A masked pattern was here #### -PREHOOK: query: alter table tbl2 enable no_drop -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 enable no_drop -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2 -PREHOOK: query: desc extended tbl2 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl2 -POSTHOOK: query: desc extended tbl2 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl2 -col string -p string - -# Partition Information -# col_name data_type comment - -p string - -#### A masked pattern was here #### -PREHOOK: query: alter table tbl2 drop partition (p='p3') -PREHOOK: type: ALTERTABLE_DROPPARTS -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2@p=p3 -POSTHOOK: query: alter table tbl2 drop partition (p='p3') -POSTHOOK: type: ALTERTABLE_DROPPARTS -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2@p=p3 -PREHOOK: query: alter table tbl2 disable offline -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 disable offline -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2 -PREHOOK: query: desc extended tbl2 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl2 -POSTHOOK: query: desc extended tbl2 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl2 -col string -p string - -# Partition Information -# col_name data_type comment - -p string - -#### A masked pattern was here #### -PREHOOK: query: alter table tbl2 disable no_drop -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 disable no_drop -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2 -PREHOOK: query: desc extended tbl2 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl2 -POSTHOOK: query: desc extended tbl2 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl2 -col string -p string - -# Partition Information -# col_name data_type comment - -p string - -#### A masked pattern was here #### -PREHOOK: query: select * from tbl2 where p='p2' -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl2 -PREHOOK: Input: default@tbl2@p=p2 -#### A masked pattern was here #### -POSTHOOK: query: select * from tbl2 where p='p2' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p2 -#### A masked pattern was here #### -PREHOOK: query: select col from tbl2 where p='p2' -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl2 -PREHOOK: Input: default@tbl2@p=p2 -#### A masked pattern was here #### -POSTHOOK: query: select col from tbl2 where p='p2' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p2 -#### A masked pattern was here #### -PREHOOK: query: alter table tbl2 partition (p='p1') disable offline -PREHOOK: type: ALTERPARTITION_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2@p=p1 -POSTHOOK: query: alter table tbl2 partition (p='p1') disable offline -POSTHOOK: type: ALTERPARTITION_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p1 -POSTHOOK: Output: default@tbl2@p=p1 -PREHOOK: query: desc extended tbl2 partition (p='p1') -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl2 -POSTHOOK: query: desc extended tbl2 partition (p='p1') -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl2 -col string -p string - -# Partition Information -# col_name data_type comment - -p string - -#### A masked pattern was here #### -PREHOOK: query: select * from tbl2 where p='p1' -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl2 -PREHOOK: Input: default@tbl2@p=p1 -#### A masked pattern was here #### -POSTHOOK: query: select * from tbl2 where p='p1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p1 -#### A masked pattern was here #### -PREHOOK: query: select col from tbl2 where p='p1' -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl2 -PREHOOK: Input: default@tbl2@p=p1 -#### A masked pattern was here #### -POSTHOOK: query: select col from tbl2 where p='p1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p1 -#### A masked pattern was here #### -PREHOOK: query: insert overwrite table tbl1 select col from tbl2 where p='p1' -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl2 -PREHOOK: Input: default@tbl2@p=p1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: insert overwrite table tbl1 select col from tbl2 where p='p1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p1 -POSTHOOK: Output: default@tbl1 -POSTHOOK: Lineage: tbl1.col SIMPLE [(tbl2)tbl2.FieldSchema(name:col, type:string, comment:null), ] -PREHOOK: query: insert overwrite table tbl1 select col from tbl1 -PREHOOK: type: QUERY -PREHOOK: Input: default@tbl1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: insert overwrite table tbl1 select col from tbl1 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tbl1 -POSTHOOK: Output: default@tbl1 -POSTHOOK: Lineage: tbl1.col SIMPLE [(tbl1)tbl1.FieldSchema(name:col, type:string, comment:null), ] -PREHOOK: query: alter table tbl2 partition (p='p1') enable no_drop -PREHOOK: type: ALTERPARTITION_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2@p=p1 -POSTHOOK: query: alter table tbl2 partition (p='p1') enable no_drop -POSTHOOK: type: ALTERPARTITION_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p1 -POSTHOOK: Output: default@tbl2@p=p1 -PREHOOK: query: alter table tbl2 partition (p='p1') disable no_drop -PREHOOK: type: ALTERPARTITION_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2@p=p1 -POSTHOOK: query: alter table tbl2 partition (p='p1') disable no_drop -POSTHOOK: type: ALTERPARTITION_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p1 -POSTHOOK: Output: default@tbl2@p=p1 -PREHOOK: query: alter table tbl2 partition (p='p2') enable no_drop -PREHOOK: type: ALTERPARTITION_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2@p=p2 -POSTHOOK: query: alter table tbl2 partition (p='p2') enable no_drop -POSTHOOK: type: ALTERPARTITION_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p2 -POSTHOOK: Output: default@tbl2@p=p2 -PREHOOK: query: alter table tbl2 drop partition (p='p1') -PREHOOK: type: ALTERTABLE_DROPPARTS -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2@p=p1 -POSTHOOK: query: alter table tbl2 drop partition (p='p1') -POSTHOOK: type: ALTERTABLE_DROPPARTS -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2@p=p1 -PREHOOK: query: alter table tbl2 partition (p='p2') disable no_drop -PREHOOK: type: ALTERPARTITION_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2@p=p2 -POSTHOOK: query: alter table tbl2 partition (p='p2') disable no_drop -POSTHOOK: type: ALTERPARTITION_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Input: default@tbl2@p=p2 -POSTHOOK: Output: default@tbl2@p=p2 -PREHOOK: query: drop table tbl1 -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@tbl1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: drop table tbl1 -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@tbl1 -POSTHOOK: Output: default@tbl1 -PREHOOK: query: drop table tbl2 -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2 -POSTHOOK: query: drop table tbl2 -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2 http://git-wip-us.apache.org/repos/asf/hive/blob/8230b579/ql/src/test/results/clientpositive/protectmode2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/protectmode2.q.out b/ql/src/test/results/clientpositive/protectmode2.q.out deleted file mode 100644 index ee04393..0000000 --- a/ql/src/test/results/clientpositive/protectmode2.q.out +++ /dev/null @@ -1,205 +0,0 @@ -PREHOOK: query: drop table tbl1 -PREHOOK: type: DROPTABLE -POSTHOOK: query: drop table tbl1 -POSTHOOK: type: DROPTABLE -PREHOOK: query: create table tbl1 (col string) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@tbl1 -POSTHOOK: query: create table tbl1 (col string) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@tbl1 -PREHOOK: query: alter table tbl1 enable no_drop cascade -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: alter table tbl1 enable no_drop cascade -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl1 -POSTHOOK: Output: default@tbl1 -PREHOOK: query: desc extended tbl1 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl1 -POSTHOOK: query: desc extended tbl1 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl1 -col string - -#### A masked pattern was here #### -PREHOOK: query: alter table tbl1 enable no_drop -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: alter table tbl1 enable no_drop -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl1 -POSTHOOK: Output: default@tbl1 -PREHOOK: query: desc extended tbl1 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl1 -POSTHOOK: query: desc extended tbl1 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl1 -col string - -#### A masked pattern was here #### -PREHOOK: query: alter table tbl1 disable no_drop cascade -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: alter table tbl1 disable no_drop cascade -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl1 -POSTHOOK: Output: default@tbl1 -PREHOOK: query: desc extended tbl1 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl1 -POSTHOOK: query: desc extended tbl1 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl1 -col string - -#### A masked pattern was here #### -PREHOOK: query: alter table tbl1 disable no_drop -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: alter table tbl1 disable no_drop -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl1 -POSTHOOK: Output: default@tbl1 -PREHOOK: query: drop table tbl1 -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@tbl1 -PREHOOK: Output: default@tbl1 -POSTHOOK: query: drop table tbl1 -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@tbl1 -POSTHOOK: Output: default@tbl1 -PREHOOK: query: drop table tbl2 -PREHOOK: type: DROPTABLE -POSTHOOK: query: drop table tbl2 -POSTHOOK: type: DROPTABLE -PREHOOK: query: create table tbl2 (col string) partitioned by (p string) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@tbl2 -POSTHOOK: query: create table tbl2 (col string) partitioned by (p string) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@tbl2 -PREHOOK: query: alter table tbl2 add partition (p='p1') -PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 add partition (p='p1') -POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Output: default@tbl2 -POSTHOOK: Output: default@tbl2@p=p1 -PREHOOK: query: alter table tbl2 add partition (p='p2') -PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 add partition (p='p2') -POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Output: default@tbl2 -POSTHOOK: Output: default@tbl2@p=p2 -PREHOOK: query: alter table tbl2 add partition (p='p3') -PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 add partition (p='p3') -POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Output: default@tbl2 -POSTHOOK: Output: default@tbl2@p=p3 -PREHOOK: query: alter table tbl2 enable no_drop cascade -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 enable no_drop cascade -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2 -PREHOOK: query: desc formatted tbl2 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl2 -POSTHOOK: query: desc formatted tbl2 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl2 -# col_name data_type comment - -col string - -# Partition Information -# col_name data_type comment - -p string - -# Detailed Table Information -Database: default -#### A masked pattern was here #### -Retention: 0 -#### A masked pattern was here #### -Table Type: MANAGED_TABLE -Table Parameters: - PROTECT_MODE NO_DROP_CASCADE -#### A masked pattern was here #### - -# Storage Information -SerDe Library: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe -InputFormat: org.apache.hadoop.mapred.TextInputFormat -OutputFormat: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat -Compressed: No -Num Buckets: -1 -Bucket Columns: [] -Sort Columns: [] -Storage Desc Params: - serialization.format 1 -PREHOOK: query: alter table tbl2 disable no_drop cascade -PREHOOK: type: ALTERTABLE_PROTECTMODE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2 -POSTHOOK: query: alter table tbl2 disable no_drop cascade -POSTHOOK: type: ALTERTABLE_PROTECTMODE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2 -PREHOOK: query: desc formatted tbl2 -PREHOOK: type: DESCTABLE -PREHOOK: Input: default@tbl2 -POSTHOOK: query: desc formatted tbl2 -POSTHOOK: type: DESCTABLE -POSTHOOK: Input: default@tbl2 -# col_name data_type comment - -col string - -# Partition Information -# col_name data_type comment - -p string - -# Detailed Table Information -Database: default -#### A masked pattern was here #### -Retention: 0 -#### A masked pattern was here #### -Table Type: MANAGED_TABLE -Table Parameters: -#### A masked pattern was here #### - -# Storage Information -SerDe Library: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe -InputFormat: org.apache.hadoop.mapred.TextInputFormat -OutputFormat: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat -Compressed: No -Num Buckets: -1 -Bucket Columns: [] -Sort Columns: [] -Storage Desc Params: - serialization.format 1 -PREHOOK: query: drop table tbl2 -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@tbl2 -PREHOOK: Output: default@tbl2 -POSTHOOK: query: drop table tbl2 -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@tbl2 -POSTHOOK: Output: default@tbl2
