http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/cbo_rp_simple_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_simple_select.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_simple_select.q.out
index 43cb5ab..cb22b61 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_simple_select.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_simple_select.q.out
@@ -743,8 +743,14 @@ POSTHOOK: Input: default@cbo_t2@dt=2014
 400
 PREHOOK: query: EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN 
(cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN 
(cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -782,9 +788,15 @@ STAGE PLANS:
 PREHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (2*cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (2*cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -822,9 +834,15 @@ STAGE PLANS:
 PREHOOK: query: -- c_int is 0
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) = (cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- c_int is 0
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) = (cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -862,9 +880,15 @@ STAGE PLANS:
 PREHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (NULL)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (NULL)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -902,9 +926,15 @@ STAGE PLANS:
 PREHOOK: query: -- rewrite to NULL
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 
2*cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- rewrite to NULL
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 
2*cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -942,9 +972,15 @@ STAGE PLANS:
 PREHOOK: query: -- no rewrite
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 0)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- no rewrite
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 0)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### 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/cbo_rp_udaf_percentile_approx_23.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_udaf_percentile_approx_23.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_udaf_percentile_approx_23.q.out
index 69785e1..1a998f6 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_udaf_percentile_approx_23.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_udaf_percentile_approx_23.q.out
@@ -497,9 +497,13 @@ POSTHOOK: Input: default@t12_n1
 PREHOOK: query: explain
 select percentile_approx(case when key < 100 then cast('NaN' as double) else 
key end, 0.5) from bucket_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select percentile_approx(case when key < 100 then cast('NaN' as double) else 
key end, 0.5) from bucket_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -556,9 +560,13 @@ true
 PREHOOK: query: explain
 select percentile_approx(key, 0.5) from bucket_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select percentile_approx(key, 0.5) from bucket_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_n1
+#### 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/cbo_simple_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_simple_select.q.out 
b/ql/src/test/results/clientpositive/cbo_simple_select.q.out
index 2073c6b..32e6920 100644
--- a/ql/src/test/results/clientpositive/cbo_simple_select.q.out
+++ b/ql/src/test/results/clientpositive/cbo_simple_select.q.out
@@ -743,8 +743,14 @@ POSTHOOK: Input: default@cbo_t2@dt=2014
 400
 PREHOOK: query: EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN 
(cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN 
(cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -782,9 +788,15 @@ STAGE PLANS:
 PREHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (2*cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (2*cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -822,9 +834,15 @@ STAGE PLANS:
 PREHOOK: query: -- c_int is 0
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) = (cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- c_int is 0
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) = (cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -862,9 +880,15 @@ STAGE PLANS:
 PREHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (NULL)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (NULL)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -902,9 +926,15 @@ STAGE PLANS:
 PREHOOK: query: -- rewrite to NULL
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 
2*cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- rewrite to NULL
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 
2*cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -942,9 +972,15 @@ STAGE PLANS:
 PREHOOK: query: -- no rewrite
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 0)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- no rewrite
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 0)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### 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/cbo_union_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_union_view.q.out 
b/ql/src/test/results/clientpositive/cbo_union_view.q.out
index ecd4ec7..a1c582e 100644
--- a/ql/src/test/results/clientpositive/cbo_union_view.q.out
+++ b/ql/src/test/results/clientpositive/cbo_union_view.q.out
@@ -54,8 +54,18 @@ POSTHOOK: Lineage: src_union_view.key EXPRESSION 
[(src_union_1)src_union_1.Field
 POSTHOOK: Lineage: src_union_view.value EXPRESSION 
[(src_union_1)src_union_1.FieldSchema(name:value, type:string, comment:null), 
(src_union_2)src_union_2.FieldSchema(name:value, type:string, comment:null), 
(src_union_3)src_union_3.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: EXPLAIN SELECT key, value, ds FROM src_union_view WHERE key=86
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_union_1
+PREHOOK: Input: default@src_union_2
+PREHOOK: Input: default@src_union_3
+PREHOOK: Input: default@src_union_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key, value, ds FROM src_union_view WHERE key=86
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_union_1
+POSTHOOK: Input: default@src_union_2
+POSTHOOK: Input: default@src_union_3
+POSTHOOK: Input: default@src_union_view
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -151,8 +161,18 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT key, value, ds FROM src_union_view WHERE key=86 
AND ds ='1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_union_1
+PREHOOK: Input: default@src_union_2
+PREHOOK: Input: default@src_union_3
+PREHOOK: Input: default@src_union_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT key, value, ds FROM src_union_view WHERE 
key=86 AND ds ='1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_union_1
+POSTHOOK: Input: default@src_union_2
+POSTHOOK: Input: default@src_union_3
+POSTHOOK: Input: default@src_union_view
+#### 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/columnStatsUpdateForStatsOptimizer_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out 
b/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
index aafa386..bc07612 100644
--- 
a/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
+++ 
b/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
@@ -102,8 +102,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select max(year) from calendar
 PREHOOK: type: QUERY
+PREHOOK: Input: default@calendar
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(year) from calendar
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@calendar
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -125,8 +129,12 @@ POSTHOOK: Input: default@calendar
 2012
 PREHOOK: query: explain select count(1) from calendar
 PREHOOK: type: QUERY
+PREHOOK: Input: default@calendar
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from calendar
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@calendar
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -192,8 +200,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select max(month) from calendar
 PREHOOK: type: QUERY
+PREHOOK: Input: default@calendar
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(month) from calendar
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@calendar
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -250,8 +262,12 @@ POSTHOOK: Input: default@calendar
 12
 PREHOOK: query: explain select count(1) from calendar
 PREHOOK: type: QUERY
+PREHOOK: Input: default@calendar
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from calendar
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@calendar
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -315,8 +331,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select max(month) from calendar
 PREHOOK: type: QUERY
+PREHOOK: Input: default@calendar
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(month) from calendar
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@calendar
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -373,8 +393,12 @@ POSTHOOK: Input: default@calendar
 NULL
 PREHOOK: query: explain select count(1) from calendar
 PREHOOK: type: QUERY
+PREHOOK: Input: default@calendar
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from calendar
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@calendar
+#### 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/column_pruner_multiple_children.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out 
b/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
index cd0c969..77cf52c 100644
--- a/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
+++ b/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
@@ -21,9 +21,13 @@ POSTHOOK: Lineage: s_n129.value SIMPLE 
[(src)src.FieldSchema(name:value, type:st
 PREHOOK: query: explain FROM S_n129
 INSERT OVERWRITE TABLE DEST1_n52 SELECT key, sum(SUBSTR(value,5)) GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n129
+PREHOOK: Output: default@dest1_n52
 POSTHOOK: query: explain FROM S_n129
 INSERT OVERWRITE TABLE DEST1_n52 SELECT key, sum(SUBSTR(value,5)) GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n129
+POSTHOOK: Output: default@dest1_n52
 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/column_pruning_partitioned_view.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/column_pruning_partitioned_view.q.out 
b/ql/src/test/results/clientpositive/column_pruning_partitioned_view.q.out
index 3b9fe54..cfa9cdc 100644
--- a/ql/src/test/results/clientpositive/column_pruning_partitioned_view.q.out
+++ b/ql/src/test/results/clientpositive/column_pruning_partitioned_view.q.out
@@ -19,8 +19,14 @@ POSTHOOK: Output: default@lv_view
 POSTHOOK: Lineage: lv_view.c1 SIMPLE [(lv_table)lv_table.FieldSchema(name:c1, 
type:string, comment:null), ]
 PREHOOK: query: EXPLAIN SELECT * FROM lv_view
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lv_table
+PREHOOK: Input: default@lv_view
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM lv_view
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lv_table
+POSTHOOK: Input: default@lv_view
+#### 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/columnarserde_create_shortcut.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out 
b/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
index 6948810..96c9395 100644
--- a/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
+++ b/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src_thrift
 INSERT OVERWRITE TABLE columnarserde_create_shortcut SELECT src_thrift.lint, 
src_thrift.lstring, src_thrift.mstringstring, src_thrift.aint, 
src_thrift.astring DISTRIBUTE BY 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+PREHOOK: Output: default@columnarserde_create_shortcut
 POSTHOOK: query: EXPLAIN
 FROM src_thrift
 INSERT OVERWRITE TABLE columnarserde_create_shortcut SELECT src_thrift.lint, 
src_thrift.lstring, src_thrift.mstringstring, src_thrift.aint, 
src_thrift.astring DISTRIBUTE BY 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+POSTHOOK: Output: default@columnarserde_create_shortcut
 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/columnstats_partlvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out 
b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
index 9792ef1..18346e4 100644
--- a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
@@ -33,9 +33,19 @@ POSTHOOK: Output: default@employee_part@employeesalary=4000.0
 PREHOOK: query: explain 
 analyze table Employee_Part partition (employeeSalary=2000.0) compute 
statistics for columns employeeID
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part
+PREHOOK: Input: default@employee_part@employeesalary=2000.0
+PREHOOK: Output: default@employee_part
+PREHOOK: Output: default@employee_part@employeesalary=2000.0
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table Employee_Part partition (employeeSalary=2000.0) compute 
statistics for columns employeeID
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part
+POSTHOOK: Input: default@employee_part@employeesalary=2000.0
+POSTHOOK: Output: default@employee_part
+POSTHOOK: Output: default@employee_part@employeesalary=2000.0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -94,9 +104,19 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 analyze table Employee_Part partition (employeeSalary=2000.0) compute 
statistics for columns employeeID
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part
+PREHOOK: Input: default@employee_part@employeesalary=2000.0
+PREHOOK: Output: default@employee_part
+PREHOOK: Output: default@employee_part@employeesalary=2000.0
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 analyze table Employee_Part partition (employeeSalary=2000.0) compute 
statistics for columns employeeID
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part
+POSTHOOK: Input: default@employee_part@employeesalary=2000.0
+POSTHOOK: Output: default@employee_part
+POSTHOOK: Output: default@employee_part@employeesalary=2000.0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -284,9 +304,19 @@ Storage Desc Params:
 PREHOOK: query: explain 
 analyze table Employee_Part partition (employeeSalary=4000.0) compute 
statistics for columns employeeID
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part
+PREHOOK: Input: default@employee_part@employeesalary=4000.0
+PREHOOK: Output: default@employee_part
+PREHOOK: Output: default@employee_part@employeesalary=4000.0
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table Employee_Part partition (employeeSalary=4000.0) compute 
statistics for columns employeeID
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part
+POSTHOOK: Input: default@employee_part@employeesalary=4000.0
+POSTHOOK: Output: default@employee_part
+POSTHOOK: Output: default@employee_part@employeesalary=4000.0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -345,9 +375,19 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 analyze table Employee_Part partition (employeeSalary=4000.0) compute 
statistics for columns employeeID
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part
+PREHOOK: Input: default@employee_part@employeesalary=4000.0
+PREHOOK: Output: default@employee_part
+PREHOOK: Output: default@employee_part@employeesalary=4000.0
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 analyze table Employee_Part partition (employeeSalary=4000.0) compute 
statistics for columns employeeID
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part
+POSTHOOK: Input: default@employee_part@employeesalary=4000.0
+POSTHOOK: Output: default@employee_part
+POSTHOOK: Output: default@employee_part@employeesalary=4000.0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -497,9 +537,19 @@ POSTHOOK: Output: 
default@employee_part@employeesalary=4000.0
 PREHOOK: query: explain 
 analyze table Employee_Part partition (employeeSalary=2000.0) compute 
statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part
+PREHOOK: Input: default@employee_part@employeesalary=2000.0
+PREHOOK: Output: default@employee_part
+PREHOOK: Output: default@employee_part@employeesalary=2000.0
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table Employee_Part partition (employeeSalary=2000.0) compute 
statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part
+POSTHOOK: Input: default@employee_part@employeesalary=2000.0
+POSTHOOK: Output: default@employee_part
+POSTHOOK: Output: default@employee_part@employeesalary=2000.0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -608,9 +658,23 @@ comment                    from deserializer
 PREHOOK: query: explain 
 analyze table Employee_Part  compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part
+PREHOOK: Input: default@employee_part@employeesalary=2000.0
+PREHOOK: Input: default@employee_part@employeesalary=4000.0
+PREHOOK: Output: default@employee_part
+PREHOOK: Output: default@employee_part@employeesalary=2000.0
+PREHOOK: Output: default@employee_part@employeesalary=4000.0
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table Employee_Part  compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part
+POSTHOOK: Input: default@employee_part@employeesalary=2000.0
+POSTHOOK: Input: default@employee_part@employeesalary=4000.0
+POSTHOOK: Output: default@employee_part
+POSTHOOK: Output: default@employee_part@employeesalary=2000.0
+POSTHOOK: Output: default@employee_part@employeesalary=4000.0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -722,9 +786,23 @@ comment                    from deserializer
 PREHOOK: query: explain 
 analyze table Employee_Part  compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part
+PREHOOK: Input: default@employee_part@employeesalary=2000.0
+PREHOOK: Input: default@employee_part@employeesalary=4000.0
+PREHOOK: Output: default@employee_part
+PREHOOK: Output: default@employee_part@employeesalary=2000.0
+PREHOOK: Output: default@employee_part@employeesalary=4000.0
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table Employee_Part  compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part
+POSTHOOK: Input: default@employee_part@employeesalary=2000.0
+POSTHOOK: Input: default@employee_part@employeesalary=4000.0
+POSTHOOK: Output: default@employee_part
+POSTHOOK: Output: default@employee_part@employeesalary=2000.0
+POSTHOOK: Output: default@employee_part@employeesalary=4000.0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out 
b/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
index 2fed6fd..3b04987 100644
--- a/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
@@ -69,9 +69,19 @@ POSTHOOK: Output: 
default@employee_part_n0@employeesalary=3000.0/country=UK
 PREHOOK: query: explain 
 analyze table Employee_Part_n0 partition (employeeSalary='4000.0', country) 
compute statistics for columns employeeName, employeeID
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part_n0
+PREHOOK: Input: default@employee_part_n0@employeesalary=4000.0/country=USA
+PREHOOK: Output: default@employee_part_n0
+PREHOOK: Output: default@employee_part_n0@employeesalary=4000.0/country=USA
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table Employee_Part_n0 partition (employeeSalary='4000.0', country) 
compute statistics for columns employeeName, employeeID
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part_n0
+POSTHOOK: Input: default@employee_part_n0@employeesalary=4000.0/country=USA
+POSTHOOK: Output: default@employee_part_n0
+POSTHOOK: Output: default@employee_part_n0@employeesalary=4000.0/country=USA
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -201,9 +211,23 @@ comment                    from deserializer
 PREHOOK: query: explain        
 analyze table Employee_Part_n0 partition (employeeSalary='2000.0') compute 
statistics for columns employeeID
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part_n0
+PREHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=UK
+PREHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=USA
+PREHOOK: Output: default@employee_part_n0
+PREHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=UK
+PREHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=USA
+#### A masked pattern was here ####
 POSTHOOK: query: explain       
 analyze table Employee_Part_n0 partition (employeeSalary='2000.0') compute 
statistics for columns employeeID
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part_n0
+POSTHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=UK
+POSTHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=USA
+POSTHOOK: Output: default@employee_part_n0
+POSTHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=UK
+POSTHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=USA
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -316,9 +340,39 @@ comment                    from deserializer
 PREHOOK: query: explain        
 analyze table Employee_Part_n0 partition (employeeSalary) compute statistics 
for columns employeeID
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part_n0
+PREHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=UK
+PREHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=USA
+PREHOOK: Input: default@employee_part_n0@employeesalary=3000.0/country=UK
+PREHOOK: Input: default@employee_part_n0@employeesalary=3000.0/country=USA
+PREHOOK: Input: default@employee_part_n0@employeesalary=3500.0/country=UK
+PREHOOK: Input: default@employee_part_n0@employeesalary=4000.0/country=USA
+PREHOOK: Output: default@employee_part_n0
+PREHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=UK
+PREHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=USA
+PREHOOK: Output: default@employee_part_n0@employeesalary=3000.0/country=UK
+PREHOOK: Output: default@employee_part_n0@employeesalary=3000.0/country=USA
+PREHOOK: Output: default@employee_part_n0@employeesalary=3500.0/country=UK
+PREHOOK: Output: default@employee_part_n0@employeesalary=4000.0/country=USA
+#### A masked pattern was here ####
 POSTHOOK: query: explain       
 analyze table Employee_Part_n0 partition (employeeSalary) compute statistics 
for columns employeeID
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part_n0
+POSTHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=UK
+POSTHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=USA
+POSTHOOK: Input: default@employee_part_n0@employeesalary=3000.0/country=UK
+POSTHOOK: Input: default@employee_part_n0@employeesalary=3000.0/country=USA
+POSTHOOK: Input: default@employee_part_n0@employeesalary=3500.0/country=UK
+POSTHOOK: Input: default@employee_part_n0@employeesalary=4000.0/country=USA
+POSTHOOK: Output: default@employee_part_n0
+POSTHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=UK
+POSTHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=USA
+POSTHOOK: Output: default@employee_part_n0@employeesalary=3000.0/country=UK
+POSTHOOK: Output: default@employee_part_n0@employeesalary=3000.0/country=USA
+POSTHOOK: Output: default@employee_part_n0@employeesalary=3500.0/country=UK
+POSTHOOK: Output: default@employee_part_n0@employeesalary=4000.0/country=USA
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -428,9 +482,39 @@ comment                    from deserializer
 PREHOOK: query: explain        
 analyze table Employee_Part_n0 partition (employeeSalary,country) compute 
statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@employee_part_n0
+PREHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=UK
+PREHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=USA
+PREHOOK: Input: default@employee_part_n0@employeesalary=3000.0/country=UK
+PREHOOK: Input: default@employee_part_n0@employeesalary=3000.0/country=USA
+PREHOOK: Input: default@employee_part_n0@employeesalary=3500.0/country=UK
+PREHOOK: Input: default@employee_part_n0@employeesalary=4000.0/country=USA
+PREHOOK: Output: default@employee_part_n0
+PREHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=UK
+PREHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=USA
+PREHOOK: Output: default@employee_part_n0@employeesalary=3000.0/country=UK
+PREHOOK: Output: default@employee_part_n0@employeesalary=3000.0/country=USA
+PREHOOK: Output: default@employee_part_n0@employeesalary=3500.0/country=UK
+PREHOOK: Output: default@employee_part_n0@employeesalary=4000.0/country=USA
+#### A masked pattern was here ####
 POSTHOOK: query: explain       
 analyze table Employee_Part_n0 partition (employeeSalary,country) compute 
statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@employee_part_n0
+POSTHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=UK
+POSTHOOK: Input: default@employee_part_n0@employeesalary=2000.0/country=USA
+POSTHOOK: Input: default@employee_part_n0@employeesalary=3000.0/country=UK
+POSTHOOK: Input: default@employee_part_n0@employeesalary=3000.0/country=USA
+POSTHOOK: Input: default@employee_part_n0@employeesalary=3500.0/country=UK
+POSTHOOK: Input: default@employee_part_n0@employeesalary=4000.0/country=USA
+POSTHOOK: Output: default@employee_part_n0
+POSTHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=UK
+POSTHOOK: Output: default@employee_part_n0@employeesalary=2000.0/country=USA
+POSTHOOK: Output: default@employee_part_n0@employeesalary=3000.0/country=UK
+POSTHOOK: Output: default@employee_part_n0@employeesalary=3000.0/country=USA
+POSTHOOK: Output: default@employee_part_n0@employeesalary=3500.0/country=UK
+POSTHOOK: Output: default@employee_part_n0@employeesalary=4000.0/country=USA
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/columnstats_quoting.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_quoting.q.out 
b/ql/src/test/results/clientpositive/columnstats_quoting.q.out
index 8ed8239..9bf560b 100644
--- a/ql/src/test/results/clientpositive/columnstats_quoting.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_quoting.q.out
@@ -12,8 +12,14 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@user_web_events
 PREHOOK: query: explain analyze table user_web_events compute statistics for 
columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@user_web_events
+PREHOOK: Output: default@user_web_events
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze table user_web_events compute statistics for 
columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@user_web_events
+POSTHOOK: Output: default@user_web_events
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -72,8 +78,14 @@ POSTHOOK: Output: default@user_web_events
 #### A masked pattern was here ####
 PREHOOK: query: explain analyze table user_web_events compute statistics for 
columns `user id`
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@user_web_events
+PREHOOK: Output: default@user_web_events
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze table user_web_events compute statistics for 
columns `user id`
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@user_web_events
+POSTHOOK: Output: default@user_web_events
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out 
b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
index 0b4bb47..d21d209 100644
--- a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
@@ -41,9 +41,15 @@ POSTHOOK: Output: default@uservisits_web_text_none
 PREHOOK: query: explain 
 analyze table UserVisits_web_text_none compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@uservisits_web_text_none
+PREHOOK: Output: default@uservisits_web_text_none
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table UserVisits_web_text_none compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@uservisits_web_text_none
+POSTHOOK: Output: default@uservisits_web_text_none
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -93,9 +99,15 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 analyze table UserVisits_web_text_none compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@uservisits_web_text_none
+PREHOOK: Output: default@uservisits_web_text_none
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 analyze table UserVisits_web_text_none compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@uservisits_web_text_none
+POSTHOOK: Output: default@uservisits_web_text_none
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -231,9 +243,15 @@ POSTHOOK: Output: default@uservisits_web_text_none
 PREHOOK: query: explain 
 analyze table default.UserVisits_web_text_none compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@uservisits_web_text_none
+PREHOOK: Output: default@uservisits_web_text_none
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table default.UserVisits_web_text_none compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@uservisits_web_text_none
+POSTHOOK: Output: default@uservisits_web_text_none
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -370,9 +388,15 @@ POSTHOOK: Output: default@empty_tab
 PREHOOK: query: explain 
 analyze table empty_tab compute statistics for columns a,b,c,d,e
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@empty_tab
+PREHOOK: Output: default@empty_tab
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table empty_tab compute statistics for columns a,b,c,d,e
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@empty_tab
+POSTHOOK: Output: default@empty_tab
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -515,9 +539,15 @@ POSTHOOK: Input: database:default
 PREHOOK: query: explain 
 analyze table dummydb.UserVisits_in_dummy_db compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: dummydb@uservisits_in_dummy_db
+PREHOOK: Output: dummydb@uservisits_in_dummy_db
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table dummydb.UserVisits_in_dummy_db compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: dummydb@uservisits_in_dummy_db
+POSTHOOK: Output: dummydb@uservisits_in_dummy_db
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -567,9 +597,15 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 analyze table dummydb.UserVisits_in_dummy_db compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: dummydb@uservisits_in_dummy_db
+PREHOOK: Output: dummydb@uservisits_in_dummy_db
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 analyze table dummydb.UserVisits_in_dummy_db compute statistics for columns 
sourceIP, avgTimeOnSite, adRevenue
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: dummydb@uservisits_in_dummy_db
+POSTHOOK: Output: dummydb@uservisits_in_dummy_db
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -705,9 +741,15 @@ POSTHOOK: Output: dummydb@uservisits_in_dummy_db
 PREHOOK: query: explain 
 analyze table dummydb.UserVisits_in_dummy_db compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: dummydb@uservisits_in_dummy_db
+PREHOOK: Output: dummydb@uservisits_in_dummy_db
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table dummydb.UserVisits_in_dummy_db compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: dummydb@uservisits_in_dummy_db
+POSTHOOK: Output: dummydb@uservisits_in_dummy_db
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/combine2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/combine2.q.out 
b/ql/src/test/results/clientpositive/combine2.q.out
index 7c39a68..58682d1 100644
--- a/ql/src/test/results/clientpositive/combine2.q.out
+++ b/ql/src/test/results/clientpositive/combine2.q.out
@@ -64,9 +64,29 @@ value=|
 PREHOOK: query: explain
 select key, value from combine2_n0 where value is not null
 PREHOOK: type: QUERY
+PREHOOK: Input: default@combine2_n0
+PREHOOK: Input: default@combine2_n0@value=2010-04-21 09%3A45%3A00
+PREHOOK: Input: default@combine2_n0@value=val_0
+PREHOOK: Input: default@combine2_n0@value=val_2
+PREHOOK: Input: default@combine2_n0@value=val_4
+PREHOOK: Input: default@combine2_n0@value=val_5
+PREHOOK: Input: default@combine2_n0@value=val_8
+PREHOOK: Input: default@combine2_n0@value=val_9
+PREHOOK: Input: default@combine2_n0@value=|
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value from combine2_n0 where value is not null
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@combine2_n0
+POSTHOOK: Input: default@combine2_n0@value=2010-04-21 09%3A45%3A00
+POSTHOOK: Input: default@combine2_n0@value=val_0
+POSTHOOK: Input: default@combine2_n0@value=val_2
+POSTHOOK: Input: default@combine2_n0@value=val_4
+POSTHOOK: Input: default@combine2_n0@value=val_5
+POSTHOOK: Input: default@combine2_n0@value=val_8
+POSTHOOK: Input: default@combine2_n0@value=val_9
+POSTHOOK: Input: default@combine2_n0@value=|
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -124,9 +144,13 @@ POSTHOOK: Input: default@combine2_n0@value=|
 PREHOOK: query: explain extended
 select count(1) from combine2_n0 where value is not null
 PREHOOK: type: QUERY
+PREHOOK: Input: default@combine2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select count(1) from combine2_n0 where value is not null
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@combine2_n0
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT COUNT(*) AS `$f0`
 FROM `default`.`combine2_n0`
 WHERE `value` IS NOT NULL
@@ -152,9 +176,21 @@ POSTHOOK: Input: default@combine2_n0
 PREHOOK: query: explain
 select ds, count(1) from srcpart where ds is not null group by ds
 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: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select ds, count(1) from srcpart where ds is not null group by ds
 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: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### 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/comments.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/comments.q.out 
b/ql/src/test/results/clientpositive/comments.q.out
index 314707d..d2d671f 100644
--- a/ql/src/test/results/clientpositive/comments.q.out
+++ b/ql/src/test/results/clientpositive/comments.q.out
@@ -73,8 +73,12 @@ POSTHOOK: Input: default@src
 1019
 PREHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) from src a 
join src b on a.key = b.key where a.key > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select /*+ MAPJOIN(a) */ count(*) from src a 
join src b on a.key = b.key where a.key > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT COUNT(*) AS `$f0`
 FROM (SELECT `key`
 FROM `default`.`src`

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/complex_alias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/complex_alias.q.out 
b/ql/src/test/results/clientpositive/complex_alias.q.out
index e81b3b5..f9315f8 100644
--- a/ql/src/test/results/clientpositive/complex_alias.q.out
+++ b/ql/src/test/results/clientpositive/complex_alias.q.out
@@ -40,6 +40,8 @@ FROM   (SELECT Sum(agg1.col2) AS a1
                        alias.a1) single_use_subq11
          ON ( single_use_subq11.a0 = single_use_subq11.a0 )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@agg1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT single_use_subq11.a1 AS a1,
        single_use_subq11.a2 AS a2
@@ -62,6 +64,8 @@ FROM   (SELECT Sum(agg1.col2) AS a1
                        alias.a1) single_use_subq11
          ON ( single_use_subq11.a0 = single_use_subq11.a0 )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@agg1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/compute_stats_date.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/compute_stats_date.q.out 
b/ql/src/test/results/clientpositive/compute_stats_date.q.out
index 6715e05..3bd2eb8 100644
--- a/ql/src/test/results/clientpositive/compute_stats_date.q.out
+++ b/ql/src/test/results/clientpositive/compute_stats_date.q.out
@@ -47,9 +47,15 @@ POSTHOOK: Input: default@tab_date
 PREHOOK: query: explain
 analyze table tab_date compute statistics for columns fl_date
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@tab_date
+PREHOOK: Output: default@tab_date
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 analyze table tab_date compute statistics for columns fl_date
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@tab_date
+POSTHOOK: Output: default@tab_date
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/concat_op.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/concat_op.q.out 
b/ql/src/test/results/clientpositive/concat_op.q.out
index 0ad2d6f..b0f9b53 100644
--- a/ql/src/test/results/clientpositive/concat_op.q.out
+++ b/ql/src/test/results/clientpositive/concat_op.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select key || value from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key || value from src
 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
@@ -240,8 +244,12 @@ x2
 x3
 PREHOOK: query: explain select concat('a','b','c')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select concat('a','b','c')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -262,8 +270,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 'a' || 'b' || 'c'
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 'a' || 'b' || 'c'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### 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/constGby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constGby.q.out 
b/ql/src/test/results/clientpositive/constGby.q.out
index 32eae86..41af186 100644
--- a/ql/src/test/results/clientpositive/constGby.q.out
+++ b/ql/src/test/results/clientpositive/constGby.q.out
@@ -26,8 +26,12 @@ POSTHOOK: Output: default@t1_n36
 #### A masked pattern was here ####
 PREHOOK: query: explain select count(1) from t1_n36 group by 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n36
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from t1_n36 group by 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n36
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -98,8 +102,12 @@ POSTHOOK: Input: default@t1_n36
 0
 PREHOOK: query: explain select count(*) from t1_n36
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n36
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from t1_n36
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n36
+#### 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/constantPropWhen.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constantPropWhen.q.out 
b/ql/src/test/results/clientpositive/constantPropWhen.q.out
index 82fd74f..4e7af0c 100644
--- a/ql/src/test/results/clientpositive/constantPropWhen.q.out
+++ b/ql/src/test/results/clientpositive/constantPropWhen.q.out
@@ -22,8 +22,12 @@ POSTHOOK: Lineage: test_1_n4.id SCRIPT []
 POSTHOOK: Lineage: test_1_n4.id2 SCRIPT []
 PREHOOK: query: explain SELECT cast(CASE WHEN id = id2 THEN FALSE ELSE TRUE 
END AS BOOLEAN) AS b FROM test_1_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT cast(CASE WHEN id = id2 THEN FALSE ELSE TRUE 
END AS BOOLEAN) AS b FROM test_1_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -68,8 +72,12 @@ true
 false
 PREHOOK: query: explain SELECT cast(CASE id when id2 THEN FALSE ELSE TRUE END 
AS BOOLEAN) AS b FROM test_1_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT cast(CASE id when id2 THEN FALSE ELSE TRUE END 
AS BOOLEAN) AS b FROM test_1_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -114,8 +122,12 @@ true
 false
 PREHOOK: query: explain SELECT cast(CASE WHEN id = id2 THEN TRUE ELSE FALSE 
END AS BOOLEAN) AS b FROM test_1_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT cast(CASE WHEN id = id2 THEN TRUE ELSE FALSE 
END AS BOOLEAN) AS b FROM test_1_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -160,8 +172,12 @@ false
 true
 PREHOOK: query: explain SELECT cast(CASE id when id2 THEN TRUE ELSE FALSE END 
AS BOOLEAN) AS b FROM test_1_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT cast(CASE id when id2 THEN TRUE ELSE FALSE END 
AS BOOLEAN) AS b FROM test_1_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -206,8 +222,12 @@ false
 true
 PREHOOK: query: explain SELECT cast(CASE WHEN id = id2 THEN FALSE ELSE TRUE 
END AS BOOLEAN) AS b FROM test_1_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT cast(CASE WHEN id = id2 THEN FALSE ELSE TRUE 
END AS BOOLEAN) AS b FROM test_1_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -252,8 +272,12 @@ true
 false
 PREHOOK: query: explain SELECT cast(CASE id when id2 THEN FALSE ELSE TRUE END 
AS BOOLEAN) AS b FROM test_1_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT cast(CASE id when id2 THEN FALSE ELSE TRUE END 
AS BOOLEAN) AS b FROM test_1_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -298,8 +322,12 @@ true
 false
 PREHOOK: query: explain SELECT cast(CASE WHEN id = id2 THEN TRUE ELSE FALSE 
END AS BOOLEAN) AS b FROM test_1_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT cast(CASE WHEN id = id2 THEN TRUE ELSE FALSE 
END AS BOOLEAN) AS b FROM test_1_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -344,8 +372,12 @@ false
 true
 PREHOOK: query: explain SELECT cast(CASE id when id2 THEN TRUE ELSE FALSE END 
AS BOOLEAN) AS b FROM test_1_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_1_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT cast(CASE id when id2 THEN TRUE ELSE FALSE END 
AS BOOLEAN) AS b FROM test_1_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_1_n4
+#### 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/constantPropagateForSubQuery.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out 
b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
index 532e977..9905da0 100644
--- a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
+++ b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
@@ -2,9 +2,15 @@ Warning: Shuffle Join JOIN[7][tables = [$hdt$_0, $hdt$_1]] in 
Stage 'Stage-1:MAP
 PREHOOK: query: explain extended
  select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv 
from src a join src1 b where a.key = '429' ) c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
  select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv 
from src a join src1 b where a.key = '429' ) c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST('429' AS STRING) AS `ak`, `t0`.`value` AS `av`, 
`t1`.`key` AS `bk`, `t1`.`value` AS `bv`
 FROM (SELECT CAST('429' AS STRING) AS `key`, `value`
 FROM `default`.`src`

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/constant_prop.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constant_prop.q.out 
b/ql/src/test/results/clientpositive/constant_prop.q.out
index 001a3c8..43dfac8 100644
--- a/ql/src/test/results/clientpositive/constant_prop.q.out
+++ b/ql/src/test/results/clientpositive/constant_prop.q.out
@@ -9,6 +9,8 @@ SELECT NAMED_STRUCT(
        ).F2
        FROM src tablesample (1 rows)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT NAMED_STRUCT(
          IF(ARRAY_CONTAINS(ARRAY(1, 2), 3), "F1", "B1"), 1,
@@ -20,6 +22,8 @@ SELECT NAMED_STRUCT(
        ).F2
        FROM src tablesample (1 rows)
 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/constant_prop_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constant_prop_1.q.out 
b/ql/src/test/results/clientpositive/constant_prop_1.q.out
index e1e7cf5..de5b92e 100644
--- a/ql/src/test/results/clientpositive/constant_prop_1.q.out
+++ b/ql/src/test/results/clientpositive/constant_prop_1.q.out
@@ -3,11 +3,15 @@ select 1 as a from src
 union all
 select 1 as a from src limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 1 as a from src
 union all
 select 1 as a from src limit 1
 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
@@ -74,6 +78,8 @@ union all
 select 1 as a from src limit 1
 )sub join src b where value='12345'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a, key, value from
 (
@@ -82,6 +88,8 @@ union all
 select 1 as a from src limit 1
 )sub join src b where value='12345'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -184,11 +192,15 @@ select 1 as a from src
 union all
 select 2 as a from src limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select 1 as a from src
 union all
 select 2 as a from src limit 1
 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
@@ -251,6 +263,8 @@ union all
 select 2 as a from src limit 1
 )sub join src b where value='12345'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a, key, value from
 (
@@ -259,6 +273,8 @@ union all
 select 2 as a from src limit 1
 )sub join src b where value='12345'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -367,9 +383,13 @@ Warning: Shuffle Join JOIN[4][tables = [a, b]] in Stage 
'Stage-1:MAPRED' is a cr
 PREHOOK: query: explain
 select a.key, b.value from src a join src b where a.key = '238' and b.value = 
'234'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, b.value from src a join src b where a.key = '238' and b.value = 
'234'
 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
@@ -427,9 +447,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select a.key, b.value from src a join src b on a.key=b.key where b.value = 
'234'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, b.value from src a join src b on a.key=b.key where b.value = 
'234'
 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
@@ -514,11 +538,15 @@ select a2 as a3 from
 (select a1 as a2, c1 as c2 from
 (select a as a1, b as b1, c as c1 from t_n26 where a=1 and b=2 and 
c=3)sub1)sub2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n26
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select a2 as a3 from
 (select a1 as a2, c1 as c2 from
 (select a as a1, b as b1, c as c1 from t_n26 where a=1 and b=2 and 
c=3)sub1)sub2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n26
+#### 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/constant_prop_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constant_prop_2.q.out 
b/ql/src/test/results/clientpositive/constant_prop_2.q.out
index 6fef7f9..d81498b 100644
--- a/ql/src/test/results/clientpositive/constant_prop_2.q.out
+++ b/ql/src/test/results/clientpositive/constant_prop_2.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select count('1') from src group by '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count('1') from src group by '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -24,9 +28,19 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain 
 analyze table srcpart partition (ds='2008-04-08',hr=11) compute statistics for 
columns key, value
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: default@srcpart
+PREHOOK: Output: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 analyze table srcpart partition (ds='2008-04-08',hr=11) compute statistics for 
columns key, value
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@srcpart
+POSTHOOK: Output: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/constant_prop_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constant_prop_3.q.out 
b/ql/src/test/results/clientpositive/constant_prop_3.q.out
index 2fbd2d4..d106cd3 100644
--- a/ql/src/test/results/clientpositive/constant_prop_3.q.out
+++ b/ql/src/test/results/clientpositive/constant_prop_3.q.out
@@ -126,6 +126,10 @@ order by
        p_type,
        p_size
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part_hive
+PREHOOK: Input: default@partsupp_hive
+PREHOOK: Input: default@supplier_hive
+#### A masked pattern was here ####
 POSTHOOK: query: explain select
        p_brand,
        p_type,
@@ -157,6 +161,10 @@ order by
        p_type,
        p_size
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part_hive
+POSTHOOK: Input: default@partsupp_hive
+POSTHOOK: Input: default@supplier_hive
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-7

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/constantfolding.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constantfolding.q.out 
b/ql/src/test/results/clientpositive/constantfolding.q.out
index bc8f191..3a44344 100644
--- a/ql/src/test/results/clientpositive/constantfolding.q.out
+++ b/ql/src/test/results/clientpositive/constantfolding.q.out
@@ -178,8 +178,12 @@ POSTHOOK: Input: default@src
 NULL
 PREHOOK: query: explain select cast("1970-12-31 15:59:58.174" as TIMESTAMP) 
from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("1970-12-31 15:59:58.174" as TIMESTAMP) 
from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -199,8 +203,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("1970-12-31 15:59:58.174" as DATE) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("1970-12-31 15:59:58.174" as DATE) from 
src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -245,6 +253,8 @@ SELECT ROUND(LN(3.0),12), LN(0.0), LN(-1), 
ROUND(LOG(3.0),12), LOG(0.0),
        POWER(CAST (2 AS DECIMAL), CAST (3 AS INT)), 
        POW(CAST (2 AS DECIMAL), CAST(3 AS INT)) FROM dest1_n127
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dest1_n127
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT ROUND(LN(3.0),12), LN(0.0), LN(-1), ROUND(LOG(3.0),12), LOG(0.0),
        LOG(-1), ROUND(LOG2(3.0),12), LOG2(0.0), LOG2(-1),
@@ -255,6 +265,8 @@ SELECT ROUND(LN(3.0),12), LN(0.0), LN(-1), 
ROUND(LOG(3.0),12), LOG(0.0),
        POWER(CAST (2 AS DECIMAL), CAST (3 AS INT)), 
        POW(CAST (2 AS DECIMAL), CAST(3 AS INT)) FROM dest1_n127
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest1_n127
+#### 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/constprog1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog1.q.out 
b/ql/src/test/results/clientpositive/constprog1.q.out
index daca31b..937b9ec 100644
--- a/ql/src/test/results/clientpositive/constprog1.q.out
+++ b/ql/src/test/results/clientpositive/constprog1.q.out
@@ -2,10 +2,14 @@ PREHOOK: query: EXPLAIN
 SELECT IF(INSTR(CONCAT('foo', 'bar'), 'foob') > 0, "F1", "B1")
        FROM src tablesample (1 rows)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT IF(INSTR(CONCAT('foo', 'bar'), 'foob') > 0, "F1", "B1")
        FROM src tablesample (1 rows)
 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/constprog2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog2.q.out 
b/ql/src/test/results/clientpositive/constprog2.q.out
index d5615d6..6a7e7cc 100644
--- a/ql/src/test/results/clientpositive/constprog2.q.out
+++ b/ql/src/test/results/clientpositive/constprog2.q.out
@@ -3,10 +3,14 @@ PREHOOK: query: EXPLAIN
 SELECT src1.key, src1.key + 1, src2.value
        FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND 
src1.key = 86
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT src1.key, src1.key + 1, src2.value
        FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND 
src1.key = 86
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -74,10 +78,14 @@ PREHOOK: query: EXPLAIN
 SELECT src1.key, src1.key + 1, src2.value
        FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND 
cast(src1.key as double) = 86
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT src1.key, src1.key + 1, src2.value
        FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND 
cast(src1.key as double) = 86
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket
+#### 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/constprog3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog3.q.out 
b/ql/src/test/results/clientpositive/constprog3.q.out
index 9fc06d6..80f0e11 100644
--- a/ql/src/test/results/clientpositive/constprog3.q.out
+++ b/ql/src/test/results/clientpositive/constprog3.q.out
@@ -20,11 +20,17 @@ select table1.id, table1.val, table1.val1
 from table1 inner join table3
 on table1.dimid = table3.id and table3.id = 1 where table1.dimid <> 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table1
+PREHOOK: Input: default@table3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select table1.id, table1.val, table1.val1
 from table1 inner join table3
 on table1.dimid = table3.id and table3.id = 1 where table1.dimid <> 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table1
+POSTHOOK: Input: default@table3
+#### 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/constprog_dp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog_dp.q.out 
b/ql/src/test/results/clientpositive/constprog_dp.q.out
index 67a9206..b677e92 100644
--- a/ql/src/test/results/clientpositive/constprog_dp.q.out
+++ b/ql/src/test/results/clientpositive/constprog_dp.q.out
@@ -10,10 +10,17 @@ PREHOOK: query: EXPLAIN
 from srcpart
 insert overwrite table dest_n1 partition (ds) select key, value, ds 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@dest_n1
 POSTHOOK: query: EXPLAIN
 from srcpart
 insert overwrite table dest_n1 partition (ds) select key, value, ds 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
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/constprog_partitioner.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog_partitioner.q.out 
b/ql/src/test/results/clientpositive/constprog_partitioner.q.out
index 917382e..5467d2c 100644
--- a/ql/src/test/results/clientpositive/constprog_partitioner.q.out
+++ b/ql/src/test/results/clientpositive/constprog_partitioner.q.out
@@ -3,10 +3,14 @@ PREHOOK: query: EXPLAIN
 SELECT src1.key, src1.key + 1, src2.value
        FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND 
src1.key = 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT src1.key, src1.key + 1, src2.value
        FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND 
src1.key = 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -75,12 +79,16 @@ FROM lineitem li
 WHERE li.l_linenumber = 1 AND
  li.l_orderkey IN (SELECT l_orderkey FROM lineitem WHERE l_shipmode = 'AIR' 
AND l_linenumber = li.l_linenumber)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lineitem
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT l_partkey, l_suppkey
 FROM lineitem li
 WHERE li.l_linenumber = 1 AND
  li.l_orderkey IN (SELECT l_orderkey FROM lineitem WHERE l_shipmode = 'AIR' 
AND l_linenumber = li.l_linenumber)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lineitem
+#### 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/constprog_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog_type.q.out 
b/ql/src/test/results/clientpositive/constprog_type.q.out
index 9c7676a..04b52a6 100644
--- a/ql/src/test/results/clientpositive/constprog_type.q.out
+++ b/ql/src/test/results/clientpositive/constprog_type.q.out
@@ -11,11 +11,15 @@ INSERT OVERWRITE TABLE dest1_n26
 SELECT cast('2013-11-17' as date), cast(cast('1.3041352164485E9' as double) as 
timestamp)
        FROM src tablesample (1 rows)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n26
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE dest1_n26
 SELECT cast('2013-11-17' as date), cast(cast('1.3041352164485E9' as double) as 
timestamp)
        FROM src tablesample (1 rows)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n26
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/constprog_when_case.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog_when_case.q.out 
b/ql/src/test/results/clientpositive/constprog_when_case.q.out
index 4d2214a..d237f13 100644
--- a/ql/src/test/results/clientpositive/constprog_when_case.q.out
+++ b/ql/src/test/results/clientpositive/constprog_when_case.q.out
@@ -32,8 +32,12 @@ POSTHOOK: Lineage: src_orc.key1 SIMPLE 
[(src)src.FieldSchema(name:value, type:st
 POSTHOOK: Lineage: src_orc.key2 SIMPLE [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
 PREHOOK: query: explain SELECT IF ( ( (CASE WHEN bool0 THEN 1 WHEN NOT bool0 
THEN 0 END) = (CASE WHEN TRUE THEN 1 WHEN NOT TRUE THEN 0 END) ), key0, IF ( ( 
(CASE WHEN bool0 THEN 1 WHEN NOT bool0 THEN 0 END) = (CASE WHEN FALSE THEN 1 
WHEN NOT FALSE THEN 0 END) ), key1, key2 ) ) FROM src_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT IF ( ( (CASE WHEN bool0 THEN 1 WHEN NOT bool0 
THEN 0 END) = (CASE WHEN TRUE THEN 1 WHEN NOT TRUE THEN 0 END) ), key0, IF ( ( 
(CASE WHEN bool0 THEN 1 WHEN NOT bool0 THEN 0 END) = (CASE WHEN FALSE THEN 1 
WHEN NOT FALSE THEN 0 END) ), key1, key2 ) ) FROM src_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_orc
+#### 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/convert_decimal64_to_decimal.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/convert_decimal64_to_decimal.q.out 
b/ql/src/test/results/clientpositive/convert_decimal64_to_decimal.q.out
index 5189957..82f186f 100644
--- a/ql/src/test/results/clientpositive/convert_decimal64_to_decimal.q.out
+++ b/ql/src/test/results/clientpositive/convert_decimal64_to_decimal.q.out
@@ -131,8 +131,14 @@ POSTHOOK: Input: default@table_19
 POSTHOOK: Output: default@table_19
 PREHOOK: query: EXPLAIN VECTORIZATION DETAIL SELECT count(t2.smallint_col_15) 
FROM   table_19 t1  INNER JOIN table_8 t2 ON t2.decimal0402_col_20 = 
t1.decimal0801_col_4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table_19
+PREHOOK: Input: default@table_8
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN VECTORIZATION DETAIL SELECT count(t2.smallint_col_15) 
FROM   table_19 t1  INNER JOIN table_8 t2 ON t2.decimal0402_col_20 = 
t1.decimal0801_col_4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table_19
+POSTHOOK: Input: default@table_8
+#### A masked pattern was here ####
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -284,8 +290,14 @@ POSTHOOK: Input: default@table_8
 2
 PREHOOK: query: EXPLAIN VECTORIZATION DETAIL SELECT count(t2.smallint_col_15) 
FROM   table_19 t1  INNER JOIN table_8 t2 ON t2.decimal0402_col_20 = 
t1.decimal0801_col_4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table_19
+PREHOOK: Input: default@table_8
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN VECTORIZATION DETAIL SELECT count(t2.smallint_col_15) 
FROM   table_19 t1  INNER JOIN table_8 t2 ON t2.decimal0402_col_20 = 
t1.decimal0801_col_4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table_19
+POSTHOOK: Input: default@table_8
+#### A masked pattern was here ####
 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/correlated_join_keys.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlated_join_keys.q.out 
b/ql/src/test/results/clientpositive/correlated_join_keys.q.out
index c0a7709..6923533 100644
--- a/ql/src/test/results/clientpositive/correlated_join_keys.q.out
+++ b/ql/src/test/results/clientpositive/correlated_join_keys.q.out
@@ -70,8 +70,12 @@ POSTHOOK: Output: default@customer_address_n0
 #### A masked pattern was here ####
 PREHOOK: query: explain select count(*) from customer_address_n0 a join 
customer_address_n0 b on (a.ca_zip = b.ca_zip and a.ca_state = b.ca_state)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_address_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from customer_address_n0 a join 
customer_address_n0 b on (a.ca_zip = b.ca_zip and a.ca_state = b.ca_state)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_address_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -164,8 +168,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select count(*) from customer_address_n0 a join 
customer_address_n0 b on (a.ca_zip = b.ca_zip and a.ca_state = b.ca_state)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_address_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from customer_address_n0 a join 
customer_address_n0 b on (a.ca_zip = b.ca_zip and a.ca_state = b.ca_state)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_address_n0
+#### A masked pattern was here ####
 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/correlationoptimizer10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer10.q.out 
b/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
index 4401220..99cf953 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
@@ -5,6 +5,9 @@ FROM
 LEFT SEMI JOIN src yy
 ON xx.key=yy.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT xx.key, xx.cnt
 FROM
@@ -12,6 +15,9 @@ FROM
 LEFT SEMI JOIN src yy
 ON xx.key=yy.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -196,6 +202,9 @@ FROM
 LEFT SEMI JOIN src yy
 ON xx.key=yy.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT xx.key, xx.cnt
 FROM
@@ -203,6 +212,9 @@ FROM
 LEFT SEMI JOIN src yy
 ON xx.key=yy.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -369,6 +381,9 @@ LEFT SEMI JOIN
        y.key > 20) yy
 ON xx.key=yy.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT xx.key, xx.value
 FROM
@@ -380,6 +395,9 @@ LEFT SEMI JOIN
        y.key > 20) yy
 ON xx.key=yy.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-1 depends on stages: Stage-2
@@ -534,6 +552,9 @@ LEFT SEMI JOIN
        y.key > 20) yy
 ON xx.key=yy.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT xx.key, xx.value
 FROM
@@ -545,6 +566,9 @@ LEFT SEMI JOIN
        y.key > 20) yy
 ON xx.key=yy.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -696,6 +720,8 @@ LEFT SEMI JOIN
  WHERE x.key < 200 AND x.key > 180) yy
 ON xx.key=yy.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT xx.key, xx.value
 FROM
@@ -706,6 +732,8 @@ LEFT SEMI JOIN
  WHERE x.key < 200 AND x.key > 180) yy
 ON xx.key=yy.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-1 depends on stages: Stage-2
@@ -873,6 +901,8 @@ LEFT SEMI JOIN
  WHERE x.key < 200 AND x.key > 180) yy
 ON xx.key=yy.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT xx.key, xx.value
 FROM
@@ -883,6 +913,8 @@ LEFT SEMI JOIN
  WHERE x.key < 200 AND x.key > 180) yy
 ON xx.key=yy.key
 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/correlationoptimizer11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer11.q.out 
b/ql/src/test/results/clientpositive/correlationoptimizer11.q.out
index f0ce411..adabf01 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer11.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer11.q.out
@@ -37,6 +37,10 @@ WHERE x.partitionId = 1 AND
       y.partitionId = 2
 GROUP BY x.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part_table_n1
+PREHOOK: Input: default@part_table_n1@partitionid=1
+PREHOOK: Input: default@part_table_n1@partitionid=2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key AS key, count(1) AS cnt
 FROM part_table_n1 x JOIN part_table_n1 y ON (x.key = y.key)
@@ -44,6 +48,10 @@ WHERE x.partitionId = 1 AND
       y.partitionId = 2
 GROUP BY x.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part_table_n1
+POSTHOOK: Input: default@part_table_n1@partitionid=1
+POSTHOOK: Input: default@part_table_n1@partitionid=2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -169,6 +177,10 @@ WHERE x.partitionId = 1 AND
       y.partitionId = 2
 GROUP BY x.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part_table_n1
+PREHOOK: Input: default@part_table_n1@partitionid=1
+PREHOOK: Input: default@part_table_n1@partitionid=2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key AS key, count(1) AS cnt
 FROM part_table_n1 x JOIN part_table_n1 y ON (x.key = y.key)
@@ -176,6 +188,10 @@ WHERE x.partitionId = 1 AND
       y.partitionId = 2
 GROUP BY x.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part_table_n1
+POSTHOOK: Input: default@part_table_n1@partitionid=1
+POSTHOOK: Input: default@part_table_n1@partitionid=2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -279,6 +295,9 @@ WHERE x.partitionId = 2 AND
       y.partitionId = 2
 GROUP BY x.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part_table_n1
+PREHOOK: Input: default@part_table_n1@partitionid=2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key AS key, count(1) AS cnt
 FROM part_table_n1 x JOIN part_table_n1 y ON (x.key = y.key)
@@ -286,6 +305,9 @@ WHERE x.partitionId = 2 AND
       y.partitionId = 2
 GROUP BY x.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part_table_n1
+POSTHOOK: Input: default@part_table_n1@partitionid=2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -422,6 +444,9 @@ WHERE x.partitionId = 2 AND
       y.partitionId = 2
 GROUP BY x.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part_table_n1
+PREHOOK: Input: default@part_table_n1@partitionid=2
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key AS key, count(1) AS cnt
 FROM part_table_n1 x JOIN part_table_n1 y ON (x.key = y.key)
@@ -429,6 +454,9 @@ WHERE x.partitionId = 2 AND
       y.partitionId = 2
 GROUP BY x.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part_table_n1
+POSTHOOK: Input: default@part_table_n1@partitionid=2
+#### 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/correlationoptimizer12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer12.q.out 
b/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
index e63595d..08df6b0 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
@@ -5,6 +5,9 @@ JOIN
 (SELECT y.key as key, count(y.value) OVER (PARTITION BY y.key) AS cnt FROM 
src1 y) yy
 ON (xx.key=yy.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT xx.key, xx.cnt, yy.key, yy.cnt
 FROM
 (SELECT x.key as key, count(x.value) OVER (PARTITION BY x.key) AS cnt FROM src 
x) xx
@@ -12,6 +15,9 @@ JOIN
 (SELECT y.key as key, count(y.value) OVER (PARTITION BY y.key) AS cnt FROM 
src1 y) yy
 ON (xx.key=yy.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3

Reply via email to