http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/annotate_stats_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_part.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_part.q.out
index ec74ee2..6783102 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_part.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_part.q.out
@@ -42,8 +42,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@loc_orc_n4
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -78,8 +82,16 @@ POSTHOOK: Lineage: loc_orc_n4 
PARTITION(year=__HIVE_DEFAULT_PARTITION__).state S
 POSTHOOK: Lineage: loc_orc_n4 PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip 
SIMPLE [(loc_staging_n4)loc_staging_n4.FieldSchema(name:zip, type:bigint, 
comment:null), ]
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -109,8 +121,14 @@ POSTHOOK: Output: default@loc_orc_n4
 POSTHOOK: Output: default@loc_orc_n4@year=2001
 PREHOOK: query: explain select * from loc_orc_n4 where 
year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where 
year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -130,8 +148,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -151,8 +177,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4 where year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -184,8 +216,14 @@ POSTHOOK: Output: default@loc_orc_n4@year=2001
 POSTHOOK: Output: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
 PREHOOK: query: explain select * from loc_orc_n4 where 
year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where 
year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -205,8 +243,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -226,8 +272,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4 where year='2001' or 
year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where year='2001' or 
year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -247,8 +301,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4 where year='2001' and 
year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4 where year='2001' and 
year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -285,8 +343,16 @@ POSTHOOK: Output: default@loc_orc_n4@year=2001
 #### A masked pattern was here ####
 PREHOOK: query: explain select zip from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select zip from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -306,8 +372,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -327,8 +401,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select year from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select year from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -348,8 +430,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -369,8 +459,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n4 where year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n4 where year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -390,8 +486,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select state,locid from loc_orc_n4 where year!='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state,locid from loc_orc_n4 where year!='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -411,8 +513,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+PREHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+POSTHOOK: Input: default@loc_orc_n4@year=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -432,8 +542,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select locid from loc_orc_n4 where locid>0 and 
year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select locid from loc_orc_n4 where locid>0 and 
year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -456,8 +572,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select locid,year from loc_orc_n4 where locid>0 and 
year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select locid,year from loc_orc_n4 where locid>0 and 
year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -480,8 +602,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from (select locid,year from loc_orc_n4) test 
where locid>0 and year='2001'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n4
+PREHOOK: Input: default@loc_orc_n4@year=2001
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select locid,year from loc_orc_n4) 
test where locid>0 and year='2001'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n4
+POSTHOOK: Input: default@loc_orc_n4@year=2001
+#### 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/annotate_stats_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_select.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_select.q.out
index b740f99..fdb6623 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_select.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_select.q.out
@@ -91,8 +91,12 @@ POSTHOOK: Lineage: alltypes_orc.ts1 SIMPLE 
[(alltypes)alltypes.FieldSchema(name:
 POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE 
[(alltypes)alltypes.FieldSchema(name:vc1, type:varchar(5), comment:null), ]
 PREHOOK: query: explain select * from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -122,8 +126,12 @@ POSTHOOK: Output: default@alltypes_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -143,8 +151,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select bo1 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select bo1 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -164,8 +176,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select i1 as int1 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select i1 as int1 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -185,8 +201,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select s1 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select s1 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -206,8 +226,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select m1 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select m1 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -227,8 +251,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select bo1, ti1, si1, i1, bi1, f1, d1,s1 from 
alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select bo1, ti1, si1, i1, bi1, f1, d1,s1 from 
alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -248,8 +276,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select null from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select null from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -269,8 +301,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 11 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 11 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -290,8 +326,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 11L from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 11L from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -311,8 +351,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select 11.0 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 11.0 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -332,8 +376,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select "hello" from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select "hello" from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -353,8 +401,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("hello" as char(5)) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("hello" as char(5)) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -374,8 +426,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("hello" as varchar(5)) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("hello" as varchar(5)) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -395,8 +451,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select unbase64("0xe23") from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select unbase64("0xe23") from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -416,8 +476,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("1" as TINYINT), cast("20" as SMALLINT) 
from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("1" as TINYINT), cast("20" as SMALLINT) 
from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -437,8 +501,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("1970-12-31 15:59:58.174" as TIMESTAMP) 
from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("1970-12-31 15:59:58.174" as TIMESTAMP) 
from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -458,8 +526,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("1970-12-31 15:59:58.174" as DATE) from 
alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("1970-12-31 15:59:58.174" as DATE) from 
alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -479,8 +551,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select cast("58.174" as DECIMAL) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast("58.174" as DECIMAL) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -500,8 +576,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select array(1,2,3) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select array(1,2,3) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -533,8 +613,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select str_to_map("a=1 b=2 c=3", " ", "=") from 
alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select str_to_map("a=1 b=2 c=3", " ", "=") from 
alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -566,8 +650,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select NAMED_STRUCT("a", 11, "b", 11) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select NAMED_STRUCT("a", 11, "b", 11) from 
alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -599,8 +687,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select CREATE_UNION(0, "hello") from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select CREATE_UNION(0, "hello") from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -632,8 +724,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select count(*) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -646,8 +742,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select count(1) from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -660,8 +760,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select *,11 from alltypes_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select *,11 from alltypes_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -681,8 +785,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select i1 from (select i1 from alltypes_orc limit 10) 
temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select i1 from (select i1 from alltypes_orc limit 10) 
temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -705,8 +813,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select i1 from (select i1,11 from alltypes_orc limit 
10) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select i1 from (select i1,11 from alltypes_orc limit 
10) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -729,8 +841,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select i1,"hello" from (select i1,11 from alltypes_orc 
limit 10) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select i1,"hello" from (select i1,11 from 
alltypes_orc limit 10) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -782,8 +898,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select x from (select i1,11.0 as x from alltypes_orc 
limit 10) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select x from (select i1,11.0 as x from alltypes_orc 
limit 10) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -828,8 +948,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select x,"hello" from (select i1 as x, 
unbase64("0xe23") as ub from alltypes_orc limit 10) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select x,"hello" from (select i1 as x, 
unbase64("0xe23") as ub from alltypes_orc limit 10) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -881,8 +1005,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select h, 11.0 from (select hell as h from (select i1, 
"hello" as hell from alltypes_orc limit 10) in1 limit 10) in2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select h, 11.0 from (select hell as h from (select 
i1, "hello" as hell from alltypes_orc limit 10) in1 limit 10) in2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -927,8 +1055,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select bo1 from alltypes_orc where bo1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select bo1 from alltypes_orc where bo1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -963,8 +1095,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select bo1 from alltypes_orc where !bo1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select bo1 from alltypes_orc where !bo1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypes_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/annotate_stats_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_table.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_table.q.out
index 9604208..d7f7b22 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_table.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_table.q.out
@@ -30,8 +30,12 @@ POSTHOOK: Input: default@emp_orc
 POSTHOOK: Output: default@emp_orc
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -69,8 +73,12 @@ POSTHOOK: Lineage: emp_orc.deptid SIMPLE 
[(emp_staging)emp_staging.FieldSchema(n
 POSTHOOK: Lineage: emp_orc.lastname SIMPLE 
[(emp_staging)emp_staging.FieldSchema(name:lastname, type:string, 
comment:null), ]
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -98,8 +106,12 @@ POSTHOOK: Input: default@emp_orc
 POSTHOOK: Output: default@emp_orc
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -129,8 +141,12 @@ POSTHOOK: Output: default@emp_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -150,8 +166,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select deptid from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select deptid from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -181,8 +201,12 @@ POSTHOOK: Output: default@emp_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -202,8 +226,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select lastname from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select lastname from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -223,8 +251,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select deptid from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select deptid from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -244,8 +276,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select lastname,deptid from emp_orc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 POSTHOOK: query: explain select lastname,deptid from emp_orc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@emp_orc
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -276,8 +312,14 @@ POSTHOOK: Output: default@tmp_n0
 POSTHOOK: Lineage: tmp_n0._c0 SIMPLE []
 PREHOOK: query: explain create table tmp_n0 as select 1
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_n0
 POSTHOOK: query: explain create table tmp_n0 as select 1
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@tmp_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1 , consists of Stage-3, Stage-2, Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/annotate_stats_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_union.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_union.q.out
index 11f8015..92108f2 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_union.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_union.q.out
@@ -64,8 +64,12 @@ POSTHOOK: Output: default@loc_orc_n3
 #### A masked pattern was here ####
 PREHOOK: query: explain select state from loc_orc_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select state from loc_orc_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -85,8 +89,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from (select state from loc_orc_n3 union all 
select state from loc_orc_n3) tmp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select state from loc_orc_n3 union all 
select state from loc_orc_n3) tmp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -136,8 +144,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from loc_orc_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from loc_orc_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -157,8 +169,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from (select * from loc_orc_n3 union all 
select * from loc_orc_n3) tmp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select * from loc_orc_n3 union all 
select * from loc_orc_n3) tmp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -302,8 +318,14 @@ POSTHOOK: Input: test@loc_orc_n3
 POSTHOOK: Output: test@loc_orc_n3
 PREHOOK: query: explain select * from (select state from default.loc_orc_n3 
union all select state from test.loc_orc_n3) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: default@loc_orc_n3
+PREHOOK: Input: test@loc_orc_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select state from default.loc_orc_n3 
union all select state from test.loc_orc_n3) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@loc_orc_n3
+POSTHOOK: Input: test@loc_orc_n3
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -353,8 +375,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from (select state from test.loc_staging_n3 
union all select state from test.loc_orc_n3) temp
 PREHOOK: type: QUERY
+PREHOOK: Input: test@loc_orc_n3
+PREHOOK: Input: test@loc_staging_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select state from test.loc_staging_n3 
union all select state from test.loc_orc_n3) temp
 POSTHOOK: type: QUERY
+POSTHOOK: Input: test@loc_orc_n3
+POSTHOOK: Input: test@loc_staging_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/ansi_sql_arithmetic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ansi_sql_arithmetic.q.out 
b/ql/src/test/results/clientpositive/ansi_sql_arithmetic.q.out
index 8aaa253..abafa97 100644
--- a/ql/src/test/results/clientpositive/ansi_sql_arithmetic.q.out
+++ b/ql/src/test/results/clientpositive/ansi_sql_arithmetic.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select cast(key as int) / cast(key as int) from src 
limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast(key as int) / cast(key as int) from src 
limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -46,8 +50,12 @@ POSTHOOK: Input: default@src
 1.00000000000
 PREHOOK: query: explain select cast(key as int) / cast(key as int) from src 
limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select cast(key as int) / cast(key as int) from src 
limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out 
b/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out
index 7442c05..b073af1 100644
--- a/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out
+++ b/ql/src/test/results/clientpositive/array_map_access_nonconstant.q.out
@@ -19,9 +19,13 @@ POSTHOOK: Lineage: array_table.index EXPRESSION 
[(src)src.FieldSchema(name:key,
 PREHOOK: query: explain
 select index, `array`[index] from array_table
 PREHOOK: type: QUERY
+PREHOOK: Input: default@array_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select index, `array`[index] from array_table
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@array_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -72,9 +76,13 @@ POSTHOOK: Lineage: map_table.key EXPRESSION 
[(src)src.FieldSchema(name:key, type
 PREHOOK: query: explain
 select key, data[key] from map_table
 PREHOOK: type: QUERY
+PREHOOK: Input: default@map_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, data[key] from map_table
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@map_table
+#### 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/array_size_estimation.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/array_size_estimation.q.out 
b/ql/src/test/results/clientpositive/array_size_estimation.q.out
index 77a68b5..0016672 100644
--- a/ql/src/test/results/clientpositive/array_size_estimation.q.out
+++ b/ql/src/test/results/clientpositive/array_size_estimation.q.out
@@ -18,9 +18,13 @@ POSTHOOK: Lineage: t_n19.col SCRIPT []
 PREHOOK: query: explain
 select array("b", "d", "c", "a") FROM t_n19
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select array("b", "d", "c", "a") FROM t_n19
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -54,9 +58,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select array("b", "d", "c", col) FROM t_n19
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select array("b", "d", "c", col) FROM t_n19
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -90,9 +98,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select sort_array(array("b", "d", "c", "a")),array("1","2") FROM t_n19
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sort_array(array("b", "d", "c", "a")),array("1","2") FROM t_n19
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -126,9 +138,13 @@ STAGE PLANS:
 PREHOOK: query: explain
 select sort_array(array("b", "d", "c", col)),array("1","2") FROM t_n19
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n19
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sort_array(array("b", "d", "c", col)),array("1","2") FROM t_n19
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n19
+#### 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/authorization_alter_table_exchange_partition.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out
 
b/ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out
index e838056..028f94e 100644
--- 
a/ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out
+++ 
b/ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out
@@ -61,8 +61,12 @@ default      exchange_partition_test_2                       
user2   USER    SELECT  true    -1      user1
 default        exchange_partition_test_2                       user2   USER    
UPDATE  true    -1      user1
 PREHOOK: query: explain authorization alter table exchange_partition_test_2 
exchange partition (b=1) with table exchange_partition_test_1
 PREHOOK: type: ALTERTABLE_EXCHANGEPARTITION
+PREHOOK: Input: default@exchange_partition_test_1
+PREHOOK: Output: default@exchange_partition_test_2
 POSTHOOK: query: explain authorization alter table exchange_partition_test_2 
exchange partition (b=1) with table exchange_partition_test_1
 POSTHOOK: type: ALTERTABLE_EXCHANGEPARTITION
+POSTHOOK: Input: default@exchange_partition_test_1
+POSTHOOK: Output: default@exchange_partition_test_2
 INPUTS: 
   default@exchange_partition_test_1
 OUTPUTS: 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/authorization_explain.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/authorization_explain.q.out 
b/ql/src/test/results/clientpositive/authorization_explain.q.out
index 851b845..61551f4 100644
--- a/ql/src/test/results/clientpositive/authorization_explain.q.out
+++ b/ql/src/test/results/clientpositive/authorization_explain.q.out
@@ -1,8 +1,22 @@
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain authorization select * from src join srcpart
 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
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain authorization select * from src join srcpart
 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
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 INPUTS: 
   default@src
   default@srcpart
@@ -19,13 +33,28 @@ OPERATION:
 Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain formatted authorization select * from src join srcpart
 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
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain formatted authorization select * from src join srcpart
 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
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 PREHOOK: query: explain authorization use default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: explain authorization use default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 INPUTS: 
   database:default
 OUTPUTS: 
@@ -35,6 +64,8 @@ OPERATION:
   SWITCHDATABASE
 PREHOOK: query: explain formatted authorization use default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: explain formatted authorization use default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 
{"INPUTS":["database:default"],"OUTPUTS":[],"CURRENT_USER":"hive_test_user","OPERATION":"SWITCHDATABASE"}

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/authorization_wm.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/authorization_wm.q.out 
b/ql/src/test/results/clientpositive/authorization_wm.q.out
index 405a4a4..5d4936f 100644
--- a/ql/src/test/results/clientpositive/authorization_wm.q.out
+++ b/ql/src/test/results/clientpositive/authorization_wm.q.out
@@ -1,5 +1,6 @@
 PREHOOK: query: explain authorization create resource plan rp
 PREHOOK: type: CREATE RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create resource plan rp
 POSTHOOK: type: CREATE RESOURCEPLAN
 INPUTS: 
@@ -18,6 +19,7 @@ POSTHOOK: query: set role ADMIN
 POSTHOOK: type: SHOW_ROLES
 PREHOOK: query: explain authorization create resource plan rp
 PREHOOK: type: CREATE RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create resource plan rp
 POSTHOOK: type: CREATE RESOURCEPLAN
 INPUTS: 
@@ -34,6 +36,7 @@ POSTHOOK: query: create resource plan rp
 POSTHOOK: type: CREATE RESOURCEPLAN
 PREHOOK: query: explain authorization show resource plans
 PREHOOK: type: SHOW RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization show resource plans
 POSTHOOK: type: SHOW RESOURCEPLAN
 INPUTS: 
@@ -47,6 +50,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation SHOW_RESOURCEPLAN [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization show resource plan rp
 PREHOOK: type: SHOW RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization show resource plan rp
 POSTHOOK: type: SHOW RESOURCEPLAN
 INPUTS: 
@@ -60,6 +64,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation SHOW_RESOURCEPLAN [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization alter resource plan rp set 
query_parallelism = 5
 PREHOOK: type: ALTER RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter resource plan rp set 
query_parallelism = 5
 POSTHOOK: type: ALTER RESOURCEPLAN
 INPUTS: 
@@ -73,6 +78,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation ALTER_RESOURCEPLAN [ADMIN PRIVILEGE on 
INPUT, ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization drop resource plan rp
 PREHOOK: type: DROP RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop resource plan rp
 POSTHOOK: type: DROP RESOURCEPLAN
 INPUTS: 
@@ -86,6 +92,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation DROP_RESOURCEPLAN [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization create pool rp.pool0 WITH 
ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default'
 PREHOOK: type: CREATE POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create pool rp.pool0 WITH 
ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default'
 POSTHOOK: type: CREATE POOL
 INPUTS: 
@@ -99,6 +106,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation CREATE_POOL [ADMIN PRIVILEGE on INPUT, ADMIN 
PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization create trigger rp.trigger0 WHEN 
BYTES_READ > '10GB' DO KILL
 PREHOOK: type: CREATE TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create trigger rp.trigger0 WHEN 
BYTES_READ > '10GB' DO KILL
 POSTHOOK: type: CREATE TRIGGER
 INPUTS: 
@@ -112,6 +120,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation CREATE_TRIGGER [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization create user mapping 'joe' IN rp UNMANAGED
 PREHOOK: type: CREATE MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create user mapping 'joe' IN rp 
UNMANAGED
 POSTHOOK: type: CREATE MAPPING
 INPUTS: 
@@ -136,6 +145,7 @@ POSTHOOK: query: set role ADMIN
 POSTHOOK: type: SHOW_ROLES
 PREHOOK: query: explain authorization show resource plans
 PREHOOK: type: SHOW RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization show resource plans
 POSTHOOK: type: SHOW RESOURCEPLAN
 INPUTS: 
@@ -147,6 +157,7 @@ OPERATION:
   SHOW_RESOURCEPLAN
 PREHOOK: query: explain authorization show resource plan rp
 PREHOOK: type: SHOW RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization show resource plan rp
 POSTHOOK: type: SHOW RESOURCEPLAN
 INPUTS: 
@@ -158,6 +169,7 @@ OPERATION:
   SHOW_RESOURCEPLAN
 PREHOOK: query: explain authorization alter resource plan rp set 
query_parallelism = 5
 PREHOOK: type: ALTER RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter resource plan rp set 
query_parallelism = 5
 POSTHOOK: type: ALTER RESOURCEPLAN
 INPUTS: 
@@ -169,6 +181,7 @@ OPERATION:
   ALTER_RESOURCEPLAN
 PREHOOK: query: explain authorization drop resource plan rp
 PREHOOK: type: DROP RESOURCEPLAN
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop resource plan rp
 POSTHOOK: type: DROP RESOURCEPLAN
 INPUTS: 
@@ -180,6 +193,7 @@ OPERATION:
   DROP_RESOURCEPLAN
 PREHOOK: query: explain authorization create pool rp.pool0 WITH 
ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default'
 PREHOOK: type: CREATE POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create pool rp.pool0 WITH 
ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default'
 POSTHOOK: type: CREATE POOL
 INPUTS: 
@@ -191,6 +205,7 @@ OPERATION:
   CREATE_POOL
 PREHOOK: query: explain authorization create trigger rp.trigger0 WHEN 
BYTES_READ > '10GB' DO KILL
 PREHOOK: type: CREATE TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create trigger rp.trigger0 WHEN 
BYTES_READ > '10GB' DO KILL
 POSTHOOK: type: CREATE TRIGGER
 INPUTS: 
@@ -202,6 +217,7 @@ OPERATION:
   CREATE_TRIGGER
 PREHOOK: query: explain authorization create user mapping 'joe' IN rp UNMANAGED
 PREHOOK: type: CREATE MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization create user mapping 'joe' IN rp 
UNMANAGED
 POSTHOOK: type: CREATE MAPPING
 INPUTS: 
@@ -257,6 +273,7 @@ POSTHOOK: query: create user mapping 'joe' IN rp UNMANAGED
 POSTHOOK: type: CREATE MAPPING
 PREHOOK: query: explain authorization alter pool rp.pool0 SET 
QUERY_PARALLELISM=4
 PREHOOK: type: ALTER POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter pool rp.pool0 SET 
QUERY_PARALLELISM=4
 POSTHOOK: type: ALTER POOL
 INPUTS: 
@@ -270,6 +287,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation ALTER_POOL [ADMIN PRIVILEGE on INPUT, ADMIN 
PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization alter trigger rp.trigger0 WHEN 
BYTES_READ > '15GB' DO KILL
 PREHOOK: type: ALTER TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter trigger rp.trigger0 WHEN 
BYTES_READ > '15GB' DO KILL
 POSTHOOK: type: ALTER TRIGGER
 INPUTS: 
@@ -283,6 +301,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation ALTER_TRIGGER [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization alter user mapping 'joe' IN rp TO pool0
 PREHOOK: type: ALTER MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter user mapping 'joe' IN rp TO pool0
 POSTHOOK: type: ALTER MAPPING
 INPUTS: 
@@ -296,6 +315,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation ALTER_MAPPING [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization drop user mapping 'joe' IN rp
 PREHOOK: type: DROP MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop user mapping 'joe' IN rp
 POSTHOOK: type: DROP MAPPING
 INPUTS: 
@@ -309,6 +329,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation DROP_MAPPING [ADMIN PRIVILEGE on INPUT, 
ADMIN PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization drop pool rp.pool0
 PREHOOK: type: DROP POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop pool rp.pool0
 POSTHOOK: type: DROP POOL
 INPUTS: 
@@ -322,6 +343,7 @@ AUTHORIZATION_FAILURES:
   Permission denied: Principal [name=ruser1, type=USER] does not have 
following privileges for operation DROP_POOL [ADMIN PRIVILEGE on INPUT, ADMIN 
PRIVILEGE on OUTPUT]
 PREHOOK: query: explain authorization drop trigger rp.trigger0
 PREHOOK: type: DROP TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop trigger rp.trigger0
 POSTHOOK: type: DROP TRIGGER
 INPUTS: 
@@ -345,6 +367,7 @@ POSTHOOK: query: set role ADMIN
 POSTHOOK: type: SHOW_ROLES
 PREHOOK: query: explain authorization alter pool rp.pool0 SET 
QUERY_PARALLELISM=4
 PREHOOK: type: ALTER POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter pool rp.pool0 SET 
QUERY_PARALLELISM=4
 POSTHOOK: type: ALTER POOL
 INPUTS: 
@@ -356,6 +379,7 @@ OPERATION:
   ALTER_POOL
 PREHOOK: query: explain authorization alter trigger rp.trigger0 WHEN 
BYTES_READ > '15GB' DO KILL
 PREHOOK: type: ALTER TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter trigger rp.trigger0 WHEN 
BYTES_READ > '15GB' DO KILL
 POSTHOOK: type: ALTER TRIGGER
 INPUTS: 
@@ -367,6 +391,7 @@ OPERATION:
   ALTER_TRIGGER
 PREHOOK: query: explain authorization alter user mapping 'joe' IN rp TO pool0
 PREHOOK: type: ALTER MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization alter user mapping 'joe' IN rp TO pool0
 POSTHOOK: type: ALTER MAPPING
 INPUTS: 
@@ -378,6 +403,7 @@ OPERATION:
   ALTER_MAPPING
 PREHOOK: query: explain authorization drop user mapping 'joe' IN rp
 PREHOOK: type: DROP MAPPING
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop user mapping 'joe' IN rp
 POSTHOOK: type: DROP MAPPING
 INPUTS: 
@@ -389,6 +415,7 @@ OPERATION:
   DROP_MAPPING
 PREHOOK: query: explain authorization drop pool rp.pool0
 PREHOOK: type: DROP POOL
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop pool rp.pool0
 POSTHOOK: type: DROP POOL
 INPUTS: 
@@ -400,6 +427,7 @@ OPERATION:
   DROP_POOL
 PREHOOK: query: explain authorization drop trigger rp.trigger0
 PREHOOK: type: DROP TRIGGER
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain authorization drop trigger rp.trigger0
 POSTHOOK: type: DROP TRIGGER
 INPUTS: 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/autoColumnStats_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_1.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_1.q.out
index 4e596bf..487b342 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_1.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_1.q.out
@@ -22,8 +22,12 @@ POSTHOOK: Lineage: src_multi1_n1.key SIMPLE 
[(src)src.FieldSchema(name:key, type
 POSTHOOK: Lineage: src_multi1_n1.value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain extended select * from src_multi1_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_multi1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from src_multi1_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_multi1_n1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src_multi1_n1`
 STAGE DEPENDENCIES:
@@ -480,8 +484,16 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select key from nzhang_part14_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14_n1
+PREHOOK: Input: default@nzhang_part14_n1@value= 
+PREHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14_n1
+POSTHOOK: Input: default@nzhang_part14_n1@value= 
+POSTHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -536,8 +548,26 @@ POSTHOOK: Lineage: nzhang_part14_n1 
PARTITION(value=val_311).key SIMPLE [(src5_n
 POSTHOOK: Lineage: nzhang_part14_n1 PARTITION(value=val_86).key SIMPLE 
[(src5_n0)src5_n0.FieldSchema(name:key, type:string, comment:null), ]
 PREHOOK: query: explain select key from nzhang_part14_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14_n1
+PREHOOK: Input: default@nzhang_part14_n1@value= 
+PREHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+PREHOOK: Input: default@nzhang_part14_n1@value=val_165
+PREHOOK: Input: default@nzhang_part14_n1@value=val_238
+PREHOOK: Input: default@nzhang_part14_n1@value=val_27
+PREHOOK: Input: default@nzhang_part14_n1@value=val_311
+PREHOOK: Input: default@nzhang_part14_n1@value=val_86
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14_n1
+POSTHOOK: Input: default@nzhang_part14_n1@value= 
+POSTHOOK: Input: default@nzhang_part14_n1@value=__HIVE_DEFAULT_PARTITION__
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_165
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_238
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_27
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_311
+POSTHOOK: Input: default@nzhang_part14_n1@value=val_86
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -650,8 +680,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select * from alter5_n0 where dt='a'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alter5_n0
+PREHOOK: Input: default@alter5_n0@dt=a
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alter5_n0 where dt='a'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alter5_n0
+POSTHOOK: Input: default@alter5_n0@dt=a
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1332,8 +1368,16 @@ POSTHOOK: Lineage: c_n2 
PARTITION(ds=2010-05-11,hr=12).key SIMPLE [(srcpart)srcp
 POSTHOOK: Lineage: c_n2 PARTITION(ds=2010-05-11,hr=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain select key from a_n12
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n12
+PREHOOK: Input: default@a_n12@ds=2010-03-11/hr=11
+PREHOOK: Input: default@a_n12@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from a_n12
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n12
+POSTHOOK: Input: default@a_n12@ds=2010-03-11/hr=11
+POSTHOOK: Input: default@a_n12@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1353,8 +1397,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from b_n9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n9
+PREHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from b_n9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n9
+POSTHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1374,8 +1424,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from b_n9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n9
+PREHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from b_n9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n9
+POSTHOOK: Input: default@b_n9@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1395,8 +1451,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from c_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n2
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from c_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n2
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1416,8 +1480,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from c_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n2
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from c_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n2
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n2@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/autoColumnStats_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_2.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_2.q.out
index ed40dc6..21866b6 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_2.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_2.q.out
@@ -22,8 +22,12 @@ POSTHOOK: Lineage: src_multi1.key SIMPLE 
[(src)src.FieldSchema(name:key, type:st
 POSTHOOK: Lineage: src_multi1.value SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
 PREHOOK: query: explain extended select * from src_multi1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_multi1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from src_multi1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_multi1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src_multi1`
 STAGE DEPENDENCIES:
@@ -477,8 +481,16 @@ POSTHOOK: Lineage: nzhang_part14 PARTITION(value= ).key 
EXPRESSION []
 POSTHOOK: Lineage: nzhang_part14 
PARTITION(value=__HIVE_DEFAULT_PARTITION__).key EXPRESSION []
 PREHOOK: query: explain select key from nzhang_part14
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14
+PREHOOK: Input: default@nzhang_part14@value= 
+PREHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14
+POSTHOOK: Input: default@nzhang_part14@value= 
+POSTHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -533,8 +545,26 @@ POSTHOOK: Lineage: nzhang_part14 
PARTITION(value=val_311).key SIMPLE [(src5)src5
 POSTHOOK: Lineage: nzhang_part14 PARTITION(value=val_86).key SIMPLE 
[(src5)src5.FieldSchema(name:key, type:string, comment:null), ]
 PREHOOK: query: explain select key from nzhang_part14
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14
+PREHOOK: Input: default@nzhang_part14@value= 
+PREHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
+PREHOOK: Input: default@nzhang_part14@value=val_165
+PREHOOK: Input: default@nzhang_part14@value=val_238
+PREHOOK: Input: default@nzhang_part14@value=val_27
+PREHOOK: Input: default@nzhang_part14@value=val_311
+PREHOOK: Input: default@nzhang_part14@value=val_86
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from nzhang_part14
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14
+POSTHOOK: Input: default@nzhang_part14@value= 
+POSTHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
+POSTHOOK: Input: default@nzhang_part14@value=val_165
+POSTHOOK: Input: default@nzhang_part14@value=val_238
+POSTHOOK: Input: default@nzhang_part14@value=val_27
+POSTHOOK: Input: default@nzhang_part14@value=val_311
+POSTHOOK: Input: default@nzhang_part14@value=val_86
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -654,8 +684,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select * from alter5 where dt='a'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alter5
+PREHOOK: Input: default@alter5@dt=a
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alter5 where dt='a'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alter5
+POSTHOOK: Input: default@alter5@dt=a
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -773,8 +809,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select * from alter5 where dt='a'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alter5
+PREHOOK: Input: default@alter5@dt=a
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from alter5 where dt='a'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alter5
+POSTHOOK: Input: default@alter5@dt=a
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1455,8 +1497,16 @@ POSTHOOK: Lineage: c_n1 
PARTITION(ds=2010-05-11,hr=12).key SIMPLE [(srcpart)srcp
 POSTHOOK: Lineage: c_n1 PARTITION(ds=2010-05-11,hr=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain select key from a_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n3
+PREHOOK: Input: default@a_n3@ds=2010-03-11/hr=11
+PREHOOK: Input: default@a_n3@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from a_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n3
+POSTHOOK: Input: default@a_n3@ds=2010-03-11/hr=11
+POSTHOOK: Input: default@a_n3@ds=2010-03-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1476,8 +1526,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from b_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n3
+PREHOOK: Input: default@b_n3@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from b_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n3
+POSTHOOK: Input: default@b_n3@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1497,8 +1553,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from b_n3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@b_n3
+PREHOOK: Input: default@b_n3@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from b_n3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@b_n3
+POSTHOOK: Input: default@b_n3@ds=2010-04-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1518,8 +1580,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select value from c_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n1
+PREHOOK: Input: default@c_n1@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n1@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select value from c_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n1
+POSTHOOK: Input: default@c_n1@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n1@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1539,8 +1609,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key from c_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@c_n1
+PREHOOK: Input: default@c_n1@ds=2010-05-11/hr=11
+PREHOOK: Input: default@c_n1@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from c_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@c_n1
+POSTHOOK: Input: default@c_n1@ds=2010-05-11/hr=11
+POSTHOOK: Input: default@c_n1@ds=2010-05-11/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_4.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
index 5e52092..fb50d0d 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
@@ -45,8 +45,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain insert into table acid_dtt select cint, cast(cstring1 
as varchar(128)) from alltypesorc where cint is not null order by cint limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc
+PREHOOK: Output: default@acid_dtt
 POSTHOOK: query: explain insert into table acid_dtt select cint, cast(cstring1 
as varchar(128)) from alltypesorc where cint is not null order by cint limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc
+POSTHOOK: Output: default@acid_dtt
 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/autoColumnStats_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_5.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_5.q.out
index 5b5b45f..f86dba1 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_5.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_5.q.out
@@ -8,8 +8,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@partitioned1_n1
 PREHOOK: query: explain insert into table partitioned1_n1 partition(part=1) 
values(1, 'original'),(2, 'original'), (3, 'original'),(4, 'original')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@partitioned1_n1@part=1
 POSTHOOK: query: explain insert into table partitioned1_n1 partition(part=1) 
values(1, 'original'),(2, 'original'), (3, 'original'),(4, 'original')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@partitioned1_n1@part=1
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -258,8 +262,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain insert into table partitioned1_n1 partition(part=2) 
values(1, 'new', 10, 'ten'),(2, 'new', 20, 'twenty'), (3, 'new', 30, 
'thirty'),(4, 'new', 40, 'forty')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@partitioned1_n1@part=2
 POSTHOOK: query: explain insert into table partitioned1_n1 partition(part=2) 
values(1, 'new', 10, 'ten'),(2, 'new', 20, 'twenty'), (3, 'new', 30, 
'thirty'),(4, 'new', 40, 'forty')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@partitioned1_n1@part=2
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -466,8 +474,12 @@ bitVector                  HL
 comment                from deserializer                                       
                                         
 PREHOOK: query: explain insert into table partitioned1_n1 partition(part=1) 
values(5, 'new', 100, 'hundred'),(6, 'new', 200, 'two hundred')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@partitioned1_n1@part=1
 POSTHOOK: query: explain insert into table partitioned1_n1 partition(part=1) 
values(5, 'new', 100, 'hundred'),(6, 'new', 200, 'two hundred')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@partitioned1_n1@part=1
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/autoColumnStats_5a.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_5a.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_5a.q.out
index c9b7019..9891aed 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_5a.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_5a.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@partitioned1
 PREHOOK: query: explain extended 
 insert into table partitioned1 partition(part=1) values(1, 'original')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@partitioned1@part=1
 POSTHOOK: query: explain extended 
 insert into table partitioned1 partition(part=1) values(1, 'original')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@partitioned1@part=1
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -430,9 +434,13 @@ Storage Desc Params:
 PREHOOK: query: explain extended 
 insert into table partitioned1 partition(part=1) values(2, 'original'), (3, 
'original'),(4, 'original')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@partitioned1@part=1
 POSTHOOK: query: explain extended 
 insert into table partitioned1 partition(part=1) values(2, 'original'), (3, 
'original'),(4, 'original')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@partitioned1@part=1
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -812,8 +820,12 @@ POSTHOOK: Lineage: partitioned1 PARTITION(part=1).b SCRIPT 
[]
 col1   col2
 PREHOOK: query: explain insert into table partitioned1 partition(part=1) 
values(1, 'original'),(2, 'original'), (3, 'original'),(4, 'original')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@partitioned1@part=1
 POSTHOOK: query: explain insert into table partitioned1 partition(part=1) 
values(1, 'original'),(2, 'original'), (3, 'original'),(4, 'original')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@partitioned1@part=1
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/autoColumnStats_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_6.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_6.q.out
index 70788fd..4887c62 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_6.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_6.q.out
@@ -19,11 +19,14 @@ PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE 
orcfile_merge2a PARTITION (one='1
         PMOD(HASH(value), 10) as three
     FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@orcfile_merge2a@one=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE orcfile_merge2a PARTITION 
(one='1', two, three)
     SELECT key, value, PMOD(HASH(key), 10) as two, 
         PMOD(HASH(value), 10) as three
     FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 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/autoColumnStats_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_7.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_7.q.out
index 8c07d61..389369a 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_7.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_7.q.out
@@ -19,9 +19,13 @@ POSTHOOK: Output: default@src_temp
 PREHOOK: query: explain FROM src_temp
 INSERT OVERWRITE TABLE dest_g2_n5 SELECT substr(src_temp.key,1,1), 
count(DISTINCT substr(src_temp.value,5)), 
concat(substr(src_temp.key,1,1),sum(substr(src_temp.value,5))) GROUP BY 
substr(src_temp.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_temp
+PREHOOK: Output: default@dest_g2_n5
 POSTHOOK: query: explain FROM src_temp
 INSERT OVERWRITE TABLE dest_g2_n5 SELECT substr(src_temp.key,1,1), 
count(DISTINCT substr(src_temp.value,5)), 
concat(substr(src_temp.key,1,1),sum(substr(src_temp.value,5))) GROUP BY 
substr(src_temp.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_temp
+POSTHOOK: Output: default@dest_g2_n5
 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/autoColumnStats_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_8.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_8.q.out
index 8bdba66..492acd2 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_8.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_8.q.out
@@ -38,11 +38,23 @@ from srcpart
 insert overwrite table nzhang_part8 partition (ds, hr) select key, value, ds, 
hr where ds <= '2008-04-08'
 insert overwrite table nzhang_part8 partition(ds='2008-12-31', hr) select key, 
value, hr where ds > '2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+PREHOOK: Output: default@nzhang_part8
+PREHOOK: Output: default@nzhang_part8@ds=2008-12-31
 POSTHOOK: query: explain extended
 from srcpart
 insert overwrite table nzhang_part8 partition (ds, hr) select key, value, ds, 
hr where ds <= '2008-04-08'
 insert overwrite table nzhang_part8 partition(ds='2008-12-31', hr) select key, 
value, hr where ds > '2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/autoColumnStats_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_9.q.out 
b/ql/src/test/results/clientpositive/autoColumnStats_9.q.out
index f2a8cdc..ff69d8b 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_9.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_9.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1_n23 SELECT src1.key, src2.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_j1_n23
 POSTHOOK: query: EXPLAIN
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1_n23 SELECT src1.key, src2.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_j1_n23
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1 , consists of Stage-7, Stage-0, Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join0.q.out 
b/ql/src/test/results/clientpositive/auto_join0.q.out
index 17fc2fd..04b976b 100644
--- a/ql/src/test/results/clientpositive/auto_join0.q.out
+++ b/ql/src/test/results/clientpositive/auto_join0.q.out
@@ -12,6 +12,8 @@ SELECT src1.key as k1, src1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select sum(hash(a.k1,a.v1,a.k2, a.v2))
 from (
@@ -23,6 +25,8 @@ SELECT src1.key as k1, src1.value as v1,
   SORT BY k1, v1, k2, v2
 ) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1, Stage-4 , consists of Stage-8, Stage-9, 
Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join1.q.out 
b/ql/src/test/results/clientpositive/auto_join1.q.out
index 2a11bc0..b1678b2 100644
--- a/ql/src/test/results/clientpositive/auto_join1.q.out
+++ b/ql/src/test/results/clientpositive/auto_join1.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1_n3 SELECT src1.key, src2.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_j1_n3
 POSTHOOK: query: explain
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1_n3 SELECT src1.key, src2.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_j1_n3
 STAGE DEPENDENCIES:
   Stage-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/auto_join10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join10.q.out 
b/ql/src/test/results/clientpositive/auto_join10.q.out
index d6c9c35..b1e2ad7 100644
--- a/ql/src/test/results/clientpositive/auto_join10.q.out
+++ b/ql/src/test/results/clientpositive/auto_join10.q.out
@@ -6,6 +6,8 @@ JOIN
 ON (x.key = Y.key)
 select sum(hash(Y.key,Y.value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 FROM 
 (SELECT src.* FROM src) x
@@ -14,6 +16,8 @@ JOIN
 ON (x.key = Y.key)
 select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-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/auto_join11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join11.q.out 
b/ql/src/test/results/clientpositive/auto_join11.q.out
index ce91122..77ef8b7 100644
--- a/ql/src/test/results/clientpositive/auto_join11.q.out
+++ b/ql/src/test/results/clientpositive/auto_join11.q.out
@@ -6,6 +6,8 @@ JOIN
 (SELECT src.key as c3, src.value as c4 from src) src2
 ON src1.c1 = src2.c3 AND src1.c1 < 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT sum(hash(src1.c1, src2.c4)) 
 FROM
@@ -14,6 +16,8 @@ JOIN
 (SELECT src.key as c3, src.value as c4 from src) src2
 ON src1.c1 = src2.c3 AND src1.c1 < 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### 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/auto_join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join12.q.out 
b/ql/src/test/results/clientpositive/auto_join12.q.out
index 8dae2ec..34b6998 100644
--- a/ql/src/test/results/clientpositive/auto_join12.q.out
+++ b/ql/src/test/results/clientpositive/auto_join12.q.out
@@ -9,6 +9,8 @@ JOIN
 (SELECT src.key as c5, src.value as c6 from src) src3
 ON src1.c1 = src3.c5 AND src3.c5 < 80
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT sum(hash(src1.c1, src2.c4)) 
 FROM
@@ -20,6 +22,8 @@ JOIN
 (SELECT src.key as c5, src.value as c6 from src) src3
 ON src1.c1 = src3.c5 AND src3.c5 < 80
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-2 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/auto_join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join13.q.out 
b/ql/src/test/results/clientpositive/auto_join13.q.out
index ab1e100..ccf1e97 100644
--- a/ql/src/test/results/clientpositive/auto_join13.q.out
+++ b/ql/src/test/results/clientpositive/auto_join13.q.out
@@ -9,6 +9,8 @@ JOIN
 (SELECT src.key as c5, src.value as c6 from src) src3
 ON src1.c1 + src2.c3 = src3.c5 AND src3.c5 < 200
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 SELECT sum(hash(src1.c1, src2.c4)) 
 FROM
@@ -20,6 +22,8 @@ JOIN
 (SELECT src.key as c5, src.value as c6 from src) src3
 ON src1.c1 + src2.c3 = src3.c5 AND src3.c5 < 200
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-3 depends on stages: Stage-8

Reply via email to