http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/explain_logical.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_logical.q.out 
b/ql/src/test/results/clientpositive/explain_logical.q.out
index 6b7e986..428fa58 100644
--- a/ql/src/test/results/clientpositive/explain_logical.q.out
+++ b/ql/src/test/results/clientpositive/explain_logical.q.out
@@ -69,9 +69,13 @@ POSTHOOK: Lineage: V4_n1.value2 SIMPLE 
[(src)src3.FieldSchema(name:value, type:s
 PREHOOK: query: EXPLAIN LOGICAL 
   SELECT key, count(1) FROM srcpart WHERE ds IS NOT NULL GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL 
   SELECT key, count(1) FROM srcpart WHERE ds IS NOT NULL GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 LOGICAL PLAN:
 srcpart 
   TableScan (TS_0)
@@ -110,9 +114,13 @@ srcpart
 PREHOOK: query: EXPLAIN LOGICAL 
   SELECT key, count(1) FROM (SELECT key, value FROM src) subq1 GROUP BY key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL 
   SELECT key, count(1) FROM (SELECT key, value FROM src) subq1 GROUP BY key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 LOGICAL PLAN:
 src 
   TableScan (TS_0)
@@ -153,11 +161,17 @@ PREHOOK: query: EXPLAIN LOGICAL
     SELECT key, value FROM src UNION ALL SELECT key, value FROM srcpart WHERE 
ds IS NOT NULL
   ) S1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL 
   SELECT * FROM (
     SELECT key, value FROM src UNION ALL SELECT key, value FROM srcpart WHERE 
ds IS NOT NULL
   ) S1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0-subquery1:src 
   TableScan (TS_0)
@@ -190,9 +204,15 @@ $hdt$_0-subquery2:srcpart
 PREHOOK: query: EXPLAIN LOGICAL 
   SELECT S1.key, S2.value FROM src S1 JOIN srcpart S2 ON S1.key = S2.key WHERE 
ds IS NOT NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL 
   SELECT S1.key, S2.value FROM src S1 JOIN srcpart S2 ON S1.key = S2.key WHERE 
ds IS NOT NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0:s1 
   TableScan (TS_0)
@@ -257,8 +277,14 @@ $hdt$_1:s2
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V1_n8
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@v1_n8
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V1_n8
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@v1_n8
+#### A masked pattern was here ####
 LOGICAL PLAN:
 src 
   TableScan (TS_0)
@@ -274,8 +300,22 @@ src
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V2_n3
 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
+PREHOOK: Input: default@v2_n3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V2_n3
 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
+POSTHOOK: Input: default@v2_n3
+#### A masked pattern was here ####
 LOGICAL PLAN:
 srcpart 
   TableScan (TS_0)
@@ -291,8 +331,18 @@ srcpart
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V3_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@v2_n3
+PREHOOK: Input: default@v3_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V3_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@v2_n3
+POSTHOOK: Input: default@v3_n1
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0:srcpart 
   TableScan (TS_0)
@@ -361,8 +411,20 @@ $hdt$_1:src2
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V4_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@v1_n8
+PREHOOK: Input: default@v2_n3
+PREHOOK: Input: default@v4_n1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V4_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@v1_n8
+POSTHOOK: Input: default@v2_n3
+POSTHOOK: Input: default@v4_n1
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0:srcpart 
   TableScan (TS_0)
@@ -478,8 +540,14 @@ POSTHOOK: Lineage: V5_n0.key SIMPLE 
[(srcpart)srcpart.FieldSchema(name:key, type
 POSTHOOK: Lineage: V5_n0.value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V5_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@v5_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT * FROM V5_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@v5_n0
+#### A masked pattern was here ####
 LOGICAL PLAN:
 srcpart 
   TableScan (TS_0)
@@ -498,8 +566,12 @@ srcpart
 
 PREHOOK: query: EXPLAIN LOGICAL SELECT s1.key, s1.cnt, s2.value FROM (SELECT 
key, count(value) as cnt FROM src GROUP BY key) s1 JOIN src s2 ON (s1.key = 
s2.key) ORDER BY s1.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN LOGICAL SELECT s1.key, s1.cnt, s2.value FROM (SELECT 
key, count(value) as cnt FROM src GROUP BY key) s1 JOIN src s2 ON (s1.key = 
s2.key) ORDER BY s1.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 LOGICAL PLAN:
 $hdt$_0:src 
   TableScan (TS_0)

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/explain_outputs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_outputs.q.out 
b/ql/src/test/results/clientpositive/explain_outputs.q.out
index 86ec9fa..9c600fe 100644
--- a/ql/src/test/results/clientpositive/explain_outputs.q.out
+++ b/ql/src/test/results/clientpositive/explain_outputs.q.out
@@ -35,9 +35,15 @@ POSTHOOK: Lineage: t2_n14.id SCRIPT []
 PREHOOK: query: explain
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n22
+PREHOOK: Input: default@t2_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n22
+POSTHOOK: Input: default@t2_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -140,9 +146,15 @@ POSTHOOK: Input: default@t2_n14
 PREHOOK: query: explain analyze
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n22
+PREHOOK: Input: default@t2_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n22
+POSTHOOK: Input: default@t2_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -247,9 +259,15 @@ POSTHOOK: Input: default@t2_n14
 PREHOOK: query: explain reoptimization
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n22
+PREHOOK: Input: default@t2_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain reoptimization
 select sum(t1_n22.id) from t1_n22 join t2_n14 on (t1_n22.id=t2_n14.id)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n22
+POSTHOOK: Input: default@t2_n14
+#### 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/b356aae0/ql/src/test/results/clientpositive/explain_rearrange.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_rearrange.q.out 
b/ql/src/test/results/clientpositive/explain_rearrange.q.out
index be1b8ed..e36248f 100644
--- a/ql/src/test/results/clientpositive/explain_rearrange.q.out
+++ b/ql/src/test/results/clientpositive/explain_rearrange.q.out
@@ -32,6 +32,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n9
+PREHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -50,6 +53,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n9
+POSTHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-9 depends on stages: Stage-1, Stage-5 , consists of Stage-10, 
Stage-11, Stage-2 [CONDITIONAL]
@@ -304,6 +310,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n9
+PREHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -322,6 +331,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n9
+POSTHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-2 depends on stages: Stage-1, Stage-9 , consists of Stage-3, Stage-6, 
Stage-8 [CONDITIONAL]
@@ -576,6 +588,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n9
+PREHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -594,6 +609,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n9
+POSTHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-2 is a root stage [MAPRED]
@@ -848,6 +866,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n9
+PREHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -866,6 +887,9 @@ join
 on src1.key = src2.key
 order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n9
+POSTHOOK: Input: default@tbl2_n8
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-2 is a root stage [MAPRED]

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/explaindenpendencydiffengs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/explaindenpendencydiffengs.q.out 
b/ql/src/test/results/clientpositive/explaindenpendencydiffengs.q.out
index 3a5d4e4..a31317b 100644
--- a/ql/src/test/results/clientpositive/explaindenpendencydiffengs.q.out
+++ b/ql/src/test/results/clientpositive/explaindenpendencydiffengs.q.out
@@ -33,8 +33,16 @@ POSTHOOK: Lineage: viewtest.a SIMPLE 
[(dependtest)dependtest.FieldSchema(name:a,
 POSTHOOK: Lineage: viewtest.b SIMPLE []
 PREHOOK: query: explain dependency select count(*) from viewtest
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dependtest
+PREHOOK: Input: default@dependtest@b=1
+PREHOOK: Input: default@viewtest
+#### A masked pattern was here ####
 POSTHOOK: query: explain dependency select count(*) from viewtest
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dependtest
+POSTHOOK: Input: default@dependtest@b=1
+POSTHOOK: Input: default@viewtest
+#### A masked pattern was here ####
 
{"input_tables":[{"tablename":"default@viewtest","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@dependtest","tabletype":"MANAGED_TABLE","tableParents":"[default@viewtest]"}],"input_partitions":[{"partitionName":"default@dependtest@b=1","partitionParents":"[default@viewtest]"}]}
 PREHOOK: query: drop view viewtest
 PREHOOK: type: DROPVIEW

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/extract.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/extract.q.out 
b/ql/src/test/results/clientpositive/extract.q.out
index 3386f66..8d736a2 100644
--- a/ql/src/test/results/clientpositive/extract.q.out
+++ b/ql/src/test/results/clientpositive/extract.q.out
@@ -27,10 +27,14 @@ PREHOOK: query: explain
 select day(t)
 from extract_udf
 PREHOOK: type: QUERY
+PREHOOK: Input: default@extract_udf
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select day(t)
 from extract_udf
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@extract_udf
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -76,10 +80,14 @@ PREHOOK: query: explain
 select extract(day from t)
 from extract_udf
 PREHOOK: type: QUERY
+PREHOOK: Input: default@extract_udf
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select extract(day from t)
 from extract_udf
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@extract_udf
+#### 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/b356aae0/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out 
b/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out
index be5eeb4..f5869b5 100644
--- a/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out
+++ b/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out
@@ -57,8 +57,14 @@ POSTHOOK: Output: default@date_dim_n1@d_date_sk=2416947
 #### A masked pattern was here ####
 PREHOOK: query: explain select count(*) from date_dim_n1 where d_date > date 
"1900-01-02" and d_date_sk= 2416945
 PREHOOK: type: QUERY
+PREHOOK: Input: default@date_dim_n1
+PREHOOK: Input: default@date_dim_n1@d_date_sk=2416945
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from date_dim_n1 where d_date > date 
"1900-01-02" and d_date_sk= 2416945
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@date_dim_n1
+POSTHOOK: Input: default@date_dim_n1@d_date_sk=2416945
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -116,8 +122,20 @@ POSTHOOK: Output: default@date_dim_n1@d_date_sk=2416948
 POSTHOOK: Lineage: date_dim_n1 PARTITION(d_date_sk=2416948).d_date SCRIPT []
 PREHOOK: query: explain extended select d_date from date_dim_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@date_dim_n1
+PREHOOK: Input: default@date_dim_n1@d_date_sk=2416945
+PREHOOK: Input: default@date_dim_n1@d_date_sk=2416946
+PREHOOK: Input: default@date_dim_n1@d_date_sk=2416947
+PREHOOK: Input: default@date_dim_n1@d_date_sk=2416948
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select d_date from date_dim_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@date_dim_n1
+POSTHOOK: Input: default@date_dim_n1@d_date_sk=2416945
+POSTHOOK: Input: default@date_dim_n1@d_date_sk=2416946
+POSTHOOK: Input: default@date_dim_n1@d_date_sk=2416947
+POSTHOOK: Input: default@date_dim_n1@d_date_sk=2416948
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `d_date`
 FROM `default`.`date_dim_n1`
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out 
b/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
index c4cd90c..111660a 100644
--- a/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
+++ b/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
@@ -103,8 +103,16 @@ bitVector                  HL
 comment                from deserializer                                       
                                         
 PREHOOK: query: explain extended select state from loc_orc_1d
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_1d
+PREHOOK: Input: default@loc_orc_1d@year=2000
+PREHOOK: Input: default@loc_orc_1d@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state from loc_orc_1d
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_1d
+POSTHOOK: Input: default@loc_orc_1d@year=2000
+POSTHOOK: Input: default@loc_orc_1d@year=2001
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`
 FROM `default`.`loc_orc_1d`
 STAGE DEPENDENCIES:
@@ -220,8 +228,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select state,locid from loc_orc_1d
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_1d
+PREHOOK: Input: default@loc_orc_1d@year=2000
+PREHOOK: Input: default@loc_orc_1d@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state,locid from loc_orc_1d
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_1d
+POSTHOOK: Input: default@loc_orc_1d@year=2000
+POSTHOOK: Input: default@loc_orc_1d@year=2001
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`, `locid`
 FROM `default`.`loc_orc_1d`
 STAGE DEPENDENCIES:
@@ -426,8 +442,20 @@ POSTHOOK: Output: default@loc_orc_2d@zip=94087/year=2001
 #### A masked pattern was here ####
 PREHOOK: query: explain extended select state from loc_orc_2d
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_2d
+PREHOOK: Input: default@loc_orc_2d@zip=94086/year=2000
+PREHOOK: Input: default@loc_orc_2d@zip=94086/year=2001
+PREHOOK: Input: default@loc_orc_2d@zip=94087/year=2000
+PREHOOK: Input: default@loc_orc_2d@zip=94087/year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state from loc_orc_2d
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_2d
+POSTHOOK: Input: default@loc_orc_2d@zip=94086/year=2000
+POSTHOOK: Input: default@loc_orc_2d@zip=94086/year=2001
+POSTHOOK: Input: default@loc_orc_2d@zip=94087/year=2000
+POSTHOOK: Input: default@loc_orc_2d@zip=94087/year=2001
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`
 FROM `default`.`loc_orc_2d`
 STAGE DEPENDENCIES:
@@ -639,8 +667,20 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select state,locid from loc_orc_2d
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_2d
+PREHOOK: Input: default@loc_orc_2d@zip=94086/year=2000
+PREHOOK: Input: default@loc_orc_2d@zip=94086/year=2001
+PREHOOK: Input: default@loc_orc_2d@zip=94087/year=2000
+PREHOOK: Input: default@loc_orc_2d@zip=94087/year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state,locid from loc_orc_2d
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_2d
+POSTHOOK: Input: default@loc_orc_2d@zip=94086/year=2000
+POSTHOOK: Input: default@loc_orc_2d@zip=94086/year=2001
+POSTHOOK: Input: default@loc_orc_2d@zip=94087/year=2000
+POSTHOOK: Input: default@loc_orc_2d@zip=94087/year=2001
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`, `locid`
 FROM `default`.`loc_orc_2d`
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out 
b/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
index 3e7d0f4..ad67fb8 100644
--- a/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
+++ b/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
@@ -129,8 +129,20 @@ bitVector                  HL
 comment                from deserializer                                       
                                         
 PREHOOK: query: explain extended select state from loc_orc_1d_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_1d_n1
+PREHOOK: Input: default@loc_orc_1d_n1@year=2000
+PREHOOK: Input: default@loc_orc_1d_n1@year=2001
+PREHOOK: Input: default@loc_orc_1d_n1@year=2002
+PREHOOK: Input: default@loc_orc_1d_n1@year=2003
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state from loc_orc_1d_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_1d_n1
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2000
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2001
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2002
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2003
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`
 FROM `default`.`loc_orc_1d_n1`
 STAGE DEPENDENCIES:
@@ -338,8 +350,20 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select state,locid from loc_orc_1d_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_1d_n1
+PREHOOK: Input: default@loc_orc_1d_n1@year=2000
+PREHOOK: Input: default@loc_orc_1d_n1@year=2001
+PREHOOK: Input: default@loc_orc_1d_n1@year=2002
+PREHOOK: Input: default@loc_orc_1d_n1@year=2003
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state,locid from loc_orc_1d_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_1d_n1
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2000
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2001
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2002
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2003
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`, `locid`
 FROM `default`.`loc_orc_1d_n1`
 STAGE DEPENDENCIES:
@@ -575,8 +599,20 @@ POSTHOOK: Output: default@loc_orc_1d_n1@year=2003
 #### A masked pattern was here ####
 PREHOOK: query: explain extended select state from loc_orc_1d_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_1d_n1
+PREHOOK: Input: default@loc_orc_1d_n1@year=2000
+PREHOOK: Input: default@loc_orc_1d_n1@year=2001
+PREHOOK: Input: default@loc_orc_1d_n1@year=2002
+PREHOOK: Input: default@loc_orc_1d_n1@year=2003
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state from loc_orc_1d_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_1d_n1
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2000
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2001
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2002
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2003
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`
 FROM `default`.`loc_orc_1d_n1`
 STAGE DEPENDENCIES:
@@ -784,8 +820,20 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select state,locid from loc_orc_1d_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_1d_n1
+PREHOOK: Input: default@loc_orc_1d_n1@year=2000
+PREHOOK: Input: default@loc_orc_1d_n1@year=2001
+PREHOOK: Input: default@loc_orc_1d_n1@year=2002
+PREHOOK: Input: default@loc_orc_1d_n1@year=2003
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state,locid from loc_orc_1d_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_1d_n1
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2000
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2001
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2002
+POSTHOOK: Input: default@loc_orc_1d_n1@year=2003
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`, `locid`
 FROM `default`.`loc_orc_1d_n1`
 STAGE DEPENDENCIES:
@@ -1075,8 +1123,34 @@ POSTHOOK: Output: 
default@loc_orc_2d_n1@zip=94087/year=2002
 #### A masked pattern was here ####
 PREHOOK: query: explain extended select state from loc_orc_2d_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_2d_n1
+PREHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2001
+PREHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2002
+PREHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2003
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2000
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2001
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2002
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2003
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2000
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2001
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2002
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2003
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state from loc_orc_2d_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_2d_n1
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2001
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2002
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2003
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2000
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2001
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2002
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2003
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2000
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2001
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2002
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2003
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`
 FROM `default`.`loc_orc_2d_n1`
 STAGE DEPENDENCIES:
@@ -1617,8 +1691,34 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select state,locid from loc_orc_2d_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_2d_n1
+PREHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2001
+PREHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2002
+PREHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2003
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2000
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2001
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2002
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2003
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2000
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2001
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2002
+PREHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2003
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select state,locid from loc_orc_2d_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_2d_n1
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2001
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2002
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=43201/year=2003
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2000
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2001
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2002
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94086/year=2003
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2000
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2001
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2002
+POSTHOOK: Input: default@loc_orc_2d_n1@zip=94087/year=2003
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `state`, `locid`
 FROM `default`.`loc_orc_2d_n1`
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/fetch_aggregation.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fetch_aggregation.q.out 
b/ql/src/test/results/clientpositive/fetch_aggregation.q.out
index 801c6de..b30b0e4 100644
--- a/ql/src/test/results/clientpositive/fetch_aggregation.q.out
+++ b/ql/src/test/results/clientpositive/fetch_aggregation.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select count(key),sum(key),avg(key),min(key),max(key),std(key),variance(key) 
from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(key),sum(key),avg(key),min(key),max(key),std(key),variance(key) 
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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out 
b/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out
index 73d36c8..8610fa0 100644
--- a/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out
+++ b/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out
@@ -3,11 +3,15 @@ CREATE TABLE dest1_n85(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat'
   OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat'
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1_n85
 POSTHOOK: query: EXPLAIN
 CREATE TABLE dest1_n85(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat'
   OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat'
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@dest1_n85
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/fileformat_text.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fileformat_text.q.out 
b/ql/src/test/results/clientpositive/fileformat_text.q.out
index 13704ca..387f807 100644
--- a/ql/src/test/results/clientpositive/fileformat_text.q.out
+++ b/ql/src/test/results/clientpositive/fileformat_text.q.out
@@ -3,11 +3,15 @@ CREATE TABLE dest1_n107(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
   OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat'
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1_n107
 POSTHOOK: query: EXPLAIN
 CREATE TABLE dest1_n107(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
   OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat'
 POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@dest1_n107
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/filter_aggr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_aggr.q.out 
b/ql/src/test/results/clientpositive/filter_aggr.q.out
index 0b42dca..33c5a4b 100644
--- a/ql/src/test/results/clientpositive/filter_aggr.q.out
+++ b/ql/src/test/results/clientpositive/filter_aggr.q.out
@@ -7,6 +7,8 @@ select key, c, 2 as m from (select key, count(key) as c from 
src group by key)s2
 )sub
 where m = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended 
 select key, c, m from
 (
@@ -16,6 +18,8 @@ select key, c, 2 as m from (select key, count(key) as c from 
src group by key)s2
 )sub
 where m = 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, COUNT(`key`) AS `c`, 1 AS `m`
 FROM `default`.`src`
 GROUP BY `key`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out 
b/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
index 6ab11b1..5b65850 100644
--- a/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
@@ -3,11 +3,15 @@ SELECT f.key, g.value
 FROM src f JOIN src m JOIN src g ON(g.value = m.value AND m.value is not null 
AND m.value !='')
 WHERE (f.key = m.key AND f.value='2008-04-08' AND m.value='2008-04-08') OR 
(f.key = m.key AND f.value='2008-04-09')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT f.key, g.value
 FROM src f JOIN src m JOIN src g ON(g.value = m.value AND m.value is not null 
AND m.value !='')
 WHERE (f.key = m.key AND f.value='2008-04-08' AND m.value='2008-04-08') OR 
(f.key = m.key AND f.value='2008-04-09')
 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
@@ -125,11 +129,15 @@ SELECT f.key, g.value
 FROM src f JOIN src m JOIN src g ON(g.value = m.value AND m.value is not null 
AND m.value !='')
 WHERE (f.key = m.key AND f.value IN ('2008-04-08','2008-04-10') AND 
m.value='2008-04-08') OR (f.key = m.key AND f.value='2008-04-09')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT f.key, g.value
 FROM src f JOIN src m JOIN src g ON(g.value = m.value AND m.value is not null 
AND m.value !='')
 WHERE (f.key = m.key AND f.value IN ('2008-04-08','2008-04-10') AND 
m.value='2008-04-08') OR (f.key = m.key AND f.value='2008-04-09')
 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
@@ -252,6 +260,12 @@ JOIN (
   WHERE ((t2.key=t3.key) AND (t2.c_float + t3.c_float > 2)) OR
       ((t2.key=t3.key) AND (t2.c_int + t3.c_int > 2))) t4 ON t1.key=t4.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t1
+PREHOOK: Input: default@cbo_t1@dt=2014
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+PREHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT t1.key 
 FROM cbo_t1 t1
@@ -262,6 +276,12 @@ JOIN (
   WHERE ((t2.key=t3.key) AND (t2.c_float + t3.c_float > 2)) OR
       ((t2.key=t3.key) AND (t2.c_int + t3.c_int > 2))) t4 ON t1.key=t4.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t1
+POSTHOOK: Input: default@cbo_t1@dt=2014
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+POSTHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-1 depends on stages: Stage-2
@@ -378,11 +398,15 @@ SELECT f.key, f.value, m.value
 FROM src f JOIN src m ON(f.key = m.key AND m.value is not null AND m.value 
!='')
 WHERE (f.value IN ('2008-04-08','2008-04-10') AND f.value IN 
('2008-04-08','2008-04-09') AND m.value='2008-04-10') OR (m.value='2008-04-08')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT f.key, f.value, m.value
 FROM src f JOIN src m ON(f.key = m.key AND m.value is not null AND m.value 
!='')
 WHERE (f.value IN ('2008-04-08','2008-04-10') AND f.value IN 
('2008-04-08','2008-04-09') AND m.value='2008-04-10') OR (m.value='2008-04-08')
 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/b356aae0/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out 
b/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
index 39ddaac..d1191a6 100644
--- a/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
+++ b/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
@@ -65,6 +65,8 @@ and all_exposed_users.field_2 = interacted.field_2
 group by all_exposed_users.field_1
 order by all_exposed_users.field_1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@users_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with all_hits as (
 select * from users_table
@@ -94,6 +96,8 @@ and all_exposed_users.field_2 = interacted.field_2
 group by all_exposed_users.field_1
 order by all_exposed_users.field_1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@users_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/filter_cond_pushdown_HIVE_15647.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/filter_cond_pushdown_HIVE_15647.q.out 
b/ql/src/test/results/clientpositive/filter_cond_pushdown_HIVE_15647.q.out
index ec07bed..1a7b7dc 100644
--- a/ql/src/test/results/clientpositive/filter_cond_pushdown_HIVE_15647.q.out
+++ b/ql/src/test/results/clientpositive/filter_cond_pushdown_HIVE_15647.q.out
@@ -19,11 +19,17 @@ sales_HIVE_15647 as sales
 join store_HIVE_15647 as store on sales.store_id = store.store_id
 where ((store.salad_bar)) and ((sales.store_number) <=> (sales.customer_id))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@sales_hive_15647
+PREHOOK: Input: default@store_hive_15647
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from
 sales_HIVE_15647 as sales 
 join store_HIVE_15647 as store on sales.store_id = store.store_id
 where ((store.salad_bar)) and ((sales.store_number) <=> (sales.customer_id))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@sales_hive_15647
+POSTHOOK: Input: default@store_hive_15647
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -109,11 +115,17 @@ sales_HIVE_15647 as sales
 join store_HIVE_15647 as store on sales.store_id = store.store_id
 where ((store.salad_bar)) and ((sales.store_number) = (sales.customer_id))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@sales_hive_15647
+PREHOOK: Input: default@store_hive_15647
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from
 sales_HIVE_15647 as sales 
 join store_HIVE_15647 as store on sales.store_id = store.store_id
 where ((store.salad_bar)) and ((sales.store_number) = (sales.customer_id))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@sales_hive_15647
+POSTHOOK: Input: default@store_hive_15647
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -199,11 +211,17 @@ sales_HIVE_15647 as sales
 join store_HIVE_15647 as store on sales.store_id = store.store_id
 where ((store.salad_bar = true)) and ((sales.store_number) <=> 
(sales.customer_id))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@sales_hive_15647
+PREHOOK: Input: default@store_hive_15647
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from
 sales_HIVE_15647 as sales 
 join store_HIVE_15647 as store on sales.store_id = store.store_id
 where ((store.salad_bar = true)) and ((sales.store_number) <=> 
(sales.customer_id))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@sales_hive_15647
+POSTHOOK: Input: default@store_hive_15647
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -289,11 +307,17 @@ sales_HIVE_15647 as sales
 join store_HIVE_15647 as store on sales.store_id = store.store_id
 where ((store.salad_bar = false)) and ((sales.store_number) > 
(sales.customer_id))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@sales_hive_15647
+PREHOOK: Input: default@store_hive_15647
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from
 sales_HIVE_15647 as sales 
 join store_HIVE_15647 as store on sales.store_id = store.store_id
 where ((store.salad_bar = false)) and ((sales.store_number) > 
(sales.customer_id))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@sales_hive_15647
+POSTHOOK: Input: default@store_hive_15647
+#### 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/b356aae0/ql/src/test/results/clientpositive/filter_in_or_dup.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_in_or_dup.q.out 
b/ql/src/test/results/clientpositive/filter_in_or_dup.q.out
index f863ac3..5006000 100644
--- a/ql/src/test/results/clientpositive/filter_in_or_dup.q.out
+++ b/ql/src/test/results/clientpositive/filter_in_or_dup.q.out
@@ -4,12 +4,18 @@ FROM cbo_t1 f
 WHERE (f.key = '1' OR f.key='2')
 AND f.key IN ('1', '2')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t1
+PREHOOK: Input: default@cbo_t1@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT f.key
 FROM cbo_t1 f
 WHERE (f.key = '1' OR f.key='2')
 AND f.key IN ('1', '2')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t1
+POSTHOOK: Input: default@cbo_t1@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -36,12 +42,18 @@ FROM cbo_t1 f
 WHERE (f.key = '1' OR f.key = '2')
 AND f.key IN ('1', '2', '3')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t1
+PREHOOK: Input: default@cbo_t1@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT f.key
 FROM cbo_t1 f
 WHERE (f.key = '1' OR f.key = '2')
 AND f.key IN ('1', '2', '3')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t1
+POSTHOOK: Input: default@cbo_t1@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -68,12 +80,18 @@ FROM cbo_t1 f
 WHERE (f.key = '1' OR f.key='2' OR f.key='3')
 AND f.key IN ('1', '2')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t1
+PREHOOK: Input: default@cbo_t1@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT f.key
 FROM cbo_t1 f
 WHERE (f.key = '1' OR f.key='2' OR f.key='3')
 AND f.key IN ('1', '2')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t1
+POSTHOOK: Input: default@cbo_t1@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out 
b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
index 18a22f4..43b6a67 100644
--- a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
+++ b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
@@ -23,11 +23,17 @@ SELECT f.key, g.value
 FROM filter_join_breaktask f JOIN filter_join_breaktask m ON( f.key = m.key 
AND f.ds='2008-04-08' AND m.ds='2008-04-08' AND f.key is not null) 
 JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND 
m.ds='2008-04-08' AND m.value is not null AND m.value !='')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@filter_join_breaktask
+PREHOOK: Input: default@filter_join_breaktask@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED  
 SELECT f.key, g.value 
 FROM filter_join_breaktask f JOIN filter_join_breaktask m ON( f.key = m.key 
AND f.ds='2008-04-08' AND m.ds='2008-04-08' AND f.key is not null) 
 JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND 
m.ds='2008-04-08' AND m.value is not null AND m.value !='')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@filter_join_breaktask
+POSTHOOK: Input: default@filter_join_breaktask@ds=2008-04-08
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `t2`.`key`, `t0`.`value`
 FROM (SELECT `value`, CAST('2008-04-08' AS STRING) AS `ds`
 FROM `default`.`filter_join_breaktask`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/filter_numeric.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_numeric.q.out 
b/ql/src/test/results/clientpositive/filter_numeric.q.out
index f2a9b5e..2dbbeb8 100644
--- a/ql/src/test/results/clientpositive/filter_numeric.q.out
+++ b/ql/src/test/results/clientpositive/filter_numeric.q.out
@@ -26,8 +26,12 @@ POSTHOOK: Lineage: partint 
PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart
 1B2M2Y8AsgTpgAmY7PhCfg==
 PREHOOK: query: explain select key, value, hr from partint where hr < 11
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partint
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, value, hr from partint where hr < 11
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partint
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -59,8 +63,14 @@ POSTHOOK: Input: default@partint
 1B2M2Y8AsgTpgAmY7PhCfg==
 PREHOOK: query: explain select key, value, hr from partint where hr <= 12 and 
hr > 11
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partint
+PREHOOK: Input: default@partint@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, value, hr from partint where hr <= 12 and 
hr > 11
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partint
+POSTHOOK: Input: default@partint@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -591,8 +601,16 @@ POSTHOOK: Input: default@partint@ds=2008-04-08/hr=12
 XrhdsR2p43qW9hpMcP/9nw==
 PREHOOK: query: explain select key, value, hr from partint where hr between 11 
and 12
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partint
+PREHOOK: Input: default@partint@ds=2008-04-08/hr=11
+PREHOOK: Input: default@partint@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, value, hr from partint where hr between 
11 and 12
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partint
+POSTHOOK: Input: default@partint@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@partint@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1625,8 +1643,14 @@ POSTHOOK: Input: default@partint@ds=2008-04-08/hr=12
 irG2+wNa4ZWkUKb0+hXweg==
 PREHOOK: query: explain select key, value, hr from partint where hr not 
between 12 and 14
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partint
+PREHOOK: Input: default@partint@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, value, hr from partint where hr not 
between 12 and 14
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partint
+POSTHOOK: Input: default@partint@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -2157,8 +2181,16 @@ POSTHOOK: Input: default@partint@ds=2008-04-08/hr=11
 v6vY2XVDyLw+4d5w+xCycg==
 PREHOOK: query: explain select key, value, hr from partint where hr < 13
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partint
+PREHOOK: Input: default@partint@ds=2008-04-08/hr=11
+PREHOOK: Input: default@partint@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, value, hr from partint where hr < 13
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partint
+POSTHOOK: Input: default@partint@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@partint@ds=2008-04-08/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/b356aae0/ql/src/test/results/clientpositive/filter_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_union.q.out 
b/ql/src/test/results/clientpositive/filter_union.q.out
index a7cd8c1..394a0b9 100644
--- a/ql/src/test/results/clientpositive/filter_union.q.out
+++ b/ql/src/test/results/clientpositive/filter_union.q.out
@@ -11,6 +11,8 @@ select key, c, 4 as m from (select key, count(key) as c from 
src group by key)s4
 )sub
 where m >2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended 
 select key, c, m from
 (
@@ -24,6 +26,8 @@ select key, c, 4 as m from (select key, count(key) as c from 
src group by key)s4
 )sub
 where m >2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, COUNT(`key`) AS `c`, 3 AS `m`
 FROM `default`.`src`
 GROUP BY `key`
@@ -384,6 +388,8 @@ select key, c, 4 as m from (select key, count(key) as c 
from src group by key)s4
 )sub
 where m = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select key, c, m from
 (
@@ -397,6 +403,8 @@ select key, c, 4 as m from (select key, count(key) as c 
from src group by key)s4
 )sub
 where m = 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
@@ -463,6 +471,8 @@ select key, c, 4 as m from (select key, count(key) as c 
from src group by key)s4
 )sub
 where m = 4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select key, c, m from
 (
@@ -476,6 +486,8 @@ select key, c, 4 as m from (select key, count(key) as c 
from src group by key)s4
 )sub
 where m = 4
 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
@@ -542,6 +554,8 @@ select key, c, 4 as m from (select key, count(key) as c 
from src group by key)s4
 )sub
 where m = 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select key, c, m from
 (
@@ -555,6 +569,8 @@ select key, c, 4 as m from (select key, count(key) as c 
from src group by key)s4
 )sub
 where m = 5
 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/b356aae0/ql/src/test/results/clientpositive/flatten_and_or.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/flatten_and_or.q.out 
b/ql/src/test/results/clientpositive/flatten_and_or.q.out
index a25cf1b..2122bd9 100644
--- a/ql/src/test/results/clientpositive/flatten_and_or.q.out
+++ b/ql/src/test/results/clientpositive/flatten_and_or.q.out
@@ -15,6 +15,8 @@ WHERE
    AND value = '1') OR (key = '10'
    AND value = '3'))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT key
 FROM src
@@ -32,6 +34,8 @@ WHERE
    AND value = '1') OR (key = '10'
    AND value = '3'))
 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/b356aae0/ql/src/test/results/clientpositive/floor_time.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/floor_time.q.out 
b/ql/src/test/results/clientpositive/floor_time.q.out
index e4ae666..907c377 100644
--- a/ql/src/test/results/clientpositive/floor_time.q.out
+++ b/ql/src/test/results/clientpositive/floor_time.q.out
@@ -38,10 +38,14 @@ PREHOOK: query: explain
 select floor_day(t)
 from extract_udf_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@extract_udf_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select floor_day(t)
 from extract_udf_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@extract_udf_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -87,10 +91,14 @@ PREHOOK: query: explain
 select floor(t to day)
 from extract_udf_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@extract_udf_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select floor(t to day)
 from extract_udf_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@extract_udf_n0
+#### 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/b356aae0/ql/src/test/results/clientpositive/fm-sketch.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fm-sketch.q.out 
b/ql/src/test/results/clientpositive/fm-sketch.q.out
index f6f248d..e9184dd 100644
--- a/ql/src/test/results/clientpositive/fm-sketch.q.out
+++ b/ql/src/test/results/clientpositive/fm-sketch.q.out
@@ -17,8 +17,14 @@ POSTHOOK: Output: default@n_n0
 POSTHOOK: Lineage: n_n0.key EXPRESSION []
 PREHOOK: query: explain analyze table n_n0 compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@n_n0
+PREHOOK: Output: default@n_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze table n_n0 compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@n_n0
+POSTHOOK: Output: default@n_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0
@@ -113,8 +119,14 @@ POSTHOOK: Output: default@i_n1
 POSTHOOK: Lineage: i_n1.key EXPRESSION [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
 PREHOOK: query: explain analyze table i_n1 compute statistics for columns
 PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@i_n1
+PREHOOK: Output: default@i_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze table i_n1 compute statistics for columns
 POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@i_n1
+POSTHOOK: Output: default@i_n1
+#### 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/b356aae0/ql/src/test/results/clientpositive/fold_case.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fold_case.q.out 
b/ql/src/test/results/clientpositive/fold_case.q.out
index a99f6f7..e49a8bf 100644
--- a/ql/src/test/results/clientpositive/fold_case.q.out
+++ b/ql/src/test/results/clientpositive/fold_case.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select count(1) from src where (case key when '238' then true else false end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(1) from src where (case key when '238' then true else false end)
 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
@@ -53,9 +57,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select count(1) from src where (case key when '238' then 1=2 else 1=1 end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select count(1) from src where (case key when '238' then 1=2 else 1=1 end)
 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
@@ -105,9 +113,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select count(1) from src where (case key when '238' then 1=2 else 1=31 end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select count(1) from src where (case key when '238' then 1=2 else 1=31 end)
 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
@@ -157,9 +169,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select count(1) from src where (case key when '238' then true else 1=1 end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select count(1) from src where (case key when '238' then true else 1=1 end)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -173,9 +189,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select count(1) from src where (case key when '238' then 1=1 else 1=null end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(1) from src where (case key when '238' then 1=1 else 1=null end)
 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
@@ -225,9 +245,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select count(1) from src where (case key when '238' then 1=null  end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select count(1) from src where (case key when '238' then 1=null  end)
 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
@@ -277,9 +301,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select count(1) from src where (case key when '238' then 2 = cast('2' as 
bigint) end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select count(1) from src where (case key when '238' then 2 = cast('2' as 
bigint) end)
 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
@@ -329,9 +357,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select (case key when '238' then null else false end) from src where (case key 
when '238' then 2 = cast('1' as bigint)  else true end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select (case key when '238' then null else false end) from src where (case key 
when '238' then 2 = cast('1' as bigint)  else true end)
 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
@@ -368,9 +400,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select (case key when '238' then null else null end) from src where (case key 
when '238' then 2 = null else 3 = null  end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select (case key when '238' then null else null end) from src where (case key 
when '238' then 2 = null else 3 = null  end)
 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
@@ -409,9 +445,13 @@ STAGE PLANS:
 PREHOOK: query: explain 
 select count(1) from src where (case key when '238' then null else 1=1 end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select count(1) from src where (case key when '238' then null else 1=1 end)
 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
@@ -461,10 +501,14 @@ PREHOOK: query: explain
 select (CASE WHEN (-2) >= 0  THEN SUBSTRING(key, 1,CAST((-2) AS INT)) ELSE 
NULL END)
 from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select (CASE WHEN (-2) >= 0  THEN SUBSTRING(key, 1,CAST((-2) AS INT)) ELSE 
NULL END)
 from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -486,10 +530,14 @@ PREHOOK: query: explain
 select (CASE WHEN key = value THEN '1' WHEN true THEN '0' ELSE NULL END)
 from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select (CASE WHEN key = value THEN '1' WHEN true THEN '0' ELSE NULL END)
 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
@@ -523,9 +571,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select (case when true then key when not true then to_date(key) else null end) 
from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select (case when true then key when not true then to_date(key) else null end) 
from src
 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/b356aae0/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out 
b/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out
index 763c390..c61c4c3 100644
--- a/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out
+++ b/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out
@@ -14,6 +14,8 @@ WHERE
 ((CASE WHEN (1 = l_linenumber) THEN 1 ELSE 1 END) = 1) AND (1 = 1)) 
 GROUP BY l_orderkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lineitem
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT  
 SUM((CASE WHEN 1000000 = 0 THEN NULL ELSE l_partkey / 1000000 END)),
@@ -30,6 +32,8 @@ WHERE
 ((CASE WHEN (1 = l_linenumber) THEN 1 ELSE 1 END) = 1) AND (1 = 1)) 
 GROUP BY l_orderkey
 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
@@ -88,8 +92,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from src where (case key when '238' then 1 
else 2 end) = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from src where (case key when '238' then 1 
else 2 end) = 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
@@ -125,8 +133,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from src where (case key when '238' then 1  
when '94' then 1 else 3 end) = cast('1' as int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from src where (case key when '238' then 1 
 when '94' then 1 else 3 end) = cast('1' as int)
 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
@@ -162,8 +174,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from src where (case key when '238' then 1 
else 2 end) = (case when key != '238' then 1 else 1 end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from src where (case key when '238' then 1 
else 2 end) = (case when key != '238' then 1 else 1 end)
 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
@@ -199,8 +215,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from src where (case key when '238' then 1 
end) = (case when key != '238' then 1 when key = '23' then 1 end)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from src where (case key when '238' then 1 
end) = (case when key != '238' then 1 when key = '23' then 1 end)
 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/b356aae0/ql/src/test/results/clientpositive/fold_when.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fold_when.q.out 
b/ql/src/test/results/clientpositive/fold_when.q.out
index 08d885d..31c7caa 100644
--- a/ql/src/test/results/clientpositive/fold_when.q.out
+++ b/ql/src/test/results/clientpositive/fold_when.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then null     end) = 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then null     end) = 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
@@ -40,9 +44,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then null else null end) = 
1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then null else null end) = 
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
@@ -79,9 +87,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then 1 else 1 end) = 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then 1 else 1 end) = 1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -102,9 +114,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then 1 else 1 end) = 2)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then 1 else 1 end) = 2)
 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
@@ -141,9 +157,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then 1 else null end) = 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then 1 else null end) = 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
@@ -180,9 +200,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=1 else null=1 end))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=1 else null=1 end))
 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
@@ -219,9 +243,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=1 else 2=2 end))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=1 else 2=2 end))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -242,9 +270,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=3 else 2=1 end))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=3 else 2=1 end))
 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
@@ -281,9 +313,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=1 else 2=1 end))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=1 else 2=1 end))
 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
@@ -320,9 +356,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=3 else 1=1 end))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = '238') then 1=3 else 1=1 end))
 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
@@ -359,9 +399,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when ('23' = '23') then 1 else 1 end) = 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when ('23' = '23') then 1 else 1 end) = 1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -382,9 +426,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when ('2' = '238') then 1 else 2 end) = 2)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when ('2' = '238') then 1 else 2 end) = 2)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -405,9 +453,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (true=null) then 1 else 1 end) = 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (true=null) then 1 else 1 end) = 1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -428,9 +480,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = (case when (key = '238') then 
'11' else '11'  end)) then false else true end))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = (case when (key = '238') then 
'11' else '11'  end)) then false else true end))
 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
@@ -467,9 +523,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select key from src where ((case when (key = (case when (key = '238') then 
'12' else '11'  end)) then 2=2   else true end))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from src where ((case when (key = (case when (key = '238') then 
'12' else '11'  end)) then 2=2   else true end))
 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/b356aae0/ql/src/test/results/clientpositive/folder_predicate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/folder_predicate.q.out 
b/ql/src/test/results/clientpositive/folder_predicate.q.out
index 2f73f18..f017c0e 100644
--- a/ql/src/test/results/clientpositive/folder_predicate.q.out
+++ b/ql/src/test/results/clientpositive/folder_predicate.q.out
@@ -22,9 +22,13 @@ POSTHOOK: Lineage: predicate_fold_tb.value SCRIPT []
 PREHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value = 3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value = 3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -74,9 +78,13 @@ NULL
 PREHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value >= 3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value >= 3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -124,9 +132,13 @@ NULL
 PREHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value <= 3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value <= 3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -174,9 +186,13 @@ NULL
 PREHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value > 3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value > 3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -225,9 +241,13 @@ NULL
 PREHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value < 3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value < 3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -276,9 +296,13 @@ NULL
 PREHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value <> 3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value <> 3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -325,9 +349,13 @@ NULL
 PREHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value > 1 AND 
value <=3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@predicate_fold_tb
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT * FROM predicate_fold_tb WHERE not(value IS NOT NULL AND value > 1 AND 
value <=3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@predicate_fold_tb
+#### 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/b356aae0/ql/src/test/results/clientpositive/foldts.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/foldts.q.out 
b/ql/src/test/results/clientpositive/foldts.q.out
index 83a6481..9a68fe0 100644
--- a/ql/src/test/results/clientpositive/foldts.q.out
+++ b/ql/src/test/results/clientpositive/foldts.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select ctimestamp1, unix_timestamp(ctimestamp1), 
to_unix_timestamp(ctimestamp1) from alltypesorc limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select ctimestamp1, unix_timestamp(ctimestamp1), 
to_unix_timestamp(ctimestamp1) from alltypesorc limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -59,9 +63,13 @@ POSTHOOK: Output: default@src1orc
 PREHOOK: query: explain
 select from_unixtime(to_unix_timestamp(ctimestamp1), 'EEEE') from alltypesorc 
limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select from_unixtime(to_unix_timestamp(ctimestamp1), 'EEEE') from alltypesorc 
limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -107,9 +115,13 @@ Wednesday
 PREHOOK: query: explain
 select from_unixtime(unix_timestamp(ctimestamp1), 'EEEE') from alltypesorc 
limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select from_unixtime(unix_timestamp(ctimestamp1), 'EEEE') from alltypesorc 
limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc
+#### 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/b356aae0/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out 
b/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out
index 84991d7..c526f20 100644
--- a/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out
+++ b/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out
@@ -2,10 +2,14 @@ PREHOOK: query: explain
 select sum(l_extendedprice) from lineitem q0 where l_discount
 between cast('0.05' as decimal(3,2)) and cast('0.07' as decimal(3,2))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lineitem
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(l_extendedprice) from lineitem q0 where l_discount
 between cast('0.05' as decimal(3,2)) and cast('0.07' as decimal(3,2))
 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
@@ -69,10 +73,14 @@ PREHOOK: query: explain
 select sum(l_extendedprice) from lineitem q1 where l_discount
 between 0.06 - 0.01 and 0.06 + 0.01
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lineitem
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(l_extendedprice) from lineitem q1 where l_discount
 between 0.06 - 0.01 and 0.06 + 0.01
 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
@@ -173,10 +181,14 @@ PREHOOK: query: explain
 select sum(l_extendedprice) from lineitem q10 where l_discount
 between cast('0.05' as decimal(3,2)) and cast('0.07' as decimal(3,2))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lineitem
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(l_extendedprice) from lineitem q10 where l_discount
 between cast('0.05' as decimal(3,2)) and cast('0.07' as decimal(3,2))
 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
@@ -240,10 +252,14 @@ PREHOOK: query: explain
 select sum(l_extendedprice) from lineitem q11 where l_discount
 between 0.06 - 0.01 and 0.06 + 0.01
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lineitem
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(l_extendedprice) from lineitem q11 where l_discount
 between 0.06 - 0.01 and 0.06 + 0.01
 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/b356aae0/ql/src/test/results/clientpositive/gby_star.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/gby_star.q.out 
b/ql/src/test/results/clientpositive/gby_star.q.out
index 1227348..84c922e 100644
--- a/ql/src/test/results/clientpositive/gby_star.q.out
+++ b/ql/src/test/results/clientpositive/gby_star.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select *, sum(key) from src group by key, value limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select *, sum(key) from src group by key, value limit 10
 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
@@ -77,9 +81,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 select *, sum(key) from src where key < 100 group by key, value limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select *, sum(key) from src where key < 100 group by key, value limit 10
 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
@@ -152,9 +160,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 select *, sum(key) from (select key from src where key < 100) a group by key 
limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select *, sum(key) from (select key from src where key < 100) a group by key 
limit 10
 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
@@ -228,10 +240,14 @@ PREHOOK: query: explain
 select a.*, sum(src.key) from (select key from src where key < 100) a 
 inner join src on a.key = src.key group by a.key limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.*, sum(src.key) from (select key from src where key < 100) a 
 inner join src on a.key = src.key group by a.key limit 10
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out 
b/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out
index cc4642d..ef7b119 100644
--- a/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out
+++ b/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out
@@ -22,8 +22,12 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@t1_n102
 PREHOOK: query: explain select example_add10(x) as a,example_add10(y) as b 
from t1_n102 order by a desc,b limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n102
+#### A masked pattern was here ####
 POSTHOOK: query: explain select example_add10(x) as a,example_add10(y) as b 
from t1_n102 order by a desc,b limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n102
+#### 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/b356aae0/ql/src/test/results/clientpositive/groupby1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby1.q.out 
b/ql/src/test/results/clientpositive/groupby1.q.out
index 70b39d8..892bcdd 100644
--- a/ql/src/test/results/clientpositive/groupby1.q.out
+++ b/ql/src/test/results/clientpositive/groupby1.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@dest_g1
 PREHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest_g1 SELECT src.key, 
sum(substr(src.value,5)) GROUP BY src.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_g1
 POSTHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest_g1 SELECT src.key, 
sum(substr(src.value,5)) GROUP BY src.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_g1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

Reply via email to