http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/partition_ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/partition_ctas.q.out 
b/ql/src/test/results/clientpositive/llap/partition_ctas.q.out
index 67c7965..8d96e26 100644
--- a/ql/src/test/results/clientpositive/llap/partition_ctas.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_ctas.q.out
@@ -2,10 +2,17 @@ PREHOOK: query: EXPLAIN
 CREATE TABLE partition_ctas_1 PARTITIONED BY (key) AS
 SELECT value, key FROM src where key > 200 and key < 300
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@partition_ctas_1
+PREHOOK: Output: default@partition_ctas_1
 POSTHOOK: query: EXPLAIN
 CREATE TABLE partition_ctas_1 PARTITIONED BY (key) AS
 SELECT value, key FROM src where key > 200 and key < 300
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@partition_ctas_1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -249,9 +256,15 @@ Storage Desc Params:
 PREHOOK: query: EXPLAIN
 SELECT * FROM partition_ctas_1 where key = 238
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_ctas_1
+PREHOOK: Input: default@partition_ctas_1@key=238
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM partition_ctas_1 where key = 238
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_ctas_1
+POSTHOOK: Input: default@partition_ctas_1@key=238
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -419,9 +432,15 @@ POSTHOOK: Lineage: partition_ctas_2 
PARTITION(value=val_298).key SIMPLE [(src)sr
 PREHOOK: query: EXPLAIN
 SELECT * FROM partition_ctas_2 where value = 'val_238'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_ctas_2
+PREHOOK: Input: default@partition_ctas_2@value=val_238
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM partition_ctas_2 where value = 'val_238'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_ctas_2
+POSTHOOK: Input: default@partition_ctas_2@value=val_238
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -452,9 +471,137 @@ POSTHOOK: Input: default@partition_ctas_2@value=val_238
 PREHOOK: query: EXPLAIN
 SELECT value FROM partition_ctas_2 where key = 238
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_ctas_2
+PREHOOK: Input: default@partition_ctas_2@value=val_201
+PREHOOK: Input: default@partition_ctas_2@value=val_202
+PREHOOK: Input: default@partition_ctas_2@value=val_203
+PREHOOK: Input: default@partition_ctas_2@value=val_205
+PREHOOK: Input: default@partition_ctas_2@value=val_207
+PREHOOK: Input: default@partition_ctas_2@value=val_208
+PREHOOK: Input: default@partition_ctas_2@value=val_209
+PREHOOK: Input: default@partition_ctas_2@value=val_213
+PREHOOK: Input: default@partition_ctas_2@value=val_214
+PREHOOK: Input: default@partition_ctas_2@value=val_216
+PREHOOK: Input: default@partition_ctas_2@value=val_217
+PREHOOK: Input: default@partition_ctas_2@value=val_218
+PREHOOK: Input: default@partition_ctas_2@value=val_219
+PREHOOK: Input: default@partition_ctas_2@value=val_221
+PREHOOK: Input: default@partition_ctas_2@value=val_222
+PREHOOK: Input: default@partition_ctas_2@value=val_223
+PREHOOK: Input: default@partition_ctas_2@value=val_224
+PREHOOK: Input: default@partition_ctas_2@value=val_226
+PREHOOK: Input: default@partition_ctas_2@value=val_228
+PREHOOK: Input: default@partition_ctas_2@value=val_229
+PREHOOK: Input: default@partition_ctas_2@value=val_230
+PREHOOK: Input: default@partition_ctas_2@value=val_233
+PREHOOK: Input: default@partition_ctas_2@value=val_235
+PREHOOK: Input: default@partition_ctas_2@value=val_237
+PREHOOK: Input: default@partition_ctas_2@value=val_238
+PREHOOK: Input: default@partition_ctas_2@value=val_239
+PREHOOK: Input: default@partition_ctas_2@value=val_241
+PREHOOK: Input: default@partition_ctas_2@value=val_242
+PREHOOK: Input: default@partition_ctas_2@value=val_244
+PREHOOK: Input: default@partition_ctas_2@value=val_247
+PREHOOK: Input: default@partition_ctas_2@value=val_248
+PREHOOK: Input: default@partition_ctas_2@value=val_249
+PREHOOK: Input: default@partition_ctas_2@value=val_252
+PREHOOK: Input: default@partition_ctas_2@value=val_255
+PREHOOK: Input: default@partition_ctas_2@value=val_256
+PREHOOK: Input: default@partition_ctas_2@value=val_257
+PREHOOK: Input: default@partition_ctas_2@value=val_258
+PREHOOK: Input: default@partition_ctas_2@value=val_260
+PREHOOK: Input: default@partition_ctas_2@value=val_262
+PREHOOK: Input: default@partition_ctas_2@value=val_263
+PREHOOK: Input: default@partition_ctas_2@value=val_265
+PREHOOK: Input: default@partition_ctas_2@value=val_266
+PREHOOK: Input: default@partition_ctas_2@value=val_272
+PREHOOK: Input: default@partition_ctas_2@value=val_273
+PREHOOK: Input: default@partition_ctas_2@value=val_274
+PREHOOK: Input: default@partition_ctas_2@value=val_275
+PREHOOK: Input: default@partition_ctas_2@value=val_277
+PREHOOK: Input: default@partition_ctas_2@value=val_278
+PREHOOK: Input: default@partition_ctas_2@value=val_280
+PREHOOK: Input: default@partition_ctas_2@value=val_281
+PREHOOK: Input: default@partition_ctas_2@value=val_282
+PREHOOK: Input: default@partition_ctas_2@value=val_283
+PREHOOK: Input: default@partition_ctas_2@value=val_284
+PREHOOK: Input: default@partition_ctas_2@value=val_285
+PREHOOK: Input: default@partition_ctas_2@value=val_286
+PREHOOK: Input: default@partition_ctas_2@value=val_287
+PREHOOK: Input: default@partition_ctas_2@value=val_288
+PREHOOK: Input: default@partition_ctas_2@value=val_289
+PREHOOK: Input: default@partition_ctas_2@value=val_291
+PREHOOK: Input: default@partition_ctas_2@value=val_292
+PREHOOK: Input: default@partition_ctas_2@value=val_296
+PREHOOK: Input: default@partition_ctas_2@value=val_298
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT value FROM partition_ctas_2 where key = 238
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_ctas_2
+POSTHOOK: Input: default@partition_ctas_2@value=val_201
+POSTHOOK: Input: default@partition_ctas_2@value=val_202
+POSTHOOK: Input: default@partition_ctas_2@value=val_203
+POSTHOOK: Input: default@partition_ctas_2@value=val_205
+POSTHOOK: Input: default@partition_ctas_2@value=val_207
+POSTHOOK: Input: default@partition_ctas_2@value=val_208
+POSTHOOK: Input: default@partition_ctas_2@value=val_209
+POSTHOOK: Input: default@partition_ctas_2@value=val_213
+POSTHOOK: Input: default@partition_ctas_2@value=val_214
+POSTHOOK: Input: default@partition_ctas_2@value=val_216
+POSTHOOK: Input: default@partition_ctas_2@value=val_217
+POSTHOOK: Input: default@partition_ctas_2@value=val_218
+POSTHOOK: Input: default@partition_ctas_2@value=val_219
+POSTHOOK: Input: default@partition_ctas_2@value=val_221
+POSTHOOK: Input: default@partition_ctas_2@value=val_222
+POSTHOOK: Input: default@partition_ctas_2@value=val_223
+POSTHOOK: Input: default@partition_ctas_2@value=val_224
+POSTHOOK: Input: default@partition_ctas_2@value=val_226
+POSTHOOK: Input: default@partition_ctas_2@value=val_228
+POSTHOOK: Input: default@partition_ctas_2@value=val_229
+POSTHOOK: Input: default@partition_ctas_2@value=val_230
+POSTHOOK: Input: default@partition_ctas_2@value=val_233
+POSTHOOK: Input: default@partition_ctas_2@value=val_235
+POSTHOOK: Input: default@partition_ctas_2@value=val_237
+POSTHOOK: Input: default@partition_ctas_2@value=val_238
+POSTHOOK: Input: default@partition_ctas_2@value=val_239
+POSTHOOK: Input: default@partition_ctas_2@value=val_241
+POSTHOOK: Input: default@partition_ctas_2@value=val_242
+POSTHOOK: Input: default@partition_ctas_2@value=val_244
+POSTHOOK: Input: default@partition_ctas_2@value=val_247
+POSTHOOK: Input: default@partition_ctas_2@value=val_248
+POSTHOOK: Input: default@partition_ctas_2@value=val_249
+POSTHOOK: Input: default@partition_ctas_2@value=val_252
+POSTHOOK: Input: default@partition_ctas_2@value=val_255
+POSTHOOK: Input: default@partition_ctas_2@value=val_256
+POSTHOOK: Input: default@partition_ctas_2@value=val_257
+POSTHOOK: Input: default@partition_ctas_2@value=val_258
+POSTHOOK: Input: default@partition_ctas_2@value=val_260
+POSTHOOK: Input: default@partition_ctas_2@value=val_262
+POSTHOOK: Input: default@partition_ctas_2@value=val_263
+POSTHOOK: Input: default@partition_ctas_2@value=val_265
+POSTHOOK: Input: default@partition_ctas_2@value=val_266
+POSTHOOK: Input: default@partition_ctas_2@value=val_272
+POSTHOOK: Input: default@partition_ctas_2@value=val_273
+POSTHOOK: Input: default@partition_ctas_2@value=val_274
+POSTHOOK: Input: default@partition_ctas_2@value=val_275
+POSTHOOK: Input: default@partition_ctas_2@value=val_277
+POSTHOOK: Input: default@partition_ctas_2@value=val_278
+POSTHOOK: Input: default@partition_ctas_2@value=val_280
+POSTHOOK: Input: default@partition_ctas_2@value=val_281
+POSTHOOK: Input: default@partition_ctas_2@value=val_282
+POSTHOOK: Input: default@partition_ctas_2@value=val_283
+POSTHOOK: Input: default@partition_ctas_2@value=val_284
+POSTHOOK: Input: default@partition_ctas_2@value=val_285
+POSTHOOK: Input: default@partition_ctas_2@value=val_286
+POSTHOOK: Input: default@partition_ctas_2@value=val_287
+POSTHOOK: Input: default@partition_ctas_2@value=val_288
+POSTHOOK: Input: default@partition_ctas_2@value=val_289
+POSTHOOK: Input: default@partition_ctas_2@value=val_291
+POSTHOOK: Input: default@partition_ctas_2@value=val_292
+POSTHOOK: Input: default@partition_ctas_2@value=val_296
+POSTHOOK: Input: default@partition_ctas_2@value=val_298
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -746,9 +893,15 @@ POSTHOOK: Lineage: partition_ctas_diff_order 
PARTITION(value=val_298).key SIMPLE
 PREHOOK: query: EXPLAIN
 SELECT * FROM partition_ctas_diff_order where value = 'val_238'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_ctas_diff_order
+PREHOOK: Input: default@partition_ctas_diff_order@value=val_238
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM partition_ctas_diff_order where value = 'val_238'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_ctas_diff_order
+POSTHOOK: Input: default@partition_ctas_diff_order@value=val_238
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -908,9 +1061,15 @@ POSTHOOK: Lineage: partition_ctas_complex_order 
PARTITION(c0=val_239_0,c4=val_23
 PREHOOK: query: EXPLAIN
 SELECT * FROM partition_ctas_complex_order where c0 = 'val_238_0'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_ctas_complex_order
+PREHOOK: Input: 
default@partition_ctas_complex_order@c0=val_238_0/c4=val_238_4/c1=val_238_1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM partition_ctas_complex_order where c0 = 'val_238_0'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_ctas_complex_order
+POSTHOOK: Input: 
default@partition_ctas_complex_order@c0=val_238_0/c4=val_238_4/c1=val_238_1
+#### 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/llap/partition_multilevels.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out 
b/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
index 3df6e2f..1bbdc21 100644
--- a/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
@@ -964,8 +964,24 @@ POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3
 2222   333     11      19
 PREHOOK: query: explain select level1, level2, level3, count(*) from 
partition_test_multilevel where (level1 = '2222') and (level2 between '222' and 
'333') and (level3 between '11' and '33') group by level1, level2, level3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_test_multilevel
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=11
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=22
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=33
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=11
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=22
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=33
+#### A masked pattern was here ####
 POSTHOOK: query: explain select level1, level2, level3, count(*) from 
partition_test_multilevel where (level1 = '2222') and (level2 between '222' and 
'333') and (level3 between '11' and '33') group by level1, level2, level3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_test_multilevel
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=11
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=22
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=33
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=11
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=22
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=33
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1554,8 +1570,24 @@ POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3
 2222   333     11      19
 PREHOOK: query: explain select level1, level2, level3, count(*) from 
partition_test_multilevel where (level1 = '2222') and (level2 between '222' and 
'333') and (level3 between '11' and '33') group by level1, level2, level3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_test_multilevel
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=11
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=22
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=33
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=11
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=22
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=33
+#### A masked pattern was here ####
 POSTHOOK: query: explain select level1, level2, level3, count(*) from 
partition_test_multilevel where (level1 = '2222') and (level2 between '222' and 
'333') and (level3 between '11' and '33') group by level1, level2, level3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_test_multilevel
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=11
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=22
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=33
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=11
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=22
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=33
+#### 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/llap/partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/partition_pruning.q.out 
b/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
index 8254aef..6e59609 100644
--- a/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
@@ -94,8 +94,14 @@ POSTHOOK: Input: default@daysales@dt=2001-01-03
 3      2001-01-03
 PREHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' and customer=1, false)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@daysales
+PREHOOK: Input: default@daysales@dt=2001-01-01
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' and customer=1, false)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@daysales
+POSTHOOK: Input: default@daysales@dt=2001-01-01
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `customer`, `dt`
 FROM `default`.`daysales`
 WHERE NVL(`dt` = '2001-01-01' AND `customer` = 1, FALSE)
@@ -167,8 +173,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' or customer=3, false)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@daysales
+PREHOOK: Input: default@daysales@dt=2001-01-01
+PREHOOK: Input: default@daysales@dt=2001-01-03
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' or customer=3, false)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@daysales
+POSTHOOK: Input: default@daysales@dt=2001-01-01
+POSTHOOK: Input: default@daysales@dt=2001-01-03
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `customer`, `dt`
 FROM `default`.`daysales`
 WHERE NVL(`dt` = '2001-01-01' OR `customer` = 3, FALSE)
@@ -286,8 +300,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' or customer=3, false)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@daysales
+PREHOOK: Input: default@daysales@dt=2001-01-01
+PREHOOK: Input: default@daysales@dt=2001-01-03
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' or customer=3, false)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@daysales
+POSTHOOK: Input: default@daysales@dt=2001-01-01
+POSTHOOK: Input: default@daysales@dt=2001-01-03
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `customer`, `dt`
 FROM `default`.`daysales`
 WHERE NVL(`dt` = '2001-01-01' OR `customer` = 3, FALSE)

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out 
b/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out
index fd33f12..a196928 100644
--- a/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out
@@ -35,6 +35,11 @@ join part p1 on (p1.p_partkey = f1.i)
 join foo_n1 f2 on (f1.i = f2.i)
 where f1.s='foo_n1' and f2.s='bar'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@foo_n1
+PREHOOK: Input: default@foo_n1@s=bar
+PREHOOK: Input: default@foo_n1@s=foo_n1
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select *
 from foo_n1 f1
@@ -42,6 +47,11 @@ join part p1 on (p1.p_partkey = f1.i)
 join foo_n1 f2 on (f1.i = f2.i)
 where f1.s='foo_n1' and f2.s='bar'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@foo_n1
+POSTHOOK: Input: default@foo_n1@s=bar
+POSTHOOK: Input: default@foo_n1@s=foo_n1
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -166,6 +176,10 @@ join part p1 on (p1.p_partkey = f1.i)
 join foo_n1 f2 on (f1.i = f2.i)
 where f1.s='foo_n1' and f2.s='foo_n1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@foo_n1
+PREHOOK: Input: default@foo_n1@s=foo_n1
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select *
 from foo_n1 f1
@@ -173,6 +187,10 @@ join part p1 on (p1.p_partkey = f1.i)
 join foo_n1 f2 on (f1.i = f2.i)
 where f1.s='foo_n1' and f2.s='foo_n1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@foo_n1
+POSTHOOK: Input: default@foo_n1@s=foo_n1
+POSTHOOK: Input: default@part
+#### 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/llap/ppd_union_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out 
b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
index 9908b89..e5ab461 100644
--- a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
@@ -133,9 +133,23 @@ POSTHOOK: Lineage: t1_n113.value EXPRESSION 
[(t1_new_n0)t1_new_n0.FieldSchema(na
 PREHOOK: query: explain extended
 select * from t1_n113 where ds = '2011-10-13'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_mapping
+PREHOOK: Input: default@t1_mapping@ds=2011-10-13
+PREHOOK: Input: default@t1_n113
+PREHOOK: Input: default@t1_new_n0
+PREHOOK: Input: default@t1_old
+PREHOOK: Input: default@t1_old@ds=2011-10-13
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from t1_n113 where ds = '2011-10-13'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_mapping
+POSTHOOK: Input: default@t1_mapping@ds=2011-10-13
+POSTHOOK: Input: default@t1_n113
+POSTHOOK: Input: default@t1_new_n0
+POSTHOOK: Input: default@t1_old
+POSTHOOK: Input: default@t1_old@ds=2011-10-13
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, CAST('2011-10-13' AS STRING) AS `ds`
 FROM (SELECT `key`, `value`
 FROM `default`.`t1_new_n0`
@@ -460,9 +474,21 @@ key4       value4  2011-10-14
 PREHOOK: query: explain extended
 select * from t1_n113 where ds = '2011-10-15'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_mapping
+PREHOOK: Input: default@t1_n113
+PREHOOK: Input: default@t1_new_n0
+PREHOOK: Input: default@t1_new_n0@ds=2011-10-15
+PREHOOK: Input: default@t1_old
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from t1_n113 where ds = '2011-10-15'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_mapping
+POSTHOOK: Input: default@t1_n113
+POSTHOOK: Input: default@t1_new_n0
+POSTHOOK: Input: default@t1_new_n0@ds=2011-10-15
+POSTHOOK: Input: default@t1_old
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, CAST('2011-10-15' AS STRING) AS `ds`
 FROM (SELECT `key`, `value`
 FROM `default`.`t1_new_n0`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ptf.q.out 
b/ql/src/test/results/clientpositive/llap/ptf.q.out
index 3d91ea9..3b09321 100644
--- a/ql/src/test/results/clientpositive/llap/ptf.q.out
+++ b/ql/src/test/results/clientpositive/llap/ptf.q.out
@@ -8,6 +8,8 @@ from noop(on part
   order by p_name
   )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -18,6 +20,8 @@ from noop(on part
   order by p_name
   )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -185,6 +189,8 @@ from noop (on (select p1.* from part p1 join part p2 on 
p1.p_partkey = p2.p_part
 distribute by j.p_mfgr
 sort by j.p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
@@ -192,6 +198,8 @@ from noop (on (select p1.* from part p1 join part p2 on 
p1.p_partkey = p2.p_part
 distribute by j.p_mfgr
 sort by j.p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -377,12 +385,16 @@ from noop(on part
 partition by p_mfgr
 order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size
 from noop(on part
 partition by p_mfgr
 order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -497,6 +509,8 @@ from noop(on part
   order by p_name
   ) abc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -507,6 +521,8 @@ from noop(on part
   order by p_name
   ) abc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -677,6 +693,8 @@ from noop(on part
           order by p_name 
           )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -687,6 +705,8 @@ from noop(on part
           order by p_name 
           )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -859,6 +879,8 @@ from noop(on part
           ) 
 group by p_mfgr, p_name, p_size
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -870,6 +892,8 @@ from noop(on part
           ) 
 group by p_mfgr, p_name, p_size
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1048,6 +1072,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select abc.* 
 from noop(on part 
@@ -1055,6 +1081,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1202,6 +1230,8 @@ partition by p_mfgr
 order by p_name 
 ) abc on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select abc.* 
 from part p1 join noop(on part 
@@ -1209,6 +1239,8 @@ partition by p_mfgr
 order by p_name 
 ) abc on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1360,6 +1392,8 @@ from noopwithmap(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
@@ -1367,6 +1401,8 @@ from noopwithmap(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1532,6 +1568,8 @@ from noopwithmap(on part
   partition by p_mfgr
   order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -1541,6 +1579,8 @@ from noopwithmap(on part
   partition by p_mfgr
   order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1725,6 +1765,8 @@ from noop(on part
 partition by p_mfgr
 order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -1734,6 +1776,8 @@ from noop(on part
 partition by p_mfgr
 order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1902,6 +1946,8 @@ partition by p_mfgr
 order by p_mfgr DESC, p_name
 )))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -1912,6 +1958,8 @@ partition by p_mfgr
 order by p_mfgr DESC, p_name
 )))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2144,6 +2192,8 @@ order by p_name)
 window w1 as (partition by p_mfgr order by p_name rows between 2 preceding and 
2 following) 
 ) sub1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, 
 sub1.cd, sub1.s1 
@@ -2157,6 +2207,8 @@ order by p_name)
 window w1 as (partition by p_mfgr order by p_name rows between 2 preceding and 
2 following) 
 ) sub1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2327,6 +2379,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
@@ -2339,6 +2393,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2560,12 +2616,16 @@ from noop(on part
 partition by p_mfgr 
 order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select DISTINCT p_mfgr, p_name, p_size 
 from noop(on part 
 partition by p_mfgr 
 order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2717,6 +2777,9 @@ partition by p_mfgr
 order by p_mfgr)  
 window w1 as ( partition by p_mfgr order by p_brand rows between 2 preceding 
and current row)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@mfgr_price_view_n5
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_brand, s, 
 round(sum(s) over w1,2)  as s1
@@ -2725,6 +2788,9 @@ partition by p_mfgr
 order by p_mfgr)  
 window w1 as ( partition by p_mfgr order by p_brand rows between 2 preceding 
and current row)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@mfgr_price_view_n5
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2935,6 +3001,9 @@ cume_dist() over (distribute by p_mfgr sort by p_mfgr, 
p_name) as cud,
 first_value(p_size, true) over w1  as fv1
 window w1 as (distribute by p_mfgr sort by p_mfgr, p_name rows between 2 
preceding and 2 following)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+PREHOOK: Output: default@part_4_n2
+PREHOOK: Output: default@part_5_n2
 POSTHOOK: query: explain
 from noop(on part 
 partition by p_mfgr 
@@ -2951,6 +3020,9 @@ cume_dist() over (distribute by p_mfgr sort by p_mfgr, 
p_name) as cud,
 first_value(p_size, true) over w1  as fv1
 window w1 as (distribute by p_mfgr sort by p_mfgr, p_name rows between 2 
preceding and 2 following)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+POSTHOOK: Output: default@part_4_n2
+POSTHOOK: Output: default@part_5_n2
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -3399,6 +3471,8 @@ from noop(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
@@ -3416,6 +3490,8 @@ from noop(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3673,6 +3749,8 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -3690,6 +3768,8 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3942,6 +4022,8 @@ from noop(on
           partition by p_mfgr 
           order by p_mfgr))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -3957,6 +4039,8 @@ from noop(on
           partition by p_mfgr 
           order by p_mfgr))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4186,6 +4270,8 @@ from noopwithmap(on
           partition by p_mfgr,p_name 
           order by p_mfgr,p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
@@ -4203,6 +4289,8 @@ from noopwithmap(on
           partition by p_mfgr,p_name 
           order by p_mfgr,p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4473,6 +4561,8 @@ from noop(on
           order by p_mfgr
           ))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as r, 
@@ -4489,6 +4579,8 @@ from noop(on
           order by p_mfgr
           ))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4734,6 +4826,8 @@ from noopwithmap(on
               order by p_mfgr, p_name) 
           ))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -4748,6 +4842,8 @@ from noopwithmap(on
               order by p_mfgr, p_name) 
           ))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### 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/llap/ptf_matchpath.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out 
b/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
index daccd68..6f428e7 100644
--- a/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
+++ b/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
@@ -45,6 +45,8 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath') 
    )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
@@ -56,6 +58,8 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath') 
    )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -173,6 +177,8 @@ from matchpath(on
    )
 where fl_num = 1142
 PREHOOK: type: QUERY
+PREHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
@@ -184,6 +190,8 @@ from matchpath(on
    )
 where fl_num = 1142
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -292,6 +300,8 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath')
    )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
 from matchpath(on
@@ -302,6 +312,8 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath')
    )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out 
b/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
index 0ed326f..8f63c34 100644
--- a/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
+++ b/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
@@ -8,6 +8,8 @@ from noopstreaming(on part
   order by p_name
   )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -18,6 +20,8 @@ from noopstreaming(on part
   order by p_name
   )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -185,6 +189,8 @@ from noopstreaming (on (select p1.* from part p1 join part 
p2 on p1.p_partkey =
 distribute by j.p_mfgr
 sort by j.p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
@@ -192,6 +198,8 @@ from noopstreaming (on (select p1.* from part p1 join part 
p2 on p1.p_partkey =
 distribute by j.p_mfgr
 sort by j.p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -378,6 +386,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select abc.* 
 from noopstreaming(on part 
@@ -385,6 +395,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -532,6 +544,8 @@ from noopwithmapstreaming(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
@@ -539,6 +553,8 @@ from noopwithmapstreaming(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -704,6 +720,8 @@ from noopwithmapstreaming(on part
   partition by p_mfgr
   order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -713,6 +731,8 @@ from noopwithmapstreaming(on part
   partition by p_mfgr
   order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -898,6 +918,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -908,6 +930,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1137,6 +1161,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -1147,6 +1173,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1376,6 +1404,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -1386,6 +1416,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1617,6 +1649,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
@@ -1629,6 +1663,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1861,6 +1897,8 @@ from noopstreaming(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
@@ -1878,6 +1916,8 @@ from noopstreaming(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2135,6 +2175,8 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -2152,6 +2194,8 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2403,6 +2447,8 @@ from noopwithmapstreaming(on
               order by p_mfgr, p_name) 
           ))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -2417,6 +2463,8 @@ from noopwithmapstreaming(on
               order by p_mfgr, p_name) 
           ))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### 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/llap/quotedid_smb.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out 
b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
index 13f2f9a..f836c47 100644
--- a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
+++ b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
@@ -46,10 +46,16 @@ PREHOOK: query: explain select a.`x+1`, a.`!@#$%^&*()_q`, 
b.`x+1`, b.`!@#$%^&*()
 from src_b a join src_b2 b on a.`!@#$%^&*()_q` = b.`!@#$%^&*()_q`
 where a.`x+1` < '11'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_b
+PREHOOK: Input: default@src_b2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.`x+1`, a.`!@#$%^&*()_q`, b.`x+1`, 
b.`!@#$%^&*()_q`
 from src_b a join src_b2 b on a.`!@#$%^&*()_q` = b.`!@#$%^&*()_q`
 where a.`x+1` < '11'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_b
+POSTHOOK: Input: default@src_b2
+#### 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/llap/rcfile_createas1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out 
b/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
index 58fc47d..f6f47bb 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
@@ -46,12 +46,22 @@ PREHOOK: query: EXPLAIN
         SELECT key, value, PMOD(HASH(key), 50) as part
         FROM rcfile_createas1a
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@rcfile_createas1a
+PREHOOK: Input: default@rcfile_createas1a@ds=1
+PREHOOK: Input: default@rcfile_createas1a@ds=2
+PREHOOK: Output: database:default
+PREHOOK: Output: default@rcfile_createas1b
 POSTHOOK: query: EXPLAIN
     CREATE TABLE rcfile_createas1b
     STORED AS RCFILE AS 
         SELECT key, value, PMOD(HASH(key), 50) as part
         FROM rcfile_createas1a
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@rcfile_createas1a
+POSTHOOK: Input: default@rcfile_createas1a@ds=1
+POSTHOOK: Input: default@rcfile_createas1a@ds=2
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@rcfile_createas1b
 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/llap/rcfile_merge2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out 
b/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
index afdc8f8..da5feda 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
@@ -19,11 +19,14 @@ PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE 
rcfile_merge2a PARTITION (one='1'
         PMOD(HASH(value), 10) as three
     FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@rcfile_merge2a@one=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_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-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out 
b/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
index 3374cc6..da615a9 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
@@ -51,9 +51,17 @@ POSTHOOK: Lineage: rcfile_merge3a_n0 PARTITION(ds=2).value 
SIMPLE [(src)src.Fiel
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge3b_n0
     SELECT key, value FROM rcfile_merge3a_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rcfile_merge3a_n0
+PREHOOK: Input: default@rcfile_merge3a_n0@ds=1
+PREHOOK: Input: default@rcfile_merge3a_n0@ds=2
+PREHOOK: Output: default@rcfile_merge3b_n0
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge3b_n0
     SELECT key, value FROM rcfile_merge3a_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rcfile_merge3a_n0
+POSTHOOK: Input: default@rcfile_merge3a_n0@ds=1
+POSTHOOK: Input: default@rcfile_merge3a_n0@ds=2
+POSTHOOK: Output: default@rcfile_merge3b_n0
 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/llap/rcfile_merge4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out 
b/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
index 3fe587b..41902b6 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
@@ -51,9 +51,17 @@ POSTHOOK: Lineage: rcfile_merge3a PARTITION(ds=2).value 
SIMPLE [(src)src.FieldSc
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge3b
     SELECT key, value FROM rcfile_merge3a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rcfile_merge3a
+PREHOOK: Input: default@rcfile_merge3a@ds=1
+PREHOOK: Input: default@rcfile_merge3a@ds=2
+PREHOOK: Output: default@rcfile_merge3b
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge3b
     SELECT key, value FROM rcfile_merge3a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rcfile_merge3a
+POSTHOOK: Input: default@rcfile_merge3a@ds=1
+POSTHOOK: Input: default@rcfile_merge3a@ds=2
+POSTHOOK: Output: default@rcfile_merge3b
 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/llap/reduce_deduplicate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out 
b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
index 0717559..d48ceac 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain extended
 insert overwrite table bucket5_1
 select * from src cluster by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket5_1
 POSTHOOK: query: explain extended
 insert overwrite table bucket5_1
 select * from src cluster by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket5_1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -289,6 +293,8 @@ select s2.* from
 )s
 )s2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@complex_tbl_2
+PREHOOK: Output: default@complex_tbl_1@ds=2010-03-29
 POSTHOOK: query: explain extended
 insert overwrite table complex_tbl_1 partition (ds='2010-03-29')
 select s2.* from
@@ -305,6 +311,8 @@ select s2.* from
 )s
 )s2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@complex_tbl_2
+POSTHOOK: Output: default@complex_tbl_1@ds=2010-03-29
 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/llap/reduce_deduplicate_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out 
b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
index 758a2e5..8d04800 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
@@ -21,10 +21,14 @@ PREHOOK: query: explain select id,count(distinct 
key),count(distinct name)
 from count_distinct_test
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(distinct key),count(distinct name)
 from count_distinct_test
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -99,10 +103,14 @@ PREHOOK: query: explain select id,count(Distinct 
key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(Distinct key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -196,10 +204,14 @@ PREHOOK: query: explain select id,count(Distinct 
name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(Distinct name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -293,10 +305,14 @@ PREHOOK: query: explain select id,count(Distinct 
key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(Distinct key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -390,10 +406,14 @@ PREHOOK: query: explain select id,count(Distinct 
name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(Distinct name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out 
b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
index dec81dd..7ce79bd 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -59,8 +63,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key), lower(value) from (select * from 
src order by key) Q1 group by key, lower(value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key), lower(value) from (select * 
from src order by key) Q1 group by key, lower(value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -123,8 +131,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key), (X + 1) from (select key, (value 
+ 1) as X from src order by key) Q1 group by key, (X + 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key), (X + 1) from (select key, 
(value + 1) as X from src order by key) Q1 group by key, (X + 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
@@ -187,8 +199,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -249,8 +265,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -355,8 +377,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -447,8 +475,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -515,8 +547,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, count(distinct value) from (select key, 
value from src group by key, value) t group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, count(distinct value) from (select key, 
value from src group by key, value) t group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2554,8 +2590,12 @@ POSTHOOK: Input: default@src
 98     1
 PREHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2613,8 +2653,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key), lower(value) from (select * from 
src order by key) Q1 group by key, lower(value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key), lower(value) from (select * 
from src order by key) Q1 group by key, lower(value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2677,8 +2721,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key), (X + 1) from (select key, (value 
+ 1) as X from src order by key) Q1 group by key, (X + 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key), (X + 1) from (select key, 
(value + 1) as X from src order by key) Q1 group by key, (X + 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
@@ -2741,8 +2789,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2796,8 +2848,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2895,8 +2953,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2987,8 +3051,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3050,8 +3118,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, count(distinct value) from (select key, 
value from src group by key, value) t group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, count(distinct value) from (select key, 
value from src group by key, value) t group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out 
b/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
index 31726f6..0d6c279 100644
--- a/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
+++ b/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
@@ -117,6 +117,11 @@ select   count(*) cnt
        and s.ss_sold_date_sk = d.d_date_sk
        and d.d_year=2000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x1_date_dim
+PREHOOK: Input: default@x1_store_sales
+PREHOOK: Input: default@x1_store_sales@ss_sold_date_sk=1
+PREHOOK: Input: default@x1_store_sales@ss_sold_date_sk=2
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select   count(*) cnt
  from
@@ -127,6 +132,11 @@ select   count(*) cnt
        and s.ss_sold_date_sk = d.d_date_sk
        and d.d_year=2000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x1_date_dim
+POSTHOOK: Input: default@x1_store_sales
+POSTHOOK: Input: default@x1_store_sales@ss_sold_date_sk=1
+POSTHOOK: Input: default@x1_store_sales@ss_sold_date_sk=2
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage
@@ -207,6 +217,11 @@ select   count(*) cnt
        and s.ss_sold_date_sk = d.d_date_sk
        and d.d_year=2000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x1_date_dim
+PREHOOK: Input: default@x1_store_sales
+PREHOOK: Input: default@x1_store_sales@ss_sold_date_sk=1
+PREHOOK: Input: default@x1_store_sales@ss_sold_date_sk=2
+#### A masked pattern was here ####
 POSTHOOK: query: explain reoptimization
 select   count(*) cnt
  from
@@ -217,6 +232,11 @@ select   count(*) cnt
        and s.ss_sold_date_sk = d.d_date_sk
        and d.d_year=2000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x1_date_dim
+POSTHOOK: Input: default@x1_store_sales
+POSTHOOK: Input: default@x1_store_sales@ss_sold_date_sk=1
+POSTHOOK: Input: default@x1_store_sales@ss_sold_date_sk=2
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out 
b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
index e60b207..3d29f15 100644
--- a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
@@ -116,6 +116,9 @@ select   sum(s.ss_item_sk)
         and s.ss_sold_date_sk=d.d_date_sk
        and d.d_moy=3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x1_date_dim
+PREHOOK: Input: default@x1_store_sales
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select   sum(s.ss_item_sk)
  from
@@ -126,6 +129,9 @@ select   sum(s.ss_item_sk)
         and s.ss_sold_date_sk=d.d_date_sk
        and d.d_moy=3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x1_date_dim
+POSTHOOK: Input: default@x1_store_sales
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -285,6 +291,9 @@ select   sum(s.ss_item_sk)
         and s.ss_sold_date_sk=d.d_date_sk
        and d.d_moy=3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x1_date_dim
+PREHOOK: Input: default@x1_store_sales
+#### A masked pattern was here ####
 POSTHOOK: query: explain reoptimization
 select   sum(s.ss_item_sk)
  from
@@ -295,6 +304,9 @@ select   sum(s.ss_item_sk)
         and s.ss_sold_date_sk=d.d_date_sk
        and d.d_moy=3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x1_date_dim
+POSTHOOK: Input: default@x1_store_sales
+#### 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/llap/results_cache_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/results_cache_1.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
index 6f5bfc3..94c008a 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -109,9 +113,11 @@ test.comment="Cache should be used for this query"
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -134,9 +140,13 @@ test.comment="Cache is disabled, should not be used here."
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -257,9 +267,13 @@ test.comment="Same query string, but different current 
database. Cache should no
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: db1@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: db1@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -380,11 +394,13 @@ select * from src where key = 0
 union all
 select * from src where key = 2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select * from src where key = 0
 union all
 select * from src where key = 2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -434,11 +450,13 @@ with q1 as ( select distinct key from q2 ),
 q2 as ( select key, value from src where key < 10 )
 select * from q1 a, q1 b where a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 with q1 as ( select distinct key from q2 ),
 q2 as ( select key, value from src where key < 10 )
 select * from q1 a, q1 b where a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -492,12 +510,14 @@ q2 as ( select key, value from src where key < 10 ),
 q3 as ( select key, value from src where key = 0 )
 select * from q1 intersect all select * from q2 except all select * from q3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 with q1 as ( select distinct key, value from src ),
 q2 as ( select key, value from src where key < 10 ),
 q3 as ( select key, value from src where key = 0 )
 select * from q1 intersect all select * from q2 except all select * from q3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -550,9 +570,19 @@ test.comment="Semijoin. Cache should be used now"
 PREHOOK: query: explain
 select a, c, count(*)  from (select key as a, c_int+1 as b, sum(c_int) as c 
from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or 
cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key having cbo_t1.c_float 
> 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by a+b 
desc, c asc limit 5) cbo_t1 left semi join (select key as p, c_int+1 as q, 
sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 
or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key having 
cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by q+r/10 desc, p limit 5) cbo_t2 on cbo_t1.a=p left semi join cbo_t3 on 
cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  having a 
> 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, 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
 POSTHOOK: query: explain
 select a, c, count(*)  from (select key as a, c_int+1 as b, sum(c_int) as c 
from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or 
cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key having cbo_t1.c_float 
> 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by a+b 
desc, c asc limit 5) cbo_t1 left semi join (select key as p, c_int+1 as q, 
sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 
or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key having 
cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by q+r/10 desc, p limit 5) cbo_t2 on cbo_t1.a=p left semi join cbo_t3 on 
cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  having a 
> 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, 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
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/results_cache_2.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
index edce6c3..87326b5 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select key, value from src where key=0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value from src where key=0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -36,9 +40,13 @@ test.comment=Query only requires fetch task - should not use 
results cache
 PREHOOK: query: explain
 select key, value from src where key=0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value from src where key=0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -75,11 +83,13 @@ select c1, count(*)
 from (select sign(value) c1, value from src where key < 10) q
 group by c1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select c1, count(*)
 from (select sign(value) c1, value from src where key < 10) q
 group by c1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -110,11 +120,15 @@ select c1, count(*)
 from (select current_timestamp c1, value from src where key < 10) q
 group by c1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select c1, count(*)
 from (select current_timestamp c1, value from src where key < 10) q
 group by c1
 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
@@ -196,11 +210,15 @@ select c1, count(*)
 from (select sign(value) c1, value from src where key < 10) q
 group by c1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze
 select c1, count(*)
 from (select sign(value) c1, value from src where key < 10) q
 group by c1
 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/llap/results_cache_capacity.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
index 995e88c..5bc28fa 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
@@ -11,9 +11,11 @@ test.comment=Q1 should be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -38,9 +40,11 @@ test.comment=Q2 should now be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 2 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 2 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -56,9 +60,11 @@ test.comment=Q1 should still be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -83,9 +89,11 @@ test.comment=Q3 should now be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 4 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 4 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -101,9 +109,11 @@ test.comment=Q1 should still be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -119,9 +129,13 @@ test.comment=Q2 should no longer be in the cache
 PREHOOK: query: explain
 select key, count(*) from src where key = 2 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(*) from src where key = 2 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -196,9 +210,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 select key, count(*) from src where key < 10 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(*) from src where key < 10 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out
index 642c0bf..5eb29cb 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select count(*), key from src a where key < 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*), key from src a where key < 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -77,9 +81,11 @@ test.comment="Cache should be used for this query"
 PREHOOK: query: explain
 select count(*), key from src a where key < 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select count(*), key from src a where key < 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

Reply via email to