http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/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 78f1d8e..ad7d714 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
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -337,10 +345,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
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -793,9 +809,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/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 40455b7..7d86457 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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -163,8 +169,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -249,8 +261,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -333,8 +351,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/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 a7cf4e9..979ff64 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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -163,8 +169,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -251,8 +263,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-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/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 273f2d0..2f77edd 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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -274,9 +280,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -299,9 +309,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -386,9 +402,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/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 e2db72b..4af2359 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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -211,8 +217,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -293,8 +305,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/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 2537d94..6dddc33 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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -214,8 +220,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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -296,8 +308,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 ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -435,8 +453,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 ####
 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/c39b5d1b/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 59aeda8..ba2d848 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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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/c39b5d1b/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 b856b99..d07b950 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 ###
 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/c39b5d1b/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 f9a17a5..1df96b0 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
@@ -99,8 +99,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
@@ -282,8 +292,26 @@ POSTHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 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
@@ -600,8 +628,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
@@ -783,8 +821,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
@@ -1102,9 +1158,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]
@@ -1302,9 +1368,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]
@@ -1453,6 +1537,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
@@ -1460,6 +1559,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]
@@ -1888,9 +2001,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]
@@ -2088,9 +2211,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]
@@ -2239,6 +2380,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
@@ -2246,6 +2402,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/c39b5d1b/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 028c3ca..53587b7 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/c39b5d1b/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 a55f5b2..4686229 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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -476,8 +480,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
 
@@ -530,8 +542,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
 
@@ -642,8 +672,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
 
@@ -1322,8 +1358,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
 
@@ -1341,8 +1385,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
 
@@ -1360,8 +1410,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
 
@@ -1379,8 +1435,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
 
@@ -1398,8 +1462,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/c39b5d1b/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 7f0867a..710bd17 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 ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -473,8 +477,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
 
@@ -527,8 +539,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
 
@@ -646,8 +676,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
 
@@ -763,8 +799,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
 
@@ -1443,8 +1485,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
 
@@ -1462,8 +1512,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
 
@@ -1481,8 +1537,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
 
@@ -1500,8 +1562,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
 
@@ -1519,8 +1589,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/c39b5d1b/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 a42001e..679ad24 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/c39b5d1b/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 17987a7..fada1a5 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/c39b5d1b/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 5889720..8022edd 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

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/auto_join29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_join29.q.out 
b/ql/src/test/results/clientpositive/llap/auto_join29.q.out
index 3891ea0..b8760c3 100644
--- a/ql/src/test/results/clientpositive/llap/auto_join29.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_join29.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
@@ -616,9 +620,13 @@ NULL       NULL    NULL    NULL    98      val_98
 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) LEFT 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) LEFT 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
@@ -1234,9 +1242,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT 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 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) LEFT 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
@@ -1864,9 +1876,13 @@ NULL     NULL    98      val_98  NULL    NULL
 PREHOOK: query: explain
 SELECT * FROM src src1 RIGHT 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 RIGHT 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
@@ -2491,9 +2507,13 @@ NULL     NULL    NULL    NULL    98      val_98
 PREHOOK: query: explain
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) LEFT 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 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) LEFT 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
@@ -2608,9 +2628,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 SELECT * FROM src src1 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 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
@@ -3226,9 +3250,13 @@ NULL     NULL    NULL    NULL    98      val_98
 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) 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) 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
@@ -3338,9 +3366,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) 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 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND 
src1.key < 10 AND src2.key > 10) 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
@@ -3475,9 +3507,13 @@ NULL     NULL    9       val_9   9       val_9
 PREHOOK: query: explain
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) 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 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 
AND src2.key > 10) 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

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/auto_join30.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_join30.q.out 
b/ql/src/test/results/clientpositive/llap/auto_join30.q.out
index 1f95237..4edc863 100644
--- a/ql/src/test/results/clientpositive/llap/auto_join30.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_join30.q.out
@@ -6,6 +6,8 @@ JOIN
 ON (x.key = Y.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM 
 (SELECT src.* FROM src sort by key) x
@@ -14,6 +16,8 @@ JOIN
 ON (x.key = Y.key)
 select sum(hash(Y.key,Y.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
@@ -128,6 +132,8 @@ LEFT OUTER JOIN
 ON (x.key = Y.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM 
 (SELECT src.* FROM src sort by key) x
@@ -136,6 +142,8 @@ LEFT OUTER JOIN
 ON (x.key = Y.key)
 select sum(hash(Y.key,Y.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
@@ -245,6 +253,8 @@ RIGHT OUTER JOIN
 ON (x.key = Y.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM 
 (SELECT src.* FROM src sort by key) x
@@ -253,6 +263,8 @@ RIGHT OUTER JOIN
 ON (x.key = Y.key)
 select sum(hash(Y.key,Y.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
@@ -364,6 +376,8 @@ JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM 
 (SELECT src.* FROM src sort by key) x
@@ -375,6 +389,8 @@ JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.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
@@ -520,6 +536,8 @@ LEFT OUTER JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM 
 (SELECT src.* FROM src sort by key) x
@@ -531,6 +549,8 @@ LEFT OUTER JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.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
@@ -673,6 +693,8 @@ LEFT OUTER JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM 
 (SELECT src.* FROM src sort by key) x
@@ -684,6 +706,8 @@ LEFT OUTER JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.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
@@ -826,6 +850,8 @@ RIGHT OUTER JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM 
 (SELECT src.* FROM src sort by key) x
@@ -837,6 +863,8 @@ RIGHT OUTER JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.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
@@ -979,6 +1007,8 @@ RIGHT OUTER JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM 
 (SELECT src.* FROM src sort by key) x
@@ -990,6 +1020,8 @@ RIGHT OUTER JOIN
 ON (x.key = Z.key)
 select sum(hash(Y.key,Y.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

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/auto_smb_mapjoin_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_smb_mapjoin_14.q.out 
b/ql/src/test/results/clientpositive/llap/auto_smb_mapjoin_14.q.out
index 5489137..1b61d55 100644
--- a/ql/src/test/results/clientpositive/llap/auto_smb_mapjoin_14.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_smb_mapjoin_14.q.out
@@ -43,11 +43,17 @@ select count(*) from (
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 
b on a.key = b.key
 ) subq1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from (
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 
b on a.key = b.key
 ) subq1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -147,6 +153,9 @@ select count(*) from
   group by key
 ) subq2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from
 (
@@ -157,6 +166,9 @@ select count(*) from
   group by key
 ) subq2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -295,6 +307,9 @@ join
 ) src2
 on src1.key = src2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -312,6 +327,9 @@ join
 ) src2
 on src1.key = src2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -524,6 +542,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
@@ -531,6 +552,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -636,6 +660,9 @@ select count(*) from
   join tbl2 b
   on subq2.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (
@@ -648,6 +675,9 @@ select count(*) from
   join tbl2 b
   on subq2.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -770,6 +800,8 @@ select count(*) from
   ) subq4
   on subq2.key = subq4.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (
@@ -789,6 +821,8 @@ select count(*) from
   ) subq4
   on subq2.key = subq4.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -911,6 +945,9 @@ select count(*) from
   (select a.key as key, concat(a.value, a.value) as value from tbl2 a where 
key < 8) subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, concat(a.value, a.value) as value from tbl1 a where 
key < 8) subq1 
@@ -918,6 +955,9 @@ select count(*) from
   (select a.key as key, concat(a.value, a.value) as value from tbl2 a where 
key < 8) subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1018,6 +1058,9 @@ select count(*) from
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl2 a) subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl1 a) 
subq1 
@@ -1025,6 +1068,9 @@ select count(*) from
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl2 a) subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1141,11 +1187,17 @@ select count(*) from
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
     join tbl2 a on subq1.key = a.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
     join tbl2 a on subq1.key = a.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1245,6 +1297,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq3
   on (subq1.key = subq3.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
@@ -1255,6 +1310,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq3
   on (subq1.key = subq3.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1380,6 +1438,9 @@ select count(*) from (
 join tbl2 b
 on subq2.key = b.key) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from (
   select subq2.key as key, subq2.value as value1, b.value as value2 from
@@ -1393,6 +1454,9 @@ select count(*) from (
 join tbl2 b
 on subq2.key = b.key) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1521,6 +1585,10 @@ from (
 insert overwrite table dest1_n2 select key, val1
 insert overwrite table dest2_n0 select key, val1, val2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+PREHOOK: Output: default@dest1_n2
+PREHOOK: Output: default@dest2_n0
 POSTHOOK: query: explain
 from (
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 
b on a.key = b.key
@@ -1528,6 +1596,10 @@ from (
 insert overwrite table dest1_n2 select key, val1
 insert overwrite table dest2_n0 select key, val1, val2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+POSTHOOK: Output: default@dest1_n2
+POSTHOOK: Output: default@dest2_n0
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -1805,6 +1877,10 @@ from (
 insert overwrite table dest1_n2 select key, val1
 insert overwrite table dest2_n0 select key, count(*) group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1
+PREHOOK: Input: default@tbl2
+PREHOOK: Output: default@dest1_n2
+PREHOOK: Output: default@dest2_n0
 POSTHOOK: query: explain
 from (
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 
b on a.key = b.key
@@ -1812,6 +1888,10 @@ from (
 insert overwrite table dest1_n2 select key, val1
 insert overwrite table dest2_n0 select key, count(*) group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1
+POSTHOOK: Input: default@tbl2
+POSTHOOK: Output: default@dest1_n2
+POSTHOOK: Output: default@dest2_n0
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
index fd6ae5f..a75a1a2 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
@@ -101,8 +101,20 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@bucket_big_n1@ds=2008-04-09
 PREHOOK: query: explain extended select count(*) FROM bucket_small_n1 a JOIN 
bucket_big_n1 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n1
+PREHOOK: Input: default@bucket_big_n1@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n1@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n1
+PREHOOK: Input: default@bucket_small_n1@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select count(*) FROM bucket_small_n1 a JOIN 
bucket_big_n1 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n1
+POSTHOOK: Input: default@bucket_big_n1@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n1@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n1
+POSTHOOK: Input: default@bucket_small_n1@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -378,8 +390,20 @@ POSTHOOK: Input: default@bucket_small_n1@ds=2008-04-08
 38
 PREHOOK: query: explain extended select count(*) FROM bucket_big_n1 a JOIN 
bucket_small_n1 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n1
+PREHOOK: Input: default@bucket_big_n1@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n1@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n1
+PREHOOK: Input: default@bucket_small_n1@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select count(*) FROM bucket_big_n1 a JOIN 
bucket_small_n1 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n1
+POSTHOOK: Input: default@bucket_big_n1@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n1@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n1
+POSTHOOK: Input: default@bucket_small_n1@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -655,8 +679,20 @@ POSTHOOK: Input: default@bucket_small_n1@ds=2008-04-08
 38
 PREHOOK: query: explain extended select count(*) FROM bucket_big_n1 a JOIN 
bucket_small_n1 b ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_big_n1
+PREHOOK: Input: default@bucket_big_n1@ds=2008-04-08
+PREHOOK: Input: default@bucket_big_n1@ds=2008-04-09
+PREHOOK: Input: default@bucket_small_n1
+PREHOOK: Input: default@bucket_small_n1@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select count(*) FROM bucket_big_n1 a JOIN 
bucket_small_n1 b ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_big_n1
+POSTHOOK: Input: default@bucket_big_n1@ds=2008-04-08
+POSTHOOK: Input: default@bucket_big_n1@ds=2008-04-09
+POSTHOOK: Input: default@bucket_small_n1
+POSTHOOK: Input: default@bucket_small_n1@ds=2008-04-08
+#### 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/c39b5d1b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_10.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_10.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_10.q.out
index c2a273b..fbb6362 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_10.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_10.q.out
@@ -50,6 +50,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n4 a where key < 6) subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n5
+PREHOOK: Input: default@tbl2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (
@@ -62,6 +65,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n4 a where key < 6) subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n5
+POSTHOOK: Input: default@tbl2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -213,6 +219,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n4 a where key < 6) subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n5
+PREHOOK: Input: default@tbl2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, count(*) as value from tbl1_n5 a where key < 6 group 
by a.key) subq1 
@@ -220,6 +229,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n4 a where key < 6) subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n5
+POSTHOOK: Input: default@tbl2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

Reply via email to