http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cast1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cast1.q.out 
b/ql/src/test/results/clientpositive/cast1.q.out
index e4e8dd6..8529504 100644
--- a/ql/src/test/results/clientpositive/cast1.q.out
+++ b/ql/src/test/results/clientpositive/cast1.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@dest1_n151
 PREHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n151 SELECT 3 + 2, 3.0 + 2, 3 + 2.0, 3.0 
+ 2.0, 3 + CAST(2.0 AS INT) + CAST(CAST(0 AS SMALLINT) AS INT), CAST(1 AS 
BOOLEAN), CAST(TRUE AS INT) WHERE src.key = 86
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n151
 POSTHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n151 SELECT 3 + 2, 3.0 + 2, 3 + 2.0, 3.0 
+ 2.0, 3 + CAST(2.0 AS INT) + CAST(CAST(0 AS SMALLINT) AS INT), CAST(1 AS 
BOOLEAN), CAST(TRUE AS INT) WHERE src.key = 86
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n151
 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/b356aae0/ql/src/test/results/clientpositive/cast_on_constant.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cast_on_constant.q.out 
b/ql/src/test/results/clientpositive/cast_on_constant.q.out
index 731129c..b77460c 100644
--- a/ql/src/test/results/clientpositive/cast_on_constant.q.out
+++ b/ql/src/test/results/clientpositive/cast_on_constant.q.out
@@ -8,8 +8,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t1_n138
 PREHOOK: query: explain select * from t1_n138 where ts_field = "2016-01-23 
00:00:00"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where ts_field = "2016-01-23 
00:00:00"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -45,8 +49,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1_n138 where date_field = "2016-01-23"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where date_field = "2016-01-23"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -82,8 +90,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1_n138 where ts_field = timestamp 
'2016-01-23 00:00:00'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where ts_field = timestamp 
'2016-01-23 00:00:00'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -119,8 +131,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1_n138 where date_field = date 
'2016-01-23'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where date_field = date 
'2016-01-23'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -156,8 +172,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1_n138 where date_field = ts_field
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n138
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1_n138 where date_field = ts_field
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n138
+#### 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/cbo_SortUnionTransposeRule.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out 
b/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
index 6900f62..d454991 100644
--- a/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
+++ b/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
@@ -16,12 +16,16 @@ union all
 select key from s_n3 b
 order by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 order by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -81,12 +85,16 @@ union all
 select key from s_n3 b
 limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -103,12 +111,16 @@ union all
 select key from s_n3 b
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -169,6 +181,8 @@ select key from s_n3 b
 order by key
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
@@ -176,6 +190,8 @@ select key from s_n3 b
 order by key
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -248,6 +264,8 @@ on src1.key = src2.key
 limit 10)subq2
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from(
 select src1.key, src2.value
@@ -262,6 +280,8 @@ on src1.key = src2.key
 limit 10)subq2
 limit 5
 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
@@ -465,12 +485,16 @@ union all
 select key from s_n3 b
 order by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 order by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -530,12 +554,16 @@ union all
 select key from s_n3 b
 limit 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -552,12 +580,16 @@ union all
 select key from s_n3 b
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -676,6 +708,8 @@ select key from s_n3 b
 order by key
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
@@ -683,6 +717,8 @@ select key from s_n3 b
 order by key
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -807,6 +843,8 @@ on src1.key = src2.key
 limit 10)subq2
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from(
 select src1.key, src2.value
@@ -821,6 +859,8 @@ on src1.key = src2.key
 limit 10)subq2
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-1 depends on stages: Stage-4
@@ -1082,12 +1122,16 @@ union all
 select key from s_n3 b
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1147,12 +1191,16 @@ union all
 select key from s_n3 b
 limit 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@s_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key from s_n3 a
 union all
 select key from s_n3 b
 limit 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@s_n3
+#### 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/cbo_const.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_const.q.out 
b/ql/src/test/results/clientpositive/cbo_const.q.out
index 090fd1b..d8a230f 100644
--- a/ql/src/test/results/clientpositive/cbo_const.q.out
+++ b/ql/src/test/results/clientpositive/cbo_const.q.out
@@ -109,8 +109,12 @@ key1       value1  2011-10-15
 key1   value1  2011-10-15
 PREHOOK: query: explain select array(1,2,3) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select array(1,2,3) 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
@@ -144,9 +148,13 @@ STAGE PLANS:
 PREHOOK: query: EXPLAIN
 select key from (SELECT key from src where key = 1+3)s
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 select key from (SELECT key from src where key = 1+3)s
 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,11 +227,19 @@ SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key and y.key = 1+2)
 JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11+3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@srcpart
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key and y.key = 1+2)
 JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11+3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@srcpart
+#### 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/cbo_input26.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_input26.q.out 
b/ql/src/test/results/clientpositive/cbo_input26.q.out
index 26a2310..8552d85 100644
--- a/ql/src/test/results/clientpositive/cbo_input26.q.out
+++ b/ql/src/test/results/clientpositive/cbo_input26.q.out
@@ -5,6 +5,9 @@ select * from (
   select * from (select * from srcpart b where b.ds = '2008-04-08' and b.hr = 
'14' limit 5)pb
 )subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select * from srcpart a where a.ds = '2008-04-08' and a.hr = 
'11' order by a.key limit 5)pa
@@ -12,6 +15,9 @@ select * from (
   select * from (select * from srcpart b where b.ds = '2008-04-08' and b.hr = 
'14' limit 5)pb
 )subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -164,6 +170,9 @@ select * from (
   select * from (select b.ds, b.key, b.hr from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select a.ds, a.key, a.hr from srcpart a where a.ds = 
'2008-04-08' and a.hr = '11' order by a.key limit 5)pa
@@ -171,6 +180,9 @@ select * from (
   select * from (select b.ds, b.key, b.hr from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -322,6 +334,9 @@ select * from (
   select * from (select b.ds, b.key, b.hr from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select a.ds, a.key, a.hr from srcpart a where a.ds = 
'2008-04-08' and a.hr = '11' order by a.hr,a.key limit 5)pa
@@ -329,6 +344,9 @@ select * from (
   select * from (select b.ds, b.key, b.hr from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -480,6 +498,9 @@ select * from (
   select * from (select b.key, b.ds, b.value from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from (
   select * from (select a.key, a.ds, a.value from srcpart a where a.ds = 
'2008-04-08' and a.hr = '11' order by a.ds limit 5)pa
@@ -487,6 +508,9 @@ select * from (
   select * from (select b.key, b.ds, b.value from srcpart b where b.ds = 
'2008-04-08' and b.hr = '14' limit 5)pb
 )subq
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+#### 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/b356aae0/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out 
b/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out
index 8f00aa8..f2a9dad 100644
--- a/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out
+++ b/ql/src/test/results/clientpositive/cbo_ppd_non_deterministic.q.out
@@ -99,11 +99,17 @@ select part1,randum123
 from (SELECT *, cast(rand() as double) AS randum123 FROM testA where 
part1='CA' and part2 = 'ABC') a
 where randum123 <= 0.5) s where s.randum123 > 0.25 limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@testa
+PREHOOK: Input: default@testa@part1=CA/part2=ABC/part3=300
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (
 select part1,randum123
 from (SELECT *, cast(rand() as double) AS randum123 FROM testA where 
part1='CA' and part2 = 'ABC') a
 where randum123 <= 0.5) s where s.randum123 > 0.25 limit 20
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@testa
+POSTHOOK: Input: default@testa@part1=CA/part2=ABC/part3=300
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -148,11 +154,17 @@ select part1,randum123
 from (SELECT *, cast(rand() as double) AS randum123 FROM testA where 
part1='CA' and part2 = 'ABC') a
 where randum123 <= 0.5) s where s.randum123 > 0.25 limit 20
 PREHOOK: type: QUERY
+PREHOOK: Input: default@testa
+PREHOOK: Input: default@testa@part1=CA/part2=ABC/part3=300
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (
 select part1,randum123
 from (SELECT *, cast(rand() as double) AS randum123 FROM testA where 
part1='CA' and part2 = 'ABC') a
 where randum123 <= 0.5) s where s.randum123 > 0.25 limit 20
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@testa
+POSTHOOK: Input: default@testa@part1=CA/part2=ABC/part3=300
+#### 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/cbo_rp_annotate_stats_groupby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
index 3af4b85..9136967 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
@@ -54,8 +54,12 @@ POSTHOOK: Lineage: loc_orc_n1.year SIMPLE 
[(loc_staging_n1)loc_staging_n1.FieldS
 POSTHOOK: Lineage: loc_orc_n1.zip SIMPLE 
[(loc_staging_n1)loc_staging_n1.FieldSchema(name:zip, type:bigint, 
comment:null), ]
 PREHOOK: query: explain select * from loc_orc_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -90,6 +94,8 @@ from ( select state as a, locid as b, count(*) as c
      ) sq1
 group by a,c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a, c, min(b)
 from ( select state as a, locid as b, count(*) as c
        from loc_orc_n1
@@ -97,6 +103,8 @@ from ( select state as a, locid as b, count(*) as c
      ) sq1
 group by a,c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -190,8 +198,12 @@ POSTHOOK: Output: default@loc_orc_n1
 #### A masked pattern was here ####
 PREHOOK: query: explain select year from loc_orc_n1 group by year
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select year from loc_orc_n1 group by year
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -240,8 +252,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by state,locid
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -290,8 +306,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -340,8 +360,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with rollup
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with rollup
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -390,8 +414,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by rollup 
(state,locid)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by rollup 
(state,locid)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -440,8 +468,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -490,8 +522,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -540,8 +576,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid),())
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid),())
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -590,8 +630,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state,locid),(state),(locid),())
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state,locid),(state),(locid),())
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -640,8 +684,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select year from loc_orc_n1 group by year
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select year from loc_orc_n1 group by year
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -690,8 +738,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -740,8 +792,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,zip from loc_orc_n1 group by state,zip
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,zip from loc_orc_n1 group by state,zip
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -790,8 +846,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -840,8 +900,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with rollup
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with rollup
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -890,8 +954,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by rollup 
(state,locid)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by rollup 
(state,locid)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -940,8 +1008,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -990,8 +1062,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1040,8 +1116,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid),())
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state),(locid),())
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1090,8 +1170,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state,locid),(state),(locid),())
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid grouping sets((state,locid),(state),(locid),())
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1140,8 +1224,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select year from loc_orc_n1 group by year
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select year from loc_orc_n1 group by year
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1190,8 +1278,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n1 group by 
state,locid with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_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/b356aae0/ql/src/test/results/clientpositive/cbo_rp_auto_join0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_auto_join0.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_auto_join0.q.out
index df19463..0922756 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_auto_join0.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_auto_join0.q.out
@@ -10,6 +10,8 @@ SELECT cbo_t1.key as k1, cbo_t1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select sum(hash(a.k1,a.v1,a.k2, a.v2))
 from (
@@ -21,6 +23,8 @@ SELECT cbo_t1.key as k1, cbo_t1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5
@@ -123,6 +127,8 @@ SELECT cbo_t1.key as k1, cbo_t1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select sum(hash(a.k1,a.v1,a.k2, a.v2))
 from (
@@ -134,6 +140,8 @@ SELECT cbo_t1.key as k1, cbo_t1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
index 3016c26..9ccfd17 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
@@ -79,11 +79,17 @@ select count(*) from (
   select a.key as key, a.value as val1, b.value as val2 from tbl1_n13 a join 
tbl2_n12 b on a.key = b.key
 ) subq1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from (
   select a.key as key, a.value as val1, b.value as val2 from tbl1_n13 a join 
tbl2_n12 b on a.key = b.key
 ) subq1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -224,6 +230,9 @@ select count(*) from
   group by key
 ) subq2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from
 (
@@ -234,6 +243,9 @@ select count(*) from
   group by key
 ) subq2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -373,6 +385,9 @@ join
 ) src2
 on src1.key = src2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select src1.key, src1.cnt1, src2.cnt1 from
 (
@@ -390,6 +405,9 @@ join
 ) src2
 on src1.key = src2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-1 depends on stages: Stage-3
@@ -609,6 +627,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n12 a where key < 6) subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, a.value as value from tbl1_n13 a where key < 6) subq1 
@@ -616,6 +637,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n12 a where key < 6) subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -697,6 +721,9 @@ select count(*) from
   join tbl2_n12 b
   on subq2.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (
@@ -709,6 +736,9 @@ select count(*) from
   join tbl2_n12 b
   on subq2.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -807,6 +837,8 @@ select count(*) from
   ) subq4
   on subq2.key = subq4.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (
@@ -826,6 +858,8 @@ select count(*) from
   ) subq4
   on subq2.key = subq4.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -924,6 +958,9 @@ select count(*) from
   (select a.key as key, concat(a.value, a.value) as value from tbl2_n12 a 
where key < 8) subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, concat(a.value, a.value) as value from tbl1_n13 a 
where key < 8) subq1 
@@ -931,6 +968,9 @@ select count(*) from
   (select a.key as key, concat(a.value, a.value) as value from tbl2_n12 a 
where key < 8) subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1007,6 +1047,9 @@ select count(*) from
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl2_n12 a) 
subq2
   on subq1.key = subq2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl1_n13 a) 
subq1 
@@ -1014,6 +1057,9 @@ select count(*) from
   (select a.key +1 as key, concat(a.value, a.value) as value from tbl2_n12 a) 
subq2
   on subq1.key = subq2.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-4
@@ -1197,11 +1243,17 @@ select count(*) from
   (select a.key as key, a.value as value from tbl1_n13 a where key < 6) subq1 
     join tbl2_n12 a on subq1.key = a.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, a.value as value from tbl1_n13 a where key < 6) subq1 
     join tbl2_n12 a on subq1.key = a.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1277,6 +1329,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n12 a where key < 6) subq3
   on (subq1.key = subq3.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from 
   (select a.key as key, a.value as value from tbl1_n13 a where key < 6) subq1 
@@ -1287,6 +1342,9 @@ select count(*) from
   (select a.key as key, a.value as value from tbl2_n12 a where key < 6) subq3
   on (subq1.key = subq3.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1377,6 +1435,9 @@ select count(*) from (
 join tbl2_n12 b
 on subq2.key = b.key) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from (
   select subq2.key as key, subq2.value as value1, b.value as value2 from
@@ -1390,6 +1451,9 @@ select count(*) from (
 join tbl2_n12 b
 on subq2.key = b.key) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1473,8 +1537,14 @@ POSTHOOK: Input: default@tbl2_n12
 20
 PREHOOK: query: explain select a.key as key, a.value as val1, b.value as val2 
from tbl1_n13 a join tbl2_n12 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key as key, a.value as val1, b.value as val2 
from tbl1_n13 a join tbl2_n12 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1550,8 +1620,14 @@ POSTHOOK: Input: default@tbl2_n12
 9      val_9   val_9
 PREHOOK: query: explain select a.key as key, a.value as val1, b.value as val2 
from tbl1_n13 a join tbl2_n12 b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl1_n13
+PREHOOK: Input: default@tbl2_n12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key as key, a.value as val1, b.value as val2 
from tbl1_n13 a join tbl2_n12 b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl1_n13
+POSTHOOK: Input: default@tbl2_n12
+#### 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/cbo_rp_auto_join17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out
index df1e4d4..7d48d3f 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n112 SELECT src1.*, src2.*
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n112
 POSTHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1_n112 SELECT src1.*, src2.*
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n112
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
index 10a8ae1..796c6b4 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
@@ -31,8 +31,14 @@ POSTHOOK: Lineage: b_n14.value SIMPLE 
[(src)src.FieldSchema(name:value, type:str
 Warning: Map Join MAPJOIN[8][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from A_n18 join B_n14
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n18 join B_n14
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-3 depends on stages: Stage-4
@@ -97,8 +103,14 @@ STAGE PLANS:
 Warning: Map Join MAPJOIN[19][bigTable=?] in task 'Stage-5:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from B_n14 d1 join B_n14 d2 on d1.key = 
d2.key join A_n18
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from B_n14 d1 join B_n14 d2 on d1.key = 
d2.key join A_n18
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-7 is a root stage
   Stage-5 depends on stages: Stage-7
@@ -195,11 +207,17 @@ PREHOOK: query: explain select * from A_n18 join
           from B_n14 d1 join B_n14 d2 on d1.key = d2.key 
           where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n18 join 
          (select d1.key 
           from B_n14 d1 join B_n14 d2 on d1.key = d2.key 
           where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-3 depends on stages: Stage-8
@@ -335,8 +353,14 @@ Warning: Map Join MAPJOIN[21][bigTable=?] in task 
'Stage-5:MAPRED' is a cross pr
 Warning: Map Join MAPJOIN[22][bigTable=?] in task 'Stage-3:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from A_n18 join (select d1.key from B_n14 d1 
join B_n14 d2 where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n18 join (select d1.key from B_n14 d1 
join B_n14 d2 where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-3 depends on stages: Stage-8
@@ -467,10 +491,16 @@ PREHOOK: query: explain select * from
 (select A_n18.key from A_n18 group by key) ss join 
 (select d1.key from B_n14 d1 join B_n14 d2 on d1.key = d2.key where 1 = 1 
group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n18
+PREHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from 
 (select A_n18.key from A_n18 group by key) ss join 
 (select d1.key from B_n14 d1 join B_n14 d2 on d1.key = d2.key where 1 = 1 
group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n18
+POSTHOOK: Input: default@b_n14
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-8 depends on stages: Stage-1, Stage-4 , consists of Stage-10, 
Stage-11, Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out
index 3fb7f4a..58bb2a7 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_gby2_map_multi_distinct.q.out
@@ -12,12 +12,16 @@ INSERT OVERWRITE TABLE dest1_n166
 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), 
concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT 
substr(src.value, 5)), count(src.value)
 GROUP BY substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n166
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n166
 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), 
concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT 
substr(src.value, 5)), count(src.value)
 GROUP BY substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n166
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -170,12 +174,16 @@ INSERT OVERWRITE TABLE dest1_n166
 SELECT substr(src.key,1,1), count(DISTINCT substr(src.key,1,1)), 
concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT 
substr(src.value, 5)), count(src.value)
 GROUP BY substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n166
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n166
 SELECT substr(src.key,1,1), count(DISTINCT substr(src.key,1,1)), 
concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT 
substr(src.value, 5)), count(src.value)
 GROUP BY substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n166
 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/cbo_rp_groupby3_noskew_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q.out
 
b/ql/src/test/results/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q.out
index 34cf06e..7d0a2a0 100644
--- 
a/ql/src/test/results/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q.out
+++ 
b/ql/src/test/results/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q.out
@@ -21,6 +21,8 @@ INSERT OVERWRITE TABLE dest1_n123 SELECT
   sum(DISTINCT substr(src.value, 5)),
   count(DISTINCT substr(src.value, 5))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n123
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n123 SELECT
@@ -36,6 +38,8 @@ INSERT OVERWRITE TABLE dest1_n123 SELECT
   sum(DISTINCT substr(src.value, 5)),
   count(DISTINCT substr(src.value, 5))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n123
 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/cbo_rp_join0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_join0.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
index 29499a1..ba41c7b 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
@@ -2,10 +2,22 @@ PREHOOK: query: explain select key, cbo_t1.c_int, cbo_t2.p, q 
from cbo_t1 join
 (select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2) cbo_t2 
on cbo_t1.key=p right outer join
 (select key as a, c_int as b, cbo_t3.c_float as c from cbo_t3) cbo_t3 on 
cbo_t1.key=a
 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 key, cbo_t1.c_int, cbo_t2.p, q from cbo_t1 join
 (select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2) cbo_t2 
on cbo_t1.key=p right outer join
 (select key as a, c_int as b, cbo_t3.c_float as c from cbo_t3) cbo_t3 on 
cbo_t1.key=a
 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-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -648,11 +660,23 @@ PREHOOK: query: explain select key, c_int, cbo_t2.p, 
cbo_t2.q, cbo_t3.x, cbo_t4.
 (select cbo_t3.key as x, cbo_t3.c_int as y, c_float as z from cbo_t3) cbo_t3 
on cbo_t1.key=x left outer join
 (select key as a, c_int as b, c_float as c from cbo_t1) cbo_t4 on cbo_t1.key=a
 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 key, c_int, cbo_t2.p, cbo_t2.q, cbo_t3.x, 
cbo_t4.b from cbo_t1 join
 (select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2) cbo_t2 
on cbo_t1.key=p right outer join
 (select cbo_t3.key as x, cbo_t3.c_int as y, c_float as z from cbo_t3) cbo_t3 
on cbo_t1.key=x left outer join
 (select key as a, c_int as b, c_float as c from cbo_t1) cbo_t4 on cbo_t1.key=a
 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-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/cbo_rp_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_join1.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
index c5ec00d..1e0eaa6 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_join1.q.out
@@ -17,8 +17,12 @@ POSTHOOK: Output: default@myinput1_n0
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND b.key = 40
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND b.key = 40
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -120,8 +124,12 @@ POSTHOOK: Input: default@myinput1_n0
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND a.value = 40 AND 
a.key = a.value AND b.key = 40
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND a.value = 40 AND 
a.key = a.value AND b.key = 40
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -223,8 +231,12 @@ POSTHOOK: Input: default@myinput1_n0
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND a.key = b.key AND 
b.key = 40
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key = 40 AND a.key = b.key AND 
b.key = 40
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -326,8 +338,12 @@ POSTHOOK: Input: default@myinput1_n0
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key > 40 AND a.value > 50 AND 
a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM 
myinput1_n0 a FULL OUTER JOIN myinput1_n0 b on a.key > 40 AND a.value > 50 AND 
a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_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/b356aae0/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
index f7123b9..96e10f4 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
@@ -7,6 +7,11 @@ PREHOOK: query: EXPLAIN EXTENDED
  SELECT a.key, a.value, b.key, b.value
  WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
  FROM 
   src a
@@ -16,6 +21,11 @@ POSTHOOK: query: EXPLAIN EXTENDED
  SELECT a.key, a.value, b.key, b.value
  WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -309,6 +319,11 @@ PREHOOK: query: EXPLAIN EXTENDED
  SELECT a.key, a.value, b.key, b.value
  WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25 AND b.ds = 
'2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
  FROM 
   src a
@@ -318,6 +333,11 @@ POSTHOOK: query: EXPLAIN EXTENDED
  SELECT a.key, a.value, b.key, b.value
  WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25 AND b.ds = 
'2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/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/b356aae0/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 469fbaa..5d03ac8 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-0 is a root stage
 
@@ -768,9 +774,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-0 is a root stage
 
@@ -794,9 +806,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-0 is a root stage
 
@@ -820,9 +838,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-0 is a root stage
 
@@ -846,9 +870,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-0 is a root stage
 
@@ -872,9 +902,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-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/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/b356aae0/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 a44388c..791d3bf 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-0 is a root stage
 
@@ -768,9 +774,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-0 is a root stage
 
@@ -794,9 +806,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-0 is a root stage
 
@@ -820,9 +838,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-0 is a root stage
 
@@ -846,9 +870,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-0 is a root stage
 
@@ -872,9 +902,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-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/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 5552cfe..58daf9b 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
@@ -148,8 +158,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/b356aae0/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/b356aae0/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 4b0aaab..fb97eb6 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/b356aae0/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/b356aae0/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/b356aae0/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 1d01c7b..5b5f699 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
@@ -93,9 +103,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
@@ -282,9 +302,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
@@ -342,9 +372,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
@@ -493,9 +533,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
@@ -603,9 +653,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
@@ -717,9 +781,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

Reply via email to