http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
index 7420e42..5b89cd7 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
@@ -13,9 +13,13 @@ POSTHOOK: Output: default@list_bucketing
 PREHOOK: query: explain extended
 insert overwrite table list_bucketing select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@list_bucketing
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@list_bucketing
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:
@@ -286,9 +290,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain extended
 select key, value from list_bucketing where key = "484"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select key, value from list_bucketing where key = "484"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `key`, `value`
 FROM `default`.`list_bucketing`
 WHERE `key` = '484'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
index 5289fd8..8f39619 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
@@ -18,10 +18,18 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n4 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_static_part_n4@ds=2008-04-08/hr=11
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n4 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@list_bucketing_static_part_n4@ds=2008-04-08/hr=11
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -358,9 +366,15 @@ POSTHOOK: Input: default@list_bucketing_static_part_n4
 PREHOOK: query: explain extended
 select * from list_bucketing_static_part_n4 where ds = '2008-04-08' and  hr = 
'11' and key = '484' and value = 'val_484'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_static_part_n4
+PREHOOK: Input: default@list_bucketing_static_part_n4@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from list_bucketing_static_part_n4 where ds = '2008-04-08' and  hr = 
'11' and key = '484' and value = 'val_484'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_static_part_n4
+POSTHOOK: Input: default@list_bucketing_static_part_n4@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`, CAST('val_484' AS 
STRING) AS `$f1`, CAST('2008-04-08' AS STRING) AS `$f2`, CAST('11' AS STRING) 
AS `$f3`
 FROM `default`.`list_bucketing_static_part_n4`
 WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484' AND `value` = 
'val_484'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
index 5ba8948..fb8ff44 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
@@ -9,9 +9,17 @@ POSTHOOK: Output: default@list_bucketing_static_part_n1
 PREHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n1 partition 
(ds='2008-04-08', hr='11') select key, value from srcpart where ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_static_part_n1@ds=2008-04-08/hr=11
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n1 partition 
(ds='2008-04-08', hr='11') select key, value from srcpart where ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@list_bucketing_static_part_n1@ds=2008-04-08/hr=11
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -350,9 +358,15 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: query: explain extended
 select key, value from list_bucketing_static_part_n1 where ds='2008-04-08' and 
hr='11' and key = "484"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_static_part_n1
+PREHOOK: Input: default@list_bucketing_static_part_n1@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select key, value from list_bucketing_static_part_n1 where ds='2008-04-08' and 
hr='11' and key = "484"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_static_part_n1
+POSTHOOK: Input: default@list_bucketing_static_part_n1@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `key`, `value`
 FROM `default`.`list_bucketing_static_part_n1`
 WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
index 7881bba..9bcc9a5 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
@@ -18,10 +18,18 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n2 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_static_part_n2@ds=2008-04-08/hr=11
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n2 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@list_bucketing_static_part_n2@ds=2008-04-08/hr=11
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -341,10 +349,18 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n2 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_static_part_n2@ds=2008-04-08/hr=11
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n2 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@list_bucketing_static_part_n2@ds=2008-04-08/hr=11
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -801,9 +817,15 @@ POSTHOOK: Input: default@list_bucketing_static_part_n2
 PREHOOK: query: explain extended
 select * from list_bucketing_static_part_n2 where ds = '2008-04-08' and  hr = 
'11' and key = '484' and value = 'val_484'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_static_part_n2
+PREHOOK: Input: default@list_bucketing_static_part_n2@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from list_bucketing_static_part_n2 where ds = '2008-04-08' and  hr = 
'11' and key = '484' and value = 'val_484'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_static_part_n2
+POSTHOOK: Input: default@list_bucketing_static_part_n2@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`, CAST('val_484' AS 
STRING) AS `$f1`, CAST('2008-04-08' AS STRING) AS `$f2`, CAST('11' AS STRING) 
AS `$f3`
 FROM `default`.`list_bucketing_static_part_n2`
 WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484' AND `value` = 
'val_484'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
index 47c9e24..9b6bf06 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
@@ -15,9 +15,16 @@ POSTHOOK: Output: default@list_bucketing_dynamic_part_n1
 PREHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n1 partition 
(ds='2008-04-08', hr) select key, value, hr from srcpart where ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_dynamic_part_n1@ds=2008-04-08
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n1 partition 
(ds='2008-04-08', hr) select key, value, hr from srcpart where ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 OPTIMIZED SQL: SELECT `key`, `value`, `hr`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -407,9 +414,17 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 PREHOOK: query: explain extended
 select key, value, ds, hr from list_bucketing_dynamic_part_n1 where 
ds='2008-04-08' and key = "103" and value ="val_103"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_dynamic_part_n1
+PREHOOK: Input: default@list_bucketing_dynamic_part_n1@ds=2008-04-08/hr=11
+PREHOOK: Input: default@list_bucketing_dynamic_part_n1@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select key, value, ds, hr from list_bucketing_dynamic_part_n1 where 
ds='2008-04-08' and key = "103" and value ="val_103"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n1
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n1@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n1@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('103' AS STRING) AS `key`, CAST('val_103' AS 
STRING) AS `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr`
 FROM `default`.`list_bucketing_dynamic_part_n1`
 WHERE `ds` = '2008-04-08' AND `key` = '103' AND `value` = 'val_103'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
index aad1458..76459d7 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
@@ -18,10 +18,17 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n3 partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_dynamic_part_n3@ds=2008-04-08
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n3 partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 OPTIMIZED SQL: SELECT `key`, `value`, IF(MOD(CAST(`key` AS DOUBLE), CAST(100 
AS DOUBLE)) = 0, 'a1', 'b1') AS `_o__c2`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -386,10 +393,17 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n3 partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_dynamic_part_n3@ds=2008-04-08
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n3 partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 OPTIMIZED SQL: SELECT `key`, `value`, IF(MOD(CAST(`key` AS DOUBLE), CAST(100 
AS DOUBLE)) = 0, 'a1', 'b1') AS `_o__c2`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -897,9 +911,17 @@ POSTHOOK: Input: default@list_bucketing_dynamic_part_n3
 PREHOOK: query: explain extended
 select * from list_bucketing_dynamic_part_n3 where key = '484' and value = 
'val_484'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_dynamic_part_n3
+PREHOOK: Input: default@list_bucketing_dynamic_part_n3@ds=2008-04-08/hr=a1
+PREHOOK: Input: default@list_bucketing_dynamic_part_n3@ds=2008-04-08/hr=b1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from list_bucketing_dynamic_part_n3 where key = '484' and value = 
'val_484'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n3
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n3@ds=2008-04-08/hr=a1
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n3@ds=2008-04-08/hr=b1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `key`, CAST('val_484' AS 
STRING) AS `value`, `ds`, `hr`
 FROM `default`.`list_bucketing_dynamic_part_n3`
 WHERE `key` = '484' AND `value` = 'val_484'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
index 7232e79..ddfa324 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
@@ -18,10 +18,17 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_dynamic_part@ds=2008-04-08
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 OPTIMIZED SQL: SELECT `key`, `value`, IF(MOD(CAST(`key` AS DOUBLE), CAST(100 
AS DOUBLE)) = 0, 'a1', 'b1') AS `_o__c2`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -386,10 +393,17 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_dynamic_part@ds=2008-04-08
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 OPTIMIZED SQL: SELECT `key`, `value`, IF(MOD(CAST(`key` AS DOUBLE), CAST(100 
AS DOUBLE)) = 0, 'a1', 'b1') AS `_o__c2`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -897,9 +911,17 @@ POSTHOOK: Input: default@list_bucketing_dynamic_part
 PREHOOK: query: explain extended
 select * from list_bucketing_dynamic_part where key = '484' and value = 
'val_484'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_dynamic_part
+PREHOOK: Input: default@list_bucketing_dynamic_part@ds=2008-04-08/hr=a1
+PREHOOK: Input: default@list_bucketing_dynamic_part@ds=2008-04-08/hr=b1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from list_bucketing_dynamic_part where key = '484' and value = 
'val_484'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_dynamic_part
+POSTHOOK: Input: default@list_bucketing_dynamic_part@ds=2008-04-08/hr=a1
+POSTHOOK: Input: default@list_bucketing_dynamic_part@ds=2008-04-08/hr=b1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `key`, CAST('val_484' AS 
STRING) AS `value`, `ds`, `hr`
 FROM `default`.`list_bucketing_dynamic_part`
 WHERE `key` = '484' AND `value` = 'val_484'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
index 337f9dc..30e75e1 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
@@ -18,10 +18,17 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n2 partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_dynamic_part_n2@ds=2008-04-08
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_dynamic_part_n2 partition (ds = 
'2008-04-08', hr)
 select key, value, if(key % 100 == 0, 'a1', 'b1') from srcpart where ds = 
'2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 OPTIMIZED SQL: SELECT `key`, `value`, IF(MOD(CAST(`key` AS DOUBLE), CAST(100 
AS DOUBLE)) = 0, 'a1', 'b1') AS `_o__c2`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -457,9 +464,17 @@ POSTHOOK: Input: 
default@list_bucketing_dynamic_part_n2@ds=2008-04-08/hr=b1
 PREHOOK: query: explain extended
 select * from list_bucketing_dynamic_part_n2 where key = '484' and value = 
'val_484'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_dynamic_part_n2
+PREHOOK: Input: default@list_bucketing_dynamic_part_n2@ds=2008-04-08/hr=a1
+PREHOOK: Input: default@list_bucketing_dynamic_part_n2@ds=2008-04-08/hr=b1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from list_bucketing_dynamic_part_n2 where key = '484' and value = 
'val_484'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n2
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n2@ds=2008-04-08/hr=a1
+POSTHOOK: Input: default@list_bucketing_dynamic_part_n2@ds=2008-04-08/hr=b1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `key`, CAST('val_484' AS 
STRING) AS `value`, `ds`, `hr`
 FROM `default`.`list_bucketing_dynamic_part_n2`
 WHERE `key` = '484' AND `value` = 'val_484'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
index acebfe8..c8876b7 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
@@ -18,10 +18,18 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n0 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_static_part_n0@ds=2008-04-08/hr=11
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n0 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@list_bucketing_static_part_n0@ds=2008-04-08/hr=11
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -341,10 +349,18 @@ PREHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n0 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: default@list_bucketing_static_part_n0@ds=2008-04-08/hr=11
 POSTHOOK: query: explain extended
 insert overwrite table list_bucketing_static_part_n0 partition (ds = 
'2008-04-08',  hr = '11')
 select key, value from srcpart where ds = '2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@list_bucketing_static_part_n0@ds=2008-04-08/hr=11
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`srcpart`
 WHERE `ds` = '2008-04-08'
@@ -801,9 +817,15 @@ POSTHOOK: Input: default@list_bucketing_static_part_n0
 PREHOOK: query: explain extended
 select * from list_bucketing_static_part_n0 where ds = '2008-04-08' and  hr = 
'11' and key = '484' and value = 'val_484'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@list_bucketing_static_part_n0
+PREHOOK: Input: default@list_bucketing_static_part_n0@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from list_bucketing_static_part_n0 where ds = '2008-04-08' and  hr = 
'11' and key = '484' and value = 'val_484'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@list_bucketing_static_part_n0
+POSTHOOK: Input: default@list_bucketing_static_part_n0@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`, CAST('val_484' AS 
STRING) AS `$f1`, CAST('2008-04-08' AS STRING) AS `$f2`, CAST('11' AS STRING) 
AS `$f3`
 FROM `default`.`list_bucketing_static_part_n0`
 WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484' AND `value` = 
'val_484'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out 
b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
index e8cc54c..901b286 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
@@ -78,8 +78,14 @@ POSTHOOK: Input: default@fact_daily
 500
 PREHOOK: query: explain extended SELECT key FROM fact_daily WHERE ( ds='1' and 
hr='4') and (key='484' and value= 'val_484')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily
+PREHOOK: Input: default@fact_daily@ds=1/hr=4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT key FROM fact_daily WHERE ( ds='1' 
and hr='4') and (key='484' and value= 'val_484')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily
+POSTHOOK: Input: default@fact_daily@ds=1/hr=4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`
 FROM `default`.`fact_daily`
 WHERE `ds` = '1' AND `hr` = '4' AND `key` = '484' AND `value` = 'val_484'
@@ -201,8 +207,14 @@ POSTHOOK: Input: default@fact_daily@ds=1/hr=4
 484
 PREHOOK: query: explain extended SELECT key,value FROM fact_daily WHERE ( 
ds='1' and hr='4') and (key='238' and value= 'val_238')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily
+PREHOOK: Input: default@fact_daily@ds=1/hr=4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT key,value FROM fact_daily WHERE ( 
ds='1' and hr='4') and (key='238' and value= 'val_238')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily
+POSTHOOK: Input: default@fact_daily@ds=1/hr=4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('238' AS STRING) AS `$f0`, CAST('val_238' AS 
STRING) AS `$f1`
 FROM `default`.`fact_daily`
 WHERE `ds` = '1' AND `hr` = '4' AND `key` = '238' AND `value` = 'val_238'
@@ -325,8 +337,14 @@ POSTHOOK: Input: default@fact_daily@ds=1/hr=4
 238    val_238
 PREHOOK: query: explain extended SELECT key FROM fact_daily WHERE ( ds='1' and 
hr='4') and (value = "3")
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily
+PREHOOK: Input: default@fact_daily@ds=1/hr=4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT key FROM fact_daily WHERE ( ds='1' 
and hr='4') and (value = "3")
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily
+POSTHOOK: Input: default@fact_daily@ds=1/hr=4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`
 FROM `default`.`fact_daily`
 WHERE `ds` = '1' AND `hr` = '4' AND `value` = '3'
@@ -447,8 +465,14 @@ POSTHOOK: Input: default@fact_daily@ds=1/hr=4
 #### A masked pattern was here ####
 PREHOOK: query: explain extended SELECT key,value FROM fact_daily WHERE ( 
ds='1' and hr='4') and key = '495'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily
+PREHOOK: Input: default@fact_daily@ds=1/hr=4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT key,value FROM fact_daily WHERE ( 
ds='1' and hr='4') and key = '495'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily
+POSTHOOK: Input: default@fact_daily@ds=1/hr=4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('495' AS STRING) AS `key`, `value`
 FROM `default`.`fact_daily`
 WHERE `ds` = '1' AND `hr` = '4' AND `key` = '495'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out 
b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
index 534c924..ba28d50 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
@@ -78,8 +78,14 @@ POSTHOOK: Input: default@fact_daily_n2
 500
 PREHOOK: query: explain extended SELECT key, value FROM fact_daily_n2 WHERE 
ds='1' and hr='4' and value= 'val_484'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n2
+PREHOOK: Input: default@fact_daily_n2@ds=1/hr=4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT key, value FROM fact_daily_n2 WHERE 
ds='1' and hr='4' and value= 'val_484'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n2
+POSTHOOK: Input: default@fact_daily_n2@ds=1/hr=4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, CAST('val_484' AS STRING) AS `value`
 FROM `default`.`fact_daily_n2`
 WHERE `ds` = '1' AND `hr` = '4' AND `value` = 'val_484'
@@ -251,8 +257,14 @@ POSTHOOK: Input: default@fact_daily_n2@ds=1/hr=4
 484    val_484
 PREHOOK: query: explain extended SELECT key FROM fact_daily_n2 WHERE ds='1' 
and hr='4' and key= '406'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n2
+PREHOOK: Input: default@fact_daily_n2@ds=1/hr=4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT key FROM fact_daily_n2 WHERE ds='1' 
and hr='4' and key= '406'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n2
+POSTHOOK: Input: default@fact_daily_n2@ds=1/hr=4
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('406' AS STRING) AS `$f0`
 FROM `default`.`fact_daily_n2`
 WHERE `ds` = '1' AND `hr` = '4' AND `key` = '406'
@@ -377,8 +389,14 @@ POSTHOOK: Input: default@fact_daily_n2@ds=1/hr=4
 406    val_406
 PREHOOK: query: explain extended SELECT key, value FROM fact_daily_n2 WHERE 
ds='1' and hr='4' and ( (key='484' and value ='val_484')  or (key='238' and 
value= 'val_238'))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n2
+PREHOOK: Input: default@fact_daily_n2@ds=1/hr=4
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT key, value FROM fact_daily_n2 WHERE 
ds='1' and hr='4' and ( (key='484' and value ='val_484')  or (key='238' and 
value= 'val_238'))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n2
+POSTHOOK: Input: default@fact_daily_n2@ds=1/hr=4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out 
b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
index 32ffe07..75c4aba 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
@@ -187,9 +187,15 @@ Storage Desc Params:
 PREHOOK: query: explain extended
 select * from fact_daily_n3 where ds = '1' and  hr='1' and key='145'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n3
+PREHOOK: Input: default@fact_daily_n3@ds=1/hr=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from fact_daily_n3 where ds = '1' and  hr='1' and key='145'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n3
+POSTHOOK: Input: default@fact_daily_n3@ds=1/hr=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('145' AS STRING) AS `key`, `value`, CAST('1' AS 
STRING) AS `ds`, CAST('1' AS STRING) AS `hr`
 FROM `default`.`fact_daily_n3`
 WHERE `ds` = '1' AND `hr` = '1' AND `key` = '145'
@@ -312,9 +318,13 @@ POSTHOOK: Input: default@fact_daily_n3@ds=1/hr=1
 PREHOOK: query: explain extended
 select count(*) from fact_daily_n3 where ds = '1' and  hr='1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select count(*) from fact_daily_n3 where ds = '1' and  hr='1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n3
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT COUNT(*) AS `$f0`
 FROM `default`.`fact_daily_n3`
 WHERE `ds` = '1' AND `hr` = '1'
@@ -340,9 +350,15 @@ POSTHOOK: Input: default@fact_daily_n3
 PREHOOK: query: explain extended
 SELECT * FROM fact_daily_n3 WHERE ds='1' and hr='2' and (key='484' and 
value='val_484')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n3
+PREHOOK: Input: default@fact_daily_n3@ds=1/hr=2
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 SELECT * FROM fact_daily_n3 WHERE ds='1' and hr='2' and (key='484' and 
value='val_484')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n3
+POSTHOOK: Input: default@fact_daily_n3@ds=1/hr=2
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`, CAST('val_484' AS 
STRING) AS `$f1`, CAST('1' AS STRING) AS `$f2`, CAST('2' AS STRING) AS `$f3`
 FROM `default`.`fact_daily_n3`
 WHERE `ds` = '1' AND `hr` = '2' AND `key` = '484' AND `value` = 'val_484'
@@ -465,9 +481,15 @@ POSTHOOK: Input: default@fact_daily_n3@ds=1/hr=2
 PREHOOK: query: explain extended
 SELECT * FROM fact_daily_n3 WHERE ds='1' and hr='3' and (key='327' and 
value='val_327')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n3
+PREHOOK: Input: default@fact_daily_n3@ds=1/hr=3
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 SELECT * FROM fact_daily_n3 WHERE ds='1' and hr='3' and (key='327' and 
value='val_327')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n3
+POSTHOOK: Input: default@fact_daily_n3@ds=1/hr=3
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('327' AS STRING) AS `$f0`, CAST('val_327' AS 
STRING) AS `$f1`, CAST('1' AS STRING) AS `$f2`, CAST('3' AS STRING) AS `$f3`
 FROM `default`.`fact_daily_n3`
 WHERE `ds` = '1' AND `hr` = '3' AND `key` = '327' AND `value` = 'val_327'

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out 
b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
index 77b56d3..992f27c 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
@@ -129,8 +129,14 @@ POSTHOOK: Input: default@fact_daily_n4@ds=1
 495    1
 PREHOOK: query: explain extended SELECT x FROM fact_daily_n4 WHERE ds='1' and 
x=484
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n4
+PREHOOK: Input: default@fact_daily_n4@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT x FROM fact_daily_n4 WHERE ds='1' and 
x=484
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n4
+POSTHOOK: Input: default@fact_daily_n4@ds=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(484 AS INTEGER) AS `$f0`
 FROM `default`.`fact_daily_n4`
 WHERE `ds` = '1' AND `x` = 484
@@ -249,8 +255,14 @@ POSTHOOK: Input: default@fact_daily_n4@ds=1
 484
 PREHOOK: query: explain extended SELECT x FROM fact_daily_n4 WHERE ds='1' and 
x=495
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n4
+PREHOOK: Input: default@fact_daily_n4@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT x FROM fact_daily_n4 WHERE ds='1' and 
x=495
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n4
+POSTHOOK: Input: default@fact_daily_n4@ds=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(495 AS INTEGER) AS `$f0`
 FROM `default`.`fact_daily_n4`
 WHERE `ds` = '1' AND `x` = 495
@@ -369,8 +381,14 @@ POSTHOOK: Input: default@fact_daily_n4@ds=1
 495
 PREHOOK: query: explain extended SELECT x FROM fact_daily_n4 WHERE ds='1' and 
x=1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n4
+PREHOOK: Input: default@fact_daily_n4@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT x FROM fact_daily_n4 WHERE ds='1' and 
x=1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n4
+POSTHOOK: Input: default@fact_daily_n4@ds=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(1 AS INTEGER) AS `$f0`
 FROM `default`.`fact_daily_n4`
 WHERE `ds` = '1' AND `x` = 1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out 
b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
index 022af85..cb241ba 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
@@ -132,8 +132,14 @@ POSTHOOK: Input: default@fact_daily_n5@ds=1
 495    val_484 1
 PREHOOK: query: explain extended select x from (select x from fact_daily_n5 
where ds = '1') subq where x = 484
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n5
+PREHOOK: Input: default@fact_daily_n5@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select x from (select x from fact_daily_n5 
where ds = '1') subq where x = 484
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n5
+POSTHOOK: Input: default@fact_daily_n5@ds=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(484 AS INTEGER) AS `$f0`
 FROM `default`.`fact_daily_n5`
 WHERE `ds` = '1' AND `x` = 484
@@ -252,8 +258,14 @@ POSTHOOK: Input: default@fact_daily_n5@ds=1
 484
 PREHOOK: query: explain extended select x1, y1 from(select x as x1, y as y1 
from fact_daily_n5 where ds ='1') subq where x1 = 484
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n5
+PREHOOK: Input: default@fact_daily_n5@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select x1, y1 from(select x as x1, y as y1 
from fact_daily_n5 where ds ='1') subq where x1 = 484
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n5
+POSTHOOK: Input: default@fact_daily_n5@ds=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(484 AS INTEGER) AS `x1`, `y` AS `y1`
 FROM `default`.`fact_daily_n5`
 WHERE `ds` = '1' AND `x` = 484
@@ -372,8 +384,14 @@ POSTHOOK: Input: default@fact_daily_n5@ds=1
 484    val_484
 PREHOOK: query: explain extended  select y, count(1) from fact_daily_n5 where 
ds ='1' and x = 484 group by y
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n5
+PREHOOK: Input: default@fact_daily_n5@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended  select y, count(1) from fact_daily_n5 where 
ds ='1' and x = 484 group by y
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n5
+POSTHOOK: Input: default@fact_daily_n5@ds=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `y`, COUNT(*) AS `$f1`
 FROM `default`.`fact_daily_n5`
 WHERE `ds` = '1' AND `x` = 484
@@ -516,8 +534,14 @@ POSTHOOK: Input: default@fact_daily_n5@ds=1
 val_484        1
 PREHOOK: query: explain extended  select x, c from (select x, count(1) as c 
from fact_daily_n5 where ds = '1' group by x) subq where x = 484
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n5
+PREHOOK: Input: default@fact_daily_n5@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended  select x, c from (select x, count(1) as c 
from fact_daily_n5 where ds = '1' group by x) subq where x = 484
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n5
+POSTHOOK: Input: default@fact_daily_n5@ds=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(484 AS INTEGER) AS `x`, COUNT(*) AS `c`
 FROM `default`.`fact_daily_n5`
 WHERE `ds` = '1' AND `x` = 484

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out 
b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
index a61d9d8..c84c95f 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
@@ -152,8 +152,14 @@ POSTHOOK: Input: default@fact_daily_n0@ds=1
 86     val_86  val_86  1
 PREHOOK: query: explain extended SELECT x FROM fact_daily_n0 WHERE ds='1' and 
not (x = 86)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@fact_daily_n0
+PREHOOK: Input: default@fact_daily_n0@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended SELECT x FROM fact_daily_n0 WHERE ds='1' and 
not (x = 86)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@fact_daily_n0
+POSTHOOK: Input: default@fact_daily_n0@ds=1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `x`
 FROM `default`.`fact_daily_n0`
 WHERE `ds` = '1' AND `x` <> 86

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/literal_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/literal_decimal.q.out 
b/ql/src/test/results/clientpositive/literal_decimal.q.out
index 6012933..61f9f7f 100644
--- a/ql/src/test/results/clientpositive/literal_decimal.q.out
+++ b/ql/src/test/results/clientpositive/literal_decimal.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: EXPLAIN SELECT -1BD, 0BD, 1BD, 3.14BD, -3.14BD, 
99999999999999999BD, 99999999999999999.9999999999999BD, 1E99BD FROM src LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT -1BD, 0BD, 1BD, 3.14BD, -3.14BD, 
99999999999999999BD, 99999999999999999.9999999999999BD, 1E99BD FROM src LIMIT 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/literal_double.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/literal_double.q.out 
b/ql/src/test/results/clientpositive/literal_double.q.out
index 76236ca..81459c9 100644
--- a/ql/src/test/results/clientpositive/literal_double.q.out
+++ b/ql/src/test/results/clientpositive/literal_double.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: EXPLAIN SELECT 3.14, -3.14, 3.14e8, 3.14e-8, -3.14e8, 
-3.14e-8, 3.14e+8, 3.14E8, 3.14E-8 FROM src LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT 3.14, -3.14, 3.14e8, 3.14e-8, -3.14e8, 
-3.14e-8, 3.14e+8, 3.14E8, 3.14E-8 FROM src LIMIT 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/literal_ints.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/literal_ints.q.out 
b/ql/src/test/results/clientpositive/literal_ints.q.out
index a3230b9..9867e09 100644
--- a/ql/src/test/results/clientpositive/literal_ints.q.out
+++ b/ql/src/test/results/clientpositive/literal_ints.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: EXPLAIN SELECT 100, 100Y, 100S, 100L FROM src LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT 100, 100Y, 100S, 100L FROM src LIMIT 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/literal_string.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/literal_string.q.out 
b/ql/src/test/results/clientpositive/literal_string.q.out
index b2f5e12..c5bfd75 100644
--- a/ql/src/test/results/clientpositive/literal_string.q.out
+++ b/ql/src/test/results/clientpositive/literal_string.q.out
@@ -5,6 +5,8 @@ PREHOOK: query: EXPLAIN SELECT 'face''book', 'face' 'book', 
'face'
                'face' 'bo' 'ok', 'face'"book",
                "face"'book', 'facebook' FROM src LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT 'face''book', 'face' 'book', 'face'
                                             'book',
                "face""book", "face" "book", "face"
@@ -12,6 +14,8 @@ POSTHOOK: query: EXPLAIN SELECT 'face''book', 'face' 'book', 
'face'
                'face' 'bo' 'ok', 'face'"book",
                "face"'book', 'facebook' FROM src LIMIT 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out 
b/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
index a12ac3a..74c75c8 100644
--- a/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
@@ -27,9 +27,13 @@ POSTHOOK: Lineage: acidtbldefault.a SCRIPT []
 PREHOOK: query: EXPLAIN EXTENDED
 SELECT * FROM acidTblDefault WHERE a = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@acidtbldefault
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT * FROM acidTblDefault WHERE a = 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acidtbldefault
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 OPTIMIZED SQL: SELECT CAST(1 AS INTEGER) AS `$f0`
 FROM `default`.`acidtbldefault`
 WHERE `a` = 1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out 
b/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
index 04518b3..5bd3d90 100644
--- a/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
@@ -107,8 +107,18 @@ POSTHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 PREHOOK: query: explain update srcpart_acid set value = concat(value, 
'updated') where cast(key as integer) in(413,43) and hr='11'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acid
+PREHOOK: Input: default@srcpart_acid@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acid@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=11
 POSTHOOK: query: explain update srcpart_acid set value = concat(value, 
'updated') where cast(key as integer) in(413,43) and hr='11'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acid
+POSTHOOK: Input: default@srcpart_acid@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acid@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=11
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -423,8 +433,26 @@ comment                    from deserializer
 COLUMN_STATS_ACCURATE  {}                                                      
                                         
 PREHOOK: query: explain delete from srcpart_acid where key in( '1001', '213', 
'43')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acid
+PREHOOK: Input: default@srcpart_acid@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acid@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart_acid@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart_acid@ds=2008-04-09/hr=12
+PREHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=12
+PREHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=12
 POSTHOOK: query: explain delete from srcpart_acid where key in( '1001', '213', 
'43')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acid
+POSTHOOK: Input: default@srcpart_acid@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acid@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart_acid@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart_acid@ds=2008-04-09/hr=12
+POSTHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=12
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -740,8 +768,18 @@ POSTHOOK: Output: default@srcpart_acidb@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 PREHOOK: query: explain update srcpart_acidb set value = concat(value, 
'updated') where cast(key as integer) in(413,43) and hr='11'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acidb
+PREHOOK: Input: default@srcpart_acidb@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acidb@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidb@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidb@ds=2008-04-09/hr=11
 POSTHOOK: query: explain update srcpart_acidb set value = concat(value, 
'updated') where cast(key as integer) in(413,43) and hr='11'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acidb
+POSTHOOK: Input: default@srcpart_acidb@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acidb@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidb@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidb@ds=2008-04-09/hr=11
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -932,8 +970,26 @@ POSTHOOK: Output: default@srcpart_acidb@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 PREHOOK: query: explain delete from srcpart_acidb where key in( '1001', '213', 
'43')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acidb
+PREHOOK: Input: default@srcpart_acidb@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acidb@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart_acidb@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart_acidb@ds=2008-04-09/hr=12
+PREHOOK: Output: default@srcpart_acidb@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidb@ds=2008-04-08/hr=12
+PREHOOK: Output: default@srcpart_acidb@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidb@ds=2008-04-09/hr=12
 POSTHOOK: query: explain delete from srcpart_acidb where key in( '1001', 
'213', '43')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acidb
+POSTHOOK: Input: default@srcpart_acidb@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acidb@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart_acidb@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart_acidb@ds=2008-04-09/hr=12
+POSTHOOK: Output: default@srcpart_acidb@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidb@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@srcpart_acidb@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidb@ds=2008-04-09/hr=12
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1250,9 +1306,19 @@ POSTHOOK: Output: 
default@srcpart_acidv@ds=2008-04-09/hr=12
 PREHOOK: query: explain vectorization only detail
 update srcpart_acidv set value = concat(value, 'updated') where cast(key as 
integer) in(413,43) and hr='11'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acidv
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=11
 POSTHOOK: query: explain vectorization only detail
 update srcpart_acidv set value = concat(value, 'updated') where cast(key as 
integer) in(413,43) and hr='11'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acidv
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=11
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -1458,9 +1524,27 @@ POSTHOOK: Output: 
default@srcpart_acidv@ds=2008-04-09/hr=12
 PREHOOK: query: explain vectorization only detail
 delete from srcpart_acidv where key in( '1001', '213', '43')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acidv
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=12
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=12
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=12
 POSTHOOK: query: explain vectorization only detail
 delete from srcpart_acidv where key in( '1001', '213', '43')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acidv
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=12
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=12
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -1601,6 +1685,21 @@ when matched and s.ds='2008-04-08' and s.hr=='11' and 
s.key='44' then update set
 when matched and s.ds='2008-04-08' and s.hr=='12' then delete
 when not matched then insert values('this','should','not','be there')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acidv
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=12
+PREHOOK: Output: default@merge_tmp_table
+PREHOOK: Output: default@srcpart_acidv
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=12
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=12
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=12
+PREHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=12
 POSTHOOK: query: explain vectorization only detail
 merge into srcpart_acidv t using (select distinct ds, hr, key, value from 
srcpart_acidv) s
 on s.ds=t.ds and s.hr=t.hr and s.key=t.key and s.value=t.value
@@ -1608,6 +1707,20 @@ when matched and s.ds='2008-04-08' and s.hr=='11' and 
s.key='44' then update set
 when matched and s.ds='2008-04-08' and s.hr=='12' then delete
 when not matched then insert values('this','should','not','be there')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acidv
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart_acidv@ds=2008-04-09/hr=12
+POSTHOOK: Output: default@merge_tmp_table
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=12
+POSTHOOK: Output: default@srcpart_acidv@ds=2008-04-09/hr=12
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -2043,9 +2156,19 @@ POSTHOOK: Output: 
default@srcpart_acidvb@ds=2008-04-09/hr=12
 PREHOOK: query: explain vectorization only detail
 update srcpart_acidvb set value = concat(value, 'updated') where cast(key as 
integer) in(413,43) and hr='11'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acidvb
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=11
 POSTHOOK: query: explain vectorization only detail
 update srcpart_acidvb set value = concat(value, 'updated') where cast(key as 
integer) in(413,43) and hr='11'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acidvb
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=11
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -2251,9 +2374,27 @@ POSTHOOK: Output: 
default@srcpart_acidvb@ds=2008-04-09/hr=12
 PREHOOK: query: explain vectorization only detail
 delete from srcpart_acidvb where key in( '1001', '213', '43')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acidvb
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=12
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=12
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=12
 POSTHOOK: query: explain vectorization only detail
 delete from srcpart_acidvb where key in( '1001', '213', '43')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acidvb
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=12
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=12
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -2394,6 +2535,21 @@ when matched and s.ds='2008-04-08' and s.hr=='11' and 
s.key='44' then update set
 when matched and s.ds='2008-04-08' and s.hr=='12' then delete
 when not matched then insert values('this','should','not','be there')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart_acidvb
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=12
+PREHOOK: Output: default@merge_tmp_table
+PREHOOK: Output: default@srcpart_acidvb
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=12
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=12
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=11
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=12
+PREHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=12
 POSTHOOK: query: explain vectorization only detail
 merge into srcpart_acidvb t using (select distinct ds, hr, key, value from 
srcpart_acidvb) s
 on s.ds=t.ds and s.hr=t.hr and s.key=t.key and s.value=t.value
@@ -2401,6 +2557,20 @@ when matched and s.ds='2008-04-08' and s.hr=='11' and 
s.key='44' then update set
 when matched and s.ds='2008-04-08' and s.hr=='12' then delete
 when not matched then insert values('this','should','not','be there')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart_acidvb
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart_acidvb@ds=2008-04-09/hr=12
+POSTHOOK: Output: default@merge_tmp_table
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=12
+POSTHOOK: Output: default@srcpart_acidvb@ds=2008-04-09/hr=12
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out 
b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
index 9178652..99c741c 100644
--- a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
@@ -410,8 +410,12 @@ POSTHOOK: Input: default@over10k_orc_bucketed
 POSTHOOK: Output: default@over10k_orc_bucketed
 PREHOOK: query: explain select t, si, i from over10k_orc_bucketed where b = 
4294967363 and t < 100 order by t, si, i
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_orc_bucketed
+#### A masked pattern was here ####
 POSTHOOK: query: explain select t, si, i from over10k_orc_bucketed where b = 
4294967363 and t < 100 order by t, si, i
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_orc_bucketed
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -480,8 +484,12 @@ POSTHOOK: Input: default@over10k_orc_bucketed
 35     463     65646
 PREHOOK: query: explain select ROW__ID, t, si, i from over10k_orc_bucketed 
where b = 4294967363 and t < 100 order by ROW__ID
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_orc_bucketed
+#### A masked pattern was here ####
 POSTHOOK: query: explain select ROW__ID, t, si, i from over10k_orc_bucketed 
where b = 4294967363 and t < 100 order by ROW__ID
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_orc_bucketed
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -551,8 +559,12 @@ POSTHOOK: Input: default@over10k_orc_bucketed
 {"writeid":0,"bucketid":537067520,"rowid":406} 35      463     65646
 PREHOOK: query: explain update over10k_orc_bucketed set i = 0 where b = 
4294967363 and t < 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_orc_bucketed
+PREHOOK: Output: default@over10k_orc_bucketed
 POSTHOOK: query: explain update over10k_orc_bucketed set i = 0 where b = 
4294967363 and t < 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_orc_bucketed
+POSTHOOK: Output: default@over10k_orc_bucketed
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -647,8 +659,12 @@ POSTHOOK: Input: default@over10k_orc_bucketed
 {"writeid":### Masked writeid ###,"bucketid":537067520,"rowid":1}      35      
463     0
 PREHOOK: query: explain select ROW__ID, count(*) from over10k_orc_bucketed 
group by ROW__ID having count(*) > 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@over10k_orc_bucketed
+#### A masked pattern was here ####
 POSTHOOK: query: explain select ROW__ID, count(*) from over10k_orc_bucketed 
group by ROW__ID having count(*) > 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@over10k_orc_bucketed
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out 
b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
index ac95558..7272a9c 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
@@ -22,8 +22,12 @@ POSTHOOK: Lineage: src_multi1_n1.key SIMPLE 
[(src)src.FieldSchema(name:key, type
 POSTHOOK: Lineage: src_multi1_n1.value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain extended select * from src_multi1_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_multi1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from src_multi1_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_multi1_n1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src_multi1_n1`
 STAGE DEPENDENCIES:
@@ -478,8 +482,16 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select key from nzhang_part14_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14_n1
+PREHOOK: Input: default@nzhang_part14_n1@value= 
+PREHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14_n1
+POSTHOOK: Input: default@nzhang_part14_n1@value= 
+POSTHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -532,8 +544,26 @@ POSTHOOK: Lineage: nzhang_part14_n1 
PARTITION(value=val_311).key SIMPLE [(src5_n
 POSTHOOK: Lineage: nzhang_part14_n1 PARTITION(value=val_86).key SIMPLE 
[(src5_n0)src5_n0.FieldSchema(name:key, type:string, comment:null), ]
 PREHOOK: query: explain select key from nzhang_part14_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14_n1
+PREHOOK: Input: default@nzhang_part14_n1@value= 
+PREHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+PREHOOK: Input: default@nzhang_part14_n1@value=val_165
+PREHOOK: Input: default@nzhang_part14_n1@value=val_238
+PREHOOK: Input: default@nzhang_part14_n1@value=val_27
+PREHOOK: Input: default@nzhang_part14_n1@value=val_311
+PREHOOK: Input: default@nzhang_part14_n1@value=val_86
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14_n1
+POSTHOOK: Input: default@nzhang_part14_n1@value= 
+POSTHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_165
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_238
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_27
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_311
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_86
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -644,8 +674,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select * from alter5_n0 where dt='a'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alter5_n0
+PREHOOK: Input: default@alter5_n0@dt=a
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alter5_n0 where dt='a'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alter5_n0
+POSTHOOK: Input: default@alter5_n0@dt=a
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1325,8 +1361,16 @@ POSTHOOK: Lineage: c_n2 
PARTITION(ds=2010-05-11,hr=12).key SIMPLE [(srcpart)srcp
 POSTHOOK: Lineage: c_n2 PARTITION(ds=2010-05-11,hr=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain select key from a_n12
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n12
+PREHOOK: Input: default@a_n12@ds=2010-03-11/hr=11
+PREHOOK: Input: default@a_n12@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from a_n12
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n12
+POSTHOOK: Input: default@a_n12@ds=2010-03-11/hr=11
+POSTHOOK: Input: default@a_n12@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1344,8 +1388,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from b_n9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n9
+PREHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from b_n9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n9
+POSTHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1363,8 +1413,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from b_n9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n9
+PREHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from b_n9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n9
+POSTHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1382,8 +1438,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from c_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n2
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from c_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n2
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1401,8 +1465,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from c_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n2
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from c_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n2
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out 
b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
index 2d58ca0..1a4b164 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
@@ -22,8 +22,12 @@ POSTHOOK: Lineage: src_multi1.key SIMPLE 
[(src)src.FieldSchema(name:key, type:st
 POSTHOOK: Lineage: src_multi1.value SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
 PREHOOK: query: explain extended select * from src_multi1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_multi1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from src_multi1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_multi1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src_multi1`
 STAGE DEPENDENCIES:
@@ -475,8 +479,16 @@ POSTHOOK: Lineage: nzhang_part14 PARTITION(value= ).key 
EXPRESSION []
 POSTHOOK: Lineage: nzhang_part14 
PARTITION(value=__HIVE_DEFAULT_PARTITION__).key EXPRESSION []
 PREHOOK: query: explain select key from nzhang_part14
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14
+PREHOOK: Input: default@nzhang_part14@value= 
+PREHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14
+POSTHOOK: Input: default@nzhang_part14@value= 
+POSTHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -529,8 +541,26 @@ POSTHOOK: Lineage: nzhang_part14 
PARTITION(value=val_311).key SIMPLE [(src5)src5
 POSTHOOK: Lineage: nzhang_part14 PARTITION(value=val_86).key SIMPLE 
[(src5)src5.FieldSchema(name:key, type:string, comment:null), ]
 PREHOOK: query: explain select key from nzhang_part14
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14
+PREHOOK: Input: default@nzhang_part14@value= 
+PREHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
+PREHOOK: Input: default@nzhang_part14@value=val_165
+PREHOOK: Input: default@nzhang_part14@value=val_238
+PREHOOK: Input: default@nzhang_part14@value=val_27
+PREHOOK: Input: default@nzhang_part14@value=val_311
+PREHOOK: Input: default@nzhang_part14@value=val_86
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14
+POSTHOOK: Input: default@nzhang_part14@value= 
+POSTHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
+POSTHOOK: Input: default@nzhang_part14@value=val_165
+POSTHOOK: Input: default@nzhang_part14@value=val_238
+POSTHOOK: Input: default@nzhang_part14@value=val_27
+POSTHOOK: Input: default@nzhang_part14@value=val_311
+POSTHOOK: Input: default@nzhang_part14@value=val_86
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -648,8 +678,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select * from alter5 where dt='a'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alter5
+PREHOOK: Input: default@alter5@dt=a
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alter5 where dt='a'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alter5
+POSTHOOK: Input: default@alter5@dt=a
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -766,8 +802,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select * from alter5 where dt='a'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alter5
+PREHOOK: Input: default@alter5@dt=a
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alter5 where dt='a'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alter5
+POSTHOOK: Input: default@alter5@dt=a
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1447,8 +1489,16 @@ POSTHOOK: Lineage: c_n1 
PARTITION(ds=2010-05-11,hr=12).key SIMPLE [(srcpart)srcp
 POSTHOOK: Lineage: c_n1 PARTITION(ds=2010-05-11,hr=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain select key from a_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n3
+PREHOOK: Input: default@a_n3@ds=2010-03-11/hr=11
+PREHOOK: Input: default@a_n3@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from a_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n3
+POSTHOOK: Input: default@a_n3@ds=2010-03-11/hr=11
+POSTHOOK: Input: default@a_n3@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1466,8 +1516,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from b_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n3
+PREHOOK: Input: default@b_n3@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from b_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n3
+POSTHOOK: Input: default@b_n3@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1485,8 +1541,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from b_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n3
+PREHOOK: Input: default@b_n3@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from b_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n3
+POSTHOOK: Input: default@b_n3@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1504,8 +1566,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from c_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n1
+PREHOOK: Input: default@c_n1@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n1@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from c_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n1
+POSTHOOK: Input: default@c_n1@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n1@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1523,8 +1593,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from c_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n1
+PREHOOK: Input: default@c_n1@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n1@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from c_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n1
+POSTHOOK: Input: default@c_n1@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n1@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/auto_join0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_join0.q.out 
b/ql/src/test/results/clientpositive/llap/auto_join0.q.out
index 10aafa5..11be122 100644
--- a/ql/src/test/results/clientpositive/llap/auto_join0.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_join0.q.out
@@ -10,6 +10,8 @@ SELECT src1.key as k1, src1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select sum(hash(a.k1,a.v1,a.k2, a.v2))
 from (
@@ -21,6 +23,8 @@ SELECT src1.key as k1, src1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/auto_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_join1.q.out 
b/ql/src/test/results/clientpositive/llap/auto_join1.q.out
index badc717..94bcddd 100644
--- a/ql/src/test/results/clientpositive/llap/auto_join1.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_join1.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1_n3 SELECT src1.key, src2.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_j1_n3
 POSTHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1_n3 SELECT src1.key, src2.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_j1_n3
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/auto_join21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_join21.q.out 
b/ql/src/test/results/clientpositive/llap/auto_join21.q.out
index c74fab7..f2af6d8 100644
--- a/ql/src/test/results/clientpositive/llap/auto_join21.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_join21.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = 
src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, 
src3.key, src3.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

Reply via email to