http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out 
b/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
index 3954be5..e3906cc 100644
--- a/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
@@ -14,8 +14,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0 values(default, 
DEFAULT)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0 values(default, 
DEFAULT)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -149,8 +153,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0 values(234, dEfAULt)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0 values(234, dEfAULt)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -284,8 +292,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: explain insert into insert_into1_n0 values(default, 
3),(2,default)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: explain insert into insert_into1_n0 values(default, 
3),(2,default)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -420,8 +432,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key) values(default)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key) values(default)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -555,8 +571,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key, value) 
values(2,default)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key, value) 
values(2,default)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -708,8 +728,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0 values(default, 
DEFAULT)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0 values(default, 
DEFAULT)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -843,8 +867,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0 values(234, dEfAULt)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0 values(234, dEfAULt)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -978,8 +1006,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: explain insert into insert_into1_n0 values(default, 
3),(2,default)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: explain insert into insert_into1_n0 values(default, 
3),(2,default)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1114,8 +1146,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key) values(default)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key) values(default)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1249,8 +1285,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key, value) 
values(2,default)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key, value) 
values(2,default)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1384,8 +1424,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(value, key) 
values(2,default)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(value, key) 
values(2,default)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1519,8 +1563,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@insert_into1_n0
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key, value) 
values(2,default),(DEFAULT, default)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1_n0(key, value) 
values(2,default),(DEFAULT, default)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1684,8 +1732,12 @@ POSTHOOK: Lineage: insert_into1_n0.key SCRIPT []
 POSTHOOK: Lineage: insert_into1_n0.value SCRIPT []
 PREHOOK: query: EXPLAIN UPDATE insert_into1_n0 set key = DEFAULT where value=1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into1_n0
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN UPDATE insert_into1_n0 set key = DEFAULT where value=1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into1_n0
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1791,8 +1843,12 @@ POSTHOOK: Lineage: insert_into1_n0.key SCRIPT []
 POSTHOOK: Lineage: insert_into1_n0.value SCRIPT []
 PREHOOK: query: EXPLAIN UPDATE insert_into1_n0 set key = DEFAULT, 
value=DEFAULT where value=1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into1_n0
+PREHOOK: Output: default@insert_into1_n0
 POSTHOOK: query: EXPLAIN UPDATE insert_into1_n0 set key = DEFAULT, 
value=DEFAULT where value=1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into1_n0
+POSTHOOK: Output: default@insert_into1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1903,8 +1959,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tpart
 PREHOOK: query: EXPLAIN INSERT INTO tpart partition(ds='1') values(DEFAULT, 
DEFAULT)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@tpart@ds=1
 POSTHOOK: query: EXPLAIN INSERT INTO tpart partition(ds='1') values(DEFAULT, 
DEFAULT)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@tpart@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2035,8 +2095,12 @@ POSTHOOK: type: TRUNCATETABLE
 POSTHOOK: Output: default@tpart@ds=1
 PREHOOK: query: EXPLAIN INSERT INTO tpart partition(ds='1')(i) values(DEFAULT)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@tpart@ds=1
 POSTHOOK: query: EXPLAIN INSERT INTO tpart partition(ds='1')(i) values(DEFAULT)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@tpart@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2150,8 +2214,12 @@ POSTHOOK: Lineage: tpart PARTITION(ds=1).i EXPRESSION []
 POSTHOOK: Lineage: tpart PARTITION(ds=1).j SIMPLE []
 PREHOOK: query: EXPLAIN INSERT INTO tpart partition(ds='1')(i,j) values(10, 
DEFAULT)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@tpart@ds=1
 POSTHOOK: query: EXPLAIN INSERT INTO tpart partition(ds='1')(i,j) values(10, 
DEFAULT)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@tpart@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2345,9 +2413,15 @@ POSTHOOK: Lineage: acidtable.value SCRIPT []
 PREHOOK: query: explain MERGE INTO acidTable as t using nonacid_n1 as s ON 
t.key = s.key
 WHEN NOT MATCHED THEN INSERT VALUES (s.key, DEFAULT, DEFAULT)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@acidtable
+PREHOOK: Input: default@nonacid_n1
+PREHOOK: Output: default@acidtable
 POSTHOOK: query: explain MERGE INTO acidTable as t using nonacid_n1 as s ON 
t.key = s.key
 WHEN NOT MATCHED THEN INSERT VALUES (s.key, DEFAULT, DEFAULT)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acidtable
+POSTHOOK: Input: default@nonacid_n1
+POSTHOOK: Output: default@acidtable
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2531,11 +2605,23 @@ WHEN MATCHED AND s.key < 3 THEN DELETE
 WHEN MATCHED AND s.key > 3 THEN UPDATE set a1 = DEFAULT
 WHEN NOT MATCHED THEN INSERT VALUES (s.key, s.a1, DEFAULT)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@acidtable
+PREHOOK: Input: default@nonacid_n1
+PREHOOK: Output: default@acidtable
+PREHOOK: Output: default@acidtable
+PREHOOK: Output: default@acidtable
+PREHOOK: Output: default@merge_tmp_table
 POSTHOOK: query: explain MERGE INTO acidTable as t using nonacid_n1 as s ON 
t.key = s.key
 WHEN MATCHED AND s.key < 3 THEN DELETE
 WHEN MATCHED AND s.key > 3 THEN UPDATE set a1 = DEFAULT
 WHEN NOT MATCHED THEN INSERT VALUES (s.key, s.a1, DEFAULT)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acidtable
+POSTHOOK: Input: default@nonacid_n1
+POSTHOOK: Output: default@acidtable
+POSTHOOK: Output: default@acidtable
+POSTHOOK: Output: default@acidtable
+POSTHOOK: Output: default@merge_tmp_table
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-5 depends on stages: Stage-4
@@ -2899,9 +2985,15 @@ POSTHOOK: Output: default@acidTable2
 PREHOOK: query: explain MERGE INTO acidTable2 as t using nonacid_n1 as s ON 
t.key = s.key
 WHEN NOT MATCHED THEN INSERT VALUES (DEFAULT)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@acidtable2
+PREHOOK: Input: default@nonacid_n1
+PREHOOK: Output: default@acidtable2
 POSTHOOK: query: explain MERGE INTO acidTable2 as t using nonacid_n1 as s ON 
t.key = s.key
 WHEN NOT MATCHED THEN INSERT VALUES (DEFAULT)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acidtable2
+POSTHOOK: Input: default@nonacid_n1
+POSTHOOK: Output: default@acidtable2
 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/insert_values_orig_table_use_metadata.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
 
b/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
index e0ed969..15dff9d 100644
--- 
a/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
@@ -189,8 +189,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select count(*) from acid_ivot
 PREHOOK: type: QUERY
+PREHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from acid_ivot
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -397,8 +401,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select count(*) from acid_ivot
 PREHOOK: type: QUERY
+PREHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from acid_ivot
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -532,8 +540,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select count(*) from acid_ivot
 PREHOOK: type: QUERY
+PREHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from acid_ivot
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -663,8 +675,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select count(*) from acid_ivot
 PREHOOK: type: QUERY
+PREHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from acid_ivot
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -813,8 +829,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select count(*) from acid_ivot
 PREHOOK: type: QUERY
+PREHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from acid_ivot
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acid_ivot
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -896,8 +916,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select count(*) from sp where ds="2008-04-08" and 
hr="11"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@sp
+PREHOOK: Input: default@sp@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from sp where ds="2008-04-08" and 
hr="11"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@sp
+POSTHOOK: Input: default@sp@ds=2008-04-08/hr=11
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1062,8 +1088,12 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain select count(*) from sp where ds="2008-04-08" and 
hr="11"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@sp
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from sp where ds="2008-04-08" and 
hr="11"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@sp
+#### 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/intersect_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/intersect_all.q.out 
b/ql/src/test/results/clientpositive/llap/intersect_all.q.out
index 28d837f..1f6b0b8 100644
--- a/ql/src/test/results/clientpositive/llap/intersect_all.q.out
+++ b/ql/src/test/results/clientpositive/llap/intersect_all.q.out
@@ -139,8 +139,12 @@ POSTHOOK: Input: default@b_n8
 POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain select * from src intersect all select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from src intersect all select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -792,8 +796,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 96     val_96
 PREHOOK: query: explain select * from src intersect all select * from src 
intersect all select * from src intersect all select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from src intersect all select * from src 
intersect all select * from src intersect all select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1535,8 +1543,14 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 96     val_96
 PREHOOK: query: explain select value from a_n10 group by value intersect all 
select key from b_n8 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n10
+PREHOOK: Input: default@b_n8
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select value from a_n10 group by value intersect all 
select key from b_n8 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n10
+POSTHOOK: Input: default@b_n8
+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/intersect_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out 
b/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
index 2fdb83c..b4c69b1 100644
--- a/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
+++ b/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
@@ -137,8 +137,12 @@ POSTHOOK: Input: default@b_n13
 POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain select * from src intersect distinct select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from src intersect distinct select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -592,8 +596,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 96     val_96
 PREHOOK: query: explain select * from src intersect distinct select * from src 
intersect distinct select * from src intersect distinct select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from src intersect distinct select * from 
src intersect distinct select * from src intersect distinct select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1137,8 +1145,14 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 96     val_96
 PREHOOK: query: explain select value from a_n17 group by value intersect 
distinct select key from b_n13 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n17
+PREHOOK: Input: default@b_n13
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select value from a_n17 group by value intersect 
distinct select key from b_n13 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n17
+POSTHOOK: Input: default@b_n13
+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/intersect_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/intersect_merge.q.out 
b/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
index 815f4b6..b19fd2c 100644
--- a/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
+++ b/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
@@ -36,8 +36,14 @@ POSTHOOK: Lineage: b_n5.key SCRIPT []
 POSTHOOK: Lineage: b_n5.value SCRIPT []
 PREHOOK: query: explain select * from b_n5 intersect distinct select * from 
a_n7 intersect distinct select * from b_n5 intersect distinct select * from 
a_n7 intersect distinct select * from b_n5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n7
+PREHOOK: Input: default@b_n5
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from b_n5 intersect distinct select * from 
a_n7 intersect distinct select * from b_n5 intersect distinct select * from 
a_n7 intersect distinct select * from b_n5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n7
+POSTHOOK: Input: default@b_n5
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -309,8 +315,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain (select * from b_n5 intersect distinct select * from 
a_n7) intersect distinct (select * from b_n5 intersect distinct select * from 
a_n7)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n7
+PREHOOK: Input: default@b_n5
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain (select * from b_n5 intersect distinct select * from 
a_n7) intersect distinct (select * from b_n5 intersect distinct select * from 
a_n7)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n7
+POSTHOOK: Input: default@b_n5
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -537,8 +549,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from b_n5 intersect distinct (select * from 
a_n7 intersect distinct (select * from b_n5 intersect distinct (select * from 
a_n7 intersect distinct select * from b_n5)))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n7
+PREHOOK: Input: default@b_n5
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from b_n5 intersect distinct (select * from 
a_n7 intersect distinct (select * from b_n5 intersect distinct (select * from 
a_n7 intersect distinct select * from b_n5)))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n7
+POSTHOOK: Input: default@b_n5
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -810,8 +828,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain (((select * from b_n5 intersect distinct select * from 
a_n7) intersect distinct select * from b_n5) intersect distinct select * from 
a_n7) intersect distinct select * from b_n5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n7
+PREHOOK: Input: default@b_n5
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain (((select * from b_n5 intersect distinct select * 
from a_n7) intersect distinct select * from b_n5) intersect distinct select * 
from a_n7) intersect distinct select * from b_n5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n7
+POSTHOOK: Input: default@b_n5
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1083,8 +1107,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from b_n5 intersect distinct (select * from 
a_n7 intersect distinct select * from b_n5) intersect distinct select * from 
a_n7 intersect distinct select * from b_n5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n7
+PREHOOK: Input: default@b_n5
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from b_n5 intersect distinct (select * from 
a_n7 intersect distinct select * from b_n5) intersect distinct select * from 
a_n7 intersect distinct select * from b_n5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n7
+POSTHOOK: Input: default@b_n5
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1356,8 +1386,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from b_n5 intersect distinct (select * from 
a_n7 intersect all select * from b_n5)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n7
+PREHOOK: Input: default@b_n5
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from b_n5 intersect distinct (select * from 
a_n7 intersect all select * from b_n5)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n7
+POSTHOOK: Input: default@b_n5
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1539,8 +1575,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from b_n5 intersect all (select * from a_n7 
intersect all select * from b_n5)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n7
+PREHOOK: Input: default@b_n5
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from b_n5 intersect all (select * from a_n7 
intersect all select * from b_n5)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n7
+POSTHOOK: Input: default@b_n5
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1729,8 +1771,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from b_n5 intersect all (select * from a_n7 
intersect distinct select * from b_n5)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n7
+PREHOOK: Input: default@b_n5
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select * from b_n5 intersect all (select * from a_n7 
intersect distinct select * from b_n5)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n7
+POSTHOOK: Input: default@b_n5
+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/is_distinct_from.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/is_distinct_from.q.out 
b/ql/src/test/results/clientpositive/llap/is_distinct_from.q.out
index 1938a76..47c37d6 100644
--- a/ql/src/test/results/clientpositive/llap/is_distinct_from.q.out
+++ b/ql/src/test/results/clientpositive/llap/is_distinct_from.q.out
@@ -4,12 +4,16 @@ PREHOOK: query: explain select 1 is distinct from 1,
                null is distinct from null
          from part
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 1 is distinct from 1,
                1 is distinct from 2,
                1 is distinct from null,
                null is distinct from null
          from part
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -73,12 +77,16 @@ PREHOOK: query: explain select 1 is not distinct from 1,
                null is not distinct from null
          from part
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 1 is not distinct from 1,
                1 is not distinct from 2,
                1 is not distinct from null,
                null is not distinct from null
          from part
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -182,8 +190,12 @@ q  NULL    true    false
 NULL   NULL    true    false
 PREHOOK: query: explain select * from test_n5 where y is distinct from null
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from test_n5 where y is distinct from null
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -214,8 +226,12 @@ q  w
 NULL   q
 PREHOOK: query: explain select * from test_n5 where y is not distinct from null
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from test_n5 where y is not distinct from 
null
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -253,8 +269,12 @@ POSTHOOK: Input: default@test_n5
 POSTHOOK: Output: default@test_n5
 PREHOOK: query: explain select * from part where p_size is distinct from 2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from part where p_size is distinct from 2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -304,8 +324,12 @@ POSTHOOK: Input: default@part
 78486  almond azure blanched chiffon midnight  Manufacturer#5  Brand#52        
LARGE BRUSHED BRASS     23      MED BAG 1464.48 hely blith
 PREHOOK: query: explain select * from part where p_size is not distinct from 2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from part where p_size is not distinct from 2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### 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/jdbc_handler.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out 
b/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
index 889e8b6..03ac396 100644
--- a/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
+++ b/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
@@ -81,8 +81,12 @@ POSTHOOK: Input: default@ext_simple_derby_table
 200
 PREHOOK: query: explain select * from ext_simple_derby_table where 100 < 
ext_simple_derby_table.kkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@ext_simple_derby_table
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from ext_simple_derby_table where 100 < 
ext_simple_derby_table.kkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@ext_simple_derby_table
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -216,6 +220,9 @@ from
   on (t2.key-1) = t1.db_id
 order by a,b
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@tables
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select
   t1.name as a, t2.key as b
@@ -226,6 +233,9 @@ from
   on (t2.key-1) = t1.db_id
 order by a,b
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@tables
+#### 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/join0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join0.q.out 
b/ql/src/test/results/clientpositive/llap/join0.q.out
index c2c6515..920f4f7 100644
--- a/ql/src/test/results/clientpositive/llap/join0.q.out
+++ b/ql/src/test/results/clientpositive/llap/join0.q.out
@@ -7,6 +7,8 @@ SELECT src1.key as k1, src1.value as v1,
   (SELECT * FROM src WHERE src.key < 10) src2
   SORT BY k1, v1, k2, v2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT src1.key as k1, src1.value as v1, 
        src2.key as k2, src2.value as v2 FROM 
@@ -15,6 +17,8 @@ SELECT src1.key as k1, src1.value as v1,
   (SELECT * FROM src WHERE src.key < 10) src2
   SORT BY k1, v1, k2, v2
 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,6 +113,8 @@ SELECT src1.key as k1, src1.value as v1,
   (SELECT * FROM src WHERE src.key < 10) src2
   SORT BY k1, v1, k2, v2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN FORMATTED
 SELECT src1.key as k1, src1.value as v1, 
        src2.key as k2, src2.value as v2 FROM 
@@ -117,6 +123,7 @@ SELECT src1.key as k1, src1.value as v1,
   (SELECT * FROM src WHERE src.key < 10) src2
   SORT BY k1, v1, k2, v2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 Warning: Shuffle Join MERGEJOIN[15][tables = [src1, src2]] in Stage 'Reducer 
2' is a cross product
 PREHOOK: query: SELECT src1.key as k1, src1.value as v1, 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join1.q.out 
b/ql/src/test/results/clientpositive/llap/join1.q.out
index cf14327..99e0d7c 100644
--- a/ql/src/test/results/clientpositive/llap/join1.q.out
+++ b/ql/src/test/results/clientpositive/llap/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_n15 SELECT src1.key, src2.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_j1_n15
 POSTHOOK: query: EXPLAIN
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1_n15 SELECT src1.key, src2.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_j1_n15
 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/join32_lessSize.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out 
b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
index 30531bd..9db696d 100644
--- a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
+++ b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
@@ -20,12 +20,22 @@ SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key) 
 JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: default@dest_j1_n21
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest_j1_n21
 SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key) 
 JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@dest_j1_n21
 OPTIMIZED SQL: SELECT `t4`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr`
 FROM `default`.`srcpart`
@@ -561,6 +571,9 @@ FROM src w JOIN src1 x ON (x.value = w.value)
 JOIN src y ON (x.key = y.key) 
 JOIN src1 z ON (x.key = z.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Output: default@dest_j1_n21
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest_j1_n21
 SELECT x.key, z.value, y.value
@@ -568,6 +581,9 @@ FROM src w JOIN src1 x ON (x.value = w.value)
 JOIN src y ON (x.key = y.key) 
 JOIN src1 z ON (x.key = z.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Output: default@dest_j1_n21
 OPTIMIZED SQL: SELECT `t4`.`key`, `t6`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `value`
 FROM `default`.`src`
@@ -1192,12 +1208,22 @@ SELECT res.key, z.value, res.value
 FROM (select x.key, x.value from src1 x JOIN src y ON (x.key = y.key)) res 
 JOIN srcpart z ON (res.value = z.value and z.ds='2008-04-08' and z.hr=11)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: default@dest_j2_n1
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest_j2_n1
 SELECT res.key, z.value, res.value
 FROM (select x.key, x.value from src1 x JOIN src y ON (x.key = y.key)) res 
 JOIN srcpart z ON (res.value = z.value and z.ds='2008-04-08' and z.hr=11)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@dest_j2_n1
 OPTIMIZED SQL: SELECT `t5`.`key`, `t0`.`value`, `t5`.`value` AS `value1`
 FROM (SELECT `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr`
 FROM `default`.`srcpart`
@@ -1737,12 +1763,22 @@ SELECT res.key, z.value, res.value
 FROM (select x.key, x.value from src1 x LEFT OUTER JOIN src y ON (x.key = 
y.key)) res 
 JOIN srcpart z ON (res.value = z.value and z.ds='2008-04-08' and z.hr=11)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: default@dest_j2_n1
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest_j2_n1
 SELECT res.key, z.value, res.value
 FROM (select x.key, x.value from src1 x LEFT OUTER JOIN src y ON (x.key = 
y.key)) res 
 JOIN srcpart z ON (res.value = z.value and z.ds='2008-04-08' and z.hr=11)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@dest_j2_n1
 OPTIMIZED SQL: SELECT `t4`.`key`, `t0`.`value`, `t4`.`value` AS `value1`
 FROM (SELECT `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr`
 FROM `default`.`srcpart`
@@ -2298,12 +2334,22 @@ SELECT res.key, x.value, res.value
 FROM (select x.key, x.value from src1 x JOIN src y ON (x.key = y.key)) res 
 JOIN srcpart x ON (res.value = x.value and x.ds='2008-04-08' and x.hr=11)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: default@dest_j2_n1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE dest_j2_n1
 SELECT res.key, x.value, res.value  
 FROM (select x.key, x.value from src1 x JOIN src y ON (x.key = y.key)) res 
 JOIN srcpart x ON (res.value = x.value and x.ds='2008-04-08' and x.hr=11)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@dest_j2_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2588,12 +2634,22 @@ SELECT res.key, y.value, res.value
 FROM (select x.key, x.value from src1 x JOIN src y ON (x.key = y.key)) res 
 JOIN srcpart y ON (res.value = y.value and y.ds='2008-04-08' and y.hr=11)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: default@dest_j2_n1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE dest_j2_n1
 SELECT res.key, y.value, res.value
 FROM (select x.key, x.value from src1 x JOIN src y ON (x.key = y.key)) res 
 JOIN srcpart y ON (res.value = y.value and y.ds='2008-04-08' and y.hr=11)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@dest_j2_n1
 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/join46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join46.q.out 
b/ql/src/test/results/clientpositive/llap/join46.q.out
index 1f637d4..ef18c44 100644
--- a/ql/src/test/results/clientpositive/llap/join46.q.out
+++ b/ql/src/test/results/clientpositive/llap/join46.q.out
@@ -45,11 +45,17 @@ SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -150,6 +156,9 @@ ON (test1_n2.value=test2_n0.value
   AND test1_n2.key between 100 and 102
   AND test2_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
@@ -157,6 +166,9 @@ ON (test1_n2.value=test2_n0.value
   AND test1_n2.key between 100 and 102
   AND test2_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -265,12 +277,18 @@ FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.key between 100 and 102
   AND test2_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.key between 100 and 102
   AND test2_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -372,11 +390,17 @@ SELECT *
 FROM test1_n2 RIGHT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value AND true)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 RIGHT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value AND true)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -474,11 +498,17 @@ SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -584,6 +614,9 @@ ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102
   OR test2_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
@@ -591,6 +624,9 @@ ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102
   OR test2_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -698,12 +734,18 @@ FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -809,12 +851,18 @@ FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test2_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test2_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -915,6 +963,9 @@ ON (test1_n2.value=test2_n0.value
   AND (test1_n2.key between 100 and 102
     OR test2_n0.key between 100 and 102))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 LEFT OUTER JOIN test2_n0
@@ -922,6 +973,9 @@ ON (test1_n2.value=test2_n0.value
   AND (test1_n2.key between 100 and 102
     OR test2_n0.key between 100 and 102))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1026,12 +1080,18 @@ FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
       OR test1_n2.key=test2_n0.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT col_1, col_2
 FROM test1_n2 LEFT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
       OR test1_n2.key=test2_n0.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1137,6 +1197,9 @@ ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102
   OR test2_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 RIGHT OUTER JOIN test2_n0
@@ -1144,6 +1207,9 @@ ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102
   OR test2_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1251,12 +1317,18 @@ FROM test1_n2 RIGHT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 RIGHT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1359,12 +1431,18 @@ FROM test1_n2 RIGHT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test2_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 RIGHT OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test2_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1467,6 +1545,9 @@ ON (test1_n2.value=test2_n0.value
   AND (test1_n2.key between 100 and 102
     OR test2_n0.key between 100 and 102))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 RIGHT OUTER JOIN test2_n0
@@ -1474,6 +1555,9 @@ ON (test1_n2.value=test2_n0.value
   AND (test1_n2.key between 100 and 102
     OR test2_n0.key between 100 and 102))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1577,6 +1661,9 @@ ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102
   OR test2_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 FULL OUTER JOIN test2_n0
@@ -1584,6 +1671,9 @@ ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102
   OR test2_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1691,12 +1781,18 @@ FROM test1_n2 FULL OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 FULL OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test1_n2.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1802,12 +1898,18 @@ FROM test1_n2 FULL OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test2_n0.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 FULL OUTER JOIN test2_n0
 ON (test1_n2.value=test2_n0.value
   OR test2_n0.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1910,6 +2012,9 @@ ON (test1_n2.value=test2_n0.value
   AND (test1_n2.key between 100 and 102
     OR test2_n0.key between 100 and 102))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n2 FULL OUTER JOIN test2_n0
@@ -1917,6 +2022,9 @@ ON (test1_n2.value=test2_n0.value
   AND (test1_n2.key between 100 and 102
     OR test2_n0.key between 100 and 102))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2037,6 +2145,9 @@ FULL OUTER JOIN (
   ) sq2
 ON (sq1.value1 is null or sq2.value4 is null and sq2.value3 != sq1.value2)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n2
+PREHOOK: Input: default@test2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM (
@@ -2057,6 +2168,9 @@ FULL OUTER JOIN (
   ) sq2
 ON (sq1.value1 is null or sq2.value4 is null and sq2.value3 != sq1.value2)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n2
+POSTHOOK: Input: default@test2_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/join_emit_interval.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join_emit_interval.q.out 
b/ql/src/test/results/clientpositive/llap/join_emit_interval.q.out
index 9484b7a..2f30fb3 100644
--- a/ql/src/test/results/clientpositive/llap/join_emit_interval.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_emit_interval.q.out
@@ -45,11 +45,17 @@ SELECT *
 FROM test1_n7 LEFT OUTER JOIN test2_n4
 ON (test1_n7.value=test2_n4.value AND test1_n7.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n7
+PREHOOK: Input: default@test2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n7 LEFT OUTER JOIN test2_n4
 ON (test1_n7.value=test2_n4.value AND test1_n7.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n7
+POSTHOOK: Input: default@test2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -151,11 +157,17 @@ SELECT *
 FROM test1_n7 LEFT OUTER JOIN test2_n4
 ON (test1_n7.key between 100 and 102)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test1_n7
+PREHOOK: Input: default@test2_n4
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1_n7 LEFT OUTER JOIN test2_n4
 ON (test1_n7.key between 100 and 102)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test1_n7
+POSTHOOK: Input: default@test2_n4
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/join_is_not_distinct_from.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/join_is_not_distinct_from.q.out 
b/ql/src/test/results/clientpositive/llap/join_is_not_distinct_from.q.out
index f29700f..ccf8b2f 100644
--- a/ql/src/test/results/clientpositive/llap/join_is_not_distinct_from.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_is_not_distinct_from.q.out
@@ -16,8 +16,12 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@myinput1_n10
 PREHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -107,8 +111,12 @@ NULL       NULL    48      NULL
 NULL   NULL    NULL    NULL
 PREHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value join myinput1_n10 c on a.key=c.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value join myinput1_n10 c on a.key=c.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -212,8 +220,12 @@ POSTHOOK: Input: default@myinput1_n10
 100    100     100     100     100     100
 PREHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value join myinput1_n10 c on a.key is not distinct 
from c.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value join myinput1_n10 c on a.key is not distinct 
from c.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -336,8 +348,12 @@ NULL       NULL    NULL    NULL    NULL    35
 NULL   NULL    NULL    NULL    NULL    NULL
 PREHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value AND a.value=b.key join myinput1_n10 c on 
a.key is not distinct from c.key AND a.value=c.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value AND a.value=b.key join myinput1_n10 c on 
a.key is not distinct from c.key AND a.value=c.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -439,8 +455,12 @@ POSTHOOK: Input: default@myinput1_n10
 NULL   10      10      NULL    NULL    10
 PREHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value AND a.value is not distinct from b.key join 
myinput1_n10 c on a.key is not distinct from c.key AND a.value is not distinct 
from c.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value AND a.value is not distinct from b.key join 
myinput1_n10 c on a.key is not distinct from c.key AND a.value is not distinct 
from c.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1578,8 +1598,12 @@ NULL     NULL    12      NULL
 NULL   NULL    NULL    NULL
 PREHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value AND a.key is NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n10
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n10 a join myinput1_n10 b on 
a.key is not distinct from b.value AND a.key is NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n10
+#### 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/join_max_hashtable.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join_max_hashtable.q.out 
b/ql/src/test/results/clientpositive/llap/join_max_hashtable.q.out
index 996b789..53591c8 100644
--- a/ql/src/test/results/clientpositive/llap/join_max_hashtable.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_max_hashtable.q.out
@@ -2,10 +2,14 @@ PREHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.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
@@ -79,10 +83,14 @@ PREHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key AND x.value = y.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key AND x.value = y.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
@@ -156,10 +164,14 @@ PREHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.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
@@ -243,10 +255,14 @@ PREHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key AND x.value = y.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key AND x.value = y.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
@@ -329,10 +345,14 @@ PREHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.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
@@ -416,10 +436,14 @@ PREHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key AND x.value = y.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key AND x.value = y.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
@@ -502,10 +526,14 @@ PREHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.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
@@ -579,10 +607,14 @@ PREHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key AND x.value = y.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT x.key, x.value
 FROM src x JOIN src y ON (x.key = y.key AND x.value = y.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

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out 
b/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out
index d64c8b8..ad54b56 100644
--- a/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_nullsafe.q.out
@@ -16,8 +16,12 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@myinput1_n9
 PREHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -107,8 +111,12 @@ NULL       NULL    48      NULL
 NULL   NULL    NULL    NULL
 PREHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value join myinput1_n9 c on a.key=c.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value join myinput1_n9 c on a.key=c.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -212,8 +220,12 @@ POSTHOOK: Input: default@myinput1_n9
 100    100     100     100     100     100
 PREHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value join myinput1_n9 c on a.key<=>c.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value join myinput1_n9 c on a.key<=>c.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -336,8 +348,12 @@ NULL       NULL    NULL    NULL    NULL    35
 NULL   NULL    NULL    NULL    NULL    NULL
 PREHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value AND a.value=b.key join myinput1_n9 c on a.key<=>c.key AND 
a.value=c.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value AND a.value=b.key join myinput1_n9 c on a.key<=>c.key AND 
a.value=c.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -439,8 +455,12 @@ POSTHOOK: Input: default@myinput1_n9
 NULL   10      10      NULL    NULL    10
 PREHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value AND a.value<=>b.key join myinput1_n9 c on a.key<=>c.key AND 
a.value<=>c.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value AND a.value<=>b.key join myinput1_n9 c on a.key<=>c.key AND 
a.value<=>c.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1578,8 +1598,12 @@ NULL     NULL    12      NULL
 NULL   NULL    NULL    NULL
 PREHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value AND a.key is NULL
 PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1_n9
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from myinput1_n9 a join myinput1_n9 b on 
a.key<=>b.value AND a.key is NULL
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1_n9
+#### 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/join_reordering_no_stats.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/join_reordering_no_stats.q.out 
b/ql/src/test/results/clientpositive/llap/join_reordering_no_stats.q.out
index 0ef9bbf..d946404 100644
--- a/ql/src/test/results/clientpositive/llap/join_reordering_no_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_reordering_no_stats.q.out
@@ -80,8 +80,16 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_nostats
 PREHOOK: query: explain select count(1) from 
part_nostats,supplier_nostats,lineitem_nostats where p_partkey = l_partkey and 
s_suppkey = l_suppkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lineitem_nostats
+PREHOOK: Input: default@part_nostats
+PREHOOK: Input: default@supplier_nostats
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from 
part_nostats,supplier_nostats,lineitem_nostats where p_partkey = l_partkey and 
s_suppkey = l_suppkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lineitem_nostats
+POSTHOOK: Input: default@part_nostats
+POSTHOOK: Input: default@supplier_nostats
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -213,8 +221,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain select count(1) from 
part_nostats,supplier_nostats,lineitem_nostats where p_partkey = l_partkey and 
s_suppkey = l_suppkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lineitem_nostats
+PREHOOK: Input: default@part_nostats
+PREHOOK: Input: default@supplier_nostats
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from 
part_nostats,supplier_nostats,lineitem_nostats where p_partkey = l_partkey and 
s_suppkey = l_suppkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lineitem_nostats
+POSTHOOK: Input: default@part_nostats
+POSTHOOK: Input: default@supplier_nostats
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -410,8 +426,28 @@ POSTHOOK: Output: default@employee_part_n1
 POSTHOOK: Output: default@employee_part_n1@employeesalary=3000.0/country=UK
 PREHOOK: query: explain select count(1) from 
Employee_Part_n1,supplier_nostats,lineitem_nostats where employeeID= l_partkey 
and s_suppkey = l_suppkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@employee_part_n1
+PREHOOK: Input: default@employee_part_n1@employeesalary=2000.0/country=UK
+PREHOOK: Input: default@employee_part_n1@employeesalary=2000.0/country=USA
+PREHOOK: Input: default@employee_part_n1@employeesalary=3000.0/country=UK
+PREHOOK: Input: default@employee_part_n1@employeesalary=3000.0/country=USA
+PREHOOK: Input: default@employee_part_n1@employeesalary=3500.0/country=UK
+PREHOOK: Input: default@employee_part_n1@employeesalary=4000.0/country=USA
+PREHOOK: Input: default@lineitem_nostats
+PREHOOK: Input: default@supplier_nostats
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from 
Employee_Part_n1,supplier_nostats,lineitem_nostats where employeeID= l_partkey 
and s_suppkey = l_suppkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@employee_part_n1
+POSTHOOK: Input: default@employee_part_n1@employeesalary=2000.0/country=UK
+POSTHOOK: Input: default@employee_part_n1@employeesalary=2000.0/country=USA
+POSTHOOK: Input: default@employee_part_n1@employeesalary=3000.0/country=UK
+POSTHOOK: Input: default@employee_part_n1@employeesalary=3000.0/country=USA
+POSTHOOK: Input: default@employee_part_n1@employeesalary=3500.0/country=UK
+POSTHOOK: Input: default@employee_part_n1@employeesalary=4000.0/country=USA
+POSTHOOK: Input: default@lineitem_nostats
+POSTHOOK: Input: default@supplier_nostats
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -543,8 +579,28 @@ STAGE PLANS:
 
 PREHOOK: query: explain select count(1) from 
Employee_Part_n1,supplier_nostats,lineitem_nostats where employeeID= l_partkey 
and s_suppkey = l_suppkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@employee_part_n1
+PREHOOK: Input: default@employee_part_n1@employeesalary=2000.0/country=UK
+PREHOOK: Input: default@employee_part_n1@employeesalary=2000.0/country=USA
+PREHOOK: Input: default@employee_part_n1@employeesalary=3000.0/country=UK
+PREHOOK: Input: default@employee_part_n1@employeesalary=3000.0/country=USA
+PREHOOK: Input: default@employee_part_n1@employeesalary=3500.0/country=UK
+PREHOOK: Input: default@employee_part_n1@employeesalary=4000.0/country=USA
+PREHOOK: Input: default@lineitem_nostats
+PREHOOK: Input: default@supplier_nostats
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1) from 
Employee_Part_n1,supplier_nostats,lineitem_nostats where employeeID= l_partkey 
and s_suppkey = l_suppkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@employee_part_n1
+POSTHOOK: Input: default@employee_part_n1@employeesalary=2000.0/country=UK
+POSTHOOK: Input: default@employee_part_n1@employeesalary=2000.0/country=USA
+POSTHOOK: Input: default@employee_part_n1@employeesalary=3000.0/country=UK
+POSTHOOK: Input: default@employee_part_n1@employeesalary=3000.0/country=USA
+POSTHOOK: Input: default@employee_part_n1@employeesalary=3500.0/country=UK
+POSTHOOK: Input: default@employee_part_n1@employeesalary=4000.0/country=USA
+POSTHOOK: Input: default@lineitem_nostats
+POSTHOOK: Input: default@supplier_nostats
+#### 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/kill_query.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/kill_query.q.out 
b/ql/src/test/results/clientpositive/llap/kill_query.q.out
index c180023..32c3f6a 100644
--- a/ql/src/test/results/clientpositive/llap/kill_query.q.out
+++ b/ql/src/test/results/clientpositive/llap/kill_query.q.out
@@ -1,5 +1,6 @@
 PREHOOK: query: explain kill query 'query_1244656'
 PREHOOK: type: KILL QUERY
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain kill query 'query_1244656'
 POSTHOOK: type: KILL QUERY
 STAGE DEPENDENCIES:
@@ -13,6 +14,7 @@ STAGE PLANS:
 
 PREHOOK: query: explain kill query 'query_123456677' 'query_1238503495'
 PREHOOK: type: KILL QUERY
+PREHOOK: Output: dummyHostnameForTest
 POSTHOOK: query: explain kill query 'query_123456677' 'query_1238503495'
 POSTHOOK: type: KILL QUERY
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/kryo.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/kryo.q.out 
b/ql/src/test/results/clientpositive/llap/kryo.q.out
index 1463dfb..8a1daee 100644
--- a/ql/src/test/results/clientpositive/llap/kryo.q.out
+++ b/ql/src/test/results/clientpositive/llap/kryo.q.out
@@ -26,8 +26,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DateTime
 PREHOOK: query: explain SELECT IF(((`DateTime_`.`id` = 1) OR (`DateTime_`.`id` 
= 2)),IF((`DateTime_`.`id` = 1),(CASE WHEN true THEN `DateTime_`.`date_` WHEN 
NOT true THEN TO_DATE(`DateTime_`.`datetime`) ELSE NULL END),(CASE WHEN true 
THEN `DateTime_`.`date_` WHEN NOT true THEN TO_DATE(`DateTime_`.`datetime`) 
ELSE TO_DATE(`DateTime_`.`time`) END)),IF((`DateTime_`.`id` = 3),(CASE    WHEN 
(`DateTime_`.`date_` IS NULL) OR (TO_DATE(`DateTime_`.`datetime`) IS NULL) THEN 
NULL       WHEN `DateTime_`.`date_` > TO_DATE(`DateTime_`.`datetime`) THEN 
`DateTime_`.`date_`     ELSE TO_DATE(`DateTime_`.`datetime`) END),NULL)) AS 
`none_calculation2_ok`,   `DateTime_`.`id` AS `none_id_ok`,   (CASE WHEN 
(`DateTime_`.`id` = 6) THEN (CASE  WHEN (CONCAT(`DateTime_`.`date_`, ' 
00:00:00') IS NULL) OR (`DateTime_`.`datetime` IS NULL) THEN NULL   WHEN 
CONCAT(`DateTime_`.`date_`, ' 00:00:00') > `DateTime_`.`datetime` THEN 
CONCAT(`DateTime_`.`date_`, ' 00:00:00')    ELSE `DateTime_`.`datetime` END) 
WHEN (`DateT
 ime_`.`id` = 5) THEN (CASE         WHEN (`DateTime_`.`date_` IS NULL) OR 
(`DateTime_`.`datetime` IS NULL) THEN NULL        WHEN `DateTime_`.`date_` > 
`DateTime_`.`datetime` THEN `DateTime_`.`date_`      ELSE 
`DateTime_`.`datetime` END) WHEN (`DateTime_`.`id` = 3) THEN (CASE WHEN true 
THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE NULL END) WHEN (`DateTime_`.`id` = 4) THEN (CASE 
WHEN true THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE `DateTime_`.`time` END) WHEN (`DateTime_`.`id` = 1) 
THEN (CASE WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE NULL END) WHEN (`DateTime_`.`id` = 2) THEN (CASE 
WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN `DateTime_`.`datetime` 
ELSE `DateTime_`.`time` END) ELSE NULL END) AS `none_mixed_type_calcs_ok` FROM 
`DateTime` `DateTime_` WHERE (`DateTime_`.`id` = 1 OR `DateTime_`.`id` = 2 OR 
`DateTime_`.`id` = 3 OR `DateTime_`.`id
 ` = 4 OR `DateTime_`.`id` = 5 OR `DateTime_`.`id` = 6) GROUP BY 
IF(((`DateTime_`.`id` = 1) OR (`DateTime_`.`id` = 2)),IF((`DateTime_`.`id` = 
1),(CASE WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN 
TO_DATE(`DateTime_`.`datetime`) ELSE NULL END),(CASE WHEN true THEN 
`DateTime_`.`date_` WHEN NOT true THEN TO_DATE(`DateTime_`.`datetime`) ELSE 
TO_DATE(`DateTime_`.`time`) END)),IF((`DateTime_`.`id` = 3),(CASE       WHEN 
(`DateTime_`.`date_` IS NULL) OR (TO_DATE(`DateTime_`.`datetime`) IS NULL) THEN 
NULL       WHEN `DateTime_`.`date_` > TO_DATE(`DateTime_`.`datetime`) THEN 
`DateTime_`.`date_`     ELSE TO_DATE(`DateTime_`.`datetime`) END),NULL)),   
`DateTime_`.`id`,   (CASE WHEN (`DateTime_`.`id` = 6) THEN (CASE    WHEN 
(CONCAT(`DateTime_`.`date_`, ' 00:00:00') IS NULL) OR (`DateTime_`.`datetime` 
IS NULL) THEN NULL   WHEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') > 
`DateTime_`.`datetime` THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00')    ELSE 
`DateTime_`.`datetime` END) WHEN (`DateTime_
 `.`id` = 5) THEN (CASE         WHEN (`DateTime_`.`date_` IS NULL) OR 
(`DateTime_`.`datetime` IS NULL) THEN NULL        WHEN `DateTime_`.`date_` > 
`DateTime_`.`datetime` THEN `DateTime_`.`date_`      ELSE 
`DateTime_`.`datetime` END) WHEN (`DateTime_`.`id` = 3) THEN (CASE WHEN true 
THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE NULL END) WHEN (`DateTime_`.`id` = 4) THEN (CASE 
WHEN true THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE `DateTime_`.`time` END) WHEN (`DateTime_`.`id` = 1) 
THEN (CASE WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE NULL END) WHEN (`DateTime_`.`id` = 2) THEN (CASE 
WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN `DateTime_`.`datetime` 
ELSE `DateTime_`.`time` END) ELSE NULL END)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@datetime
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT IF(((`DateTime_`.`id` = 1) OR 
(`DateTime_`.`id` = 2)),IF((`DateTime_`.`id` = 1),(CASE WHEN true THEN 
`DateTime_`.`date_` WHEN NOT true THEN TO_DATE(`DateTime_`.`datetime`) ELSE 
NULL END),(CASE WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN 
TO_DATE(`DateTime_`.`datetime`) ELSE TO_DATE(`DateTime_`.`time`) 
END)),IF((`DateTime_`.`id` = 3),(CASE    WHEN (`DateTime_`.`date_` IS NULL) OR 
(TO_DATE(`DateTime_`.`datetime`) IS NULL) THEN NULL       WHEN 
`DateTime_`.`date_` > TO_DATE(`DateTime_`.`datetime`) THEN `DateTime_`.`date_`  
   ELSE TO_DATE(`DateTime_`.`datetime`) END),NULL)) AS `none_calculation2_ok`,  
 `DateTime_`.`id` AS `none_id_ok`,   (CASE WHEN (`DateTime_`.`id` = 6) THEN 
(CASE  WHEN (CONCAT(`DateTime_`.`date_`, ' 00:00:00') IS NULL) OR 
(`DateTime_`.`datetime` IS NULL) THEN NULL   WHEN CONCAT(`DateTime_`.`date_`, ' 
00:00:00') > `DateTime_`.`datetime` THEN CONCAT(`DateTime_`.`date_`, ' 
00:00:00')    ELSE `DateTime_`.`datetime` END) WHEN (`Date
 Time_`.`id` = 5) THEN (CASE         WHEN (`DateTime_`.`date_` IS NULL) OR 
(`DateTime_`.`datetime` IS NULL) THEN NULL        WHEN `DateTime_`.`date_` > 
`DateTime_`.`datetime` THEN `DateTime_`.`date_`      ELSE 
`DateTime_`.`datetime` END) WHEN (`DateTime_`.`id` = 3) THEN (CASE WHEN true 
THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE NULL END) WHEN (`DateTime_`.`id` = 4) THEN (CASE 
WHEN true THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE `DateTime_`.`time` END) WHEN (`DateTime_`.`id` = 1) 
THEN (CASE WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE NULL END) WHEN (`DateTime_`.`id` = 2) THEN (CASE 
WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN `DateTime_`.`datetime` 
ELSE `DateTime_`.`time` END) ELSE NULL END) AS `none_mixed_type_calcs_ok` FROM 
`DateTime` `DateTime_` WHERE (`DateTime_`.`id` = 1 OR `DateTime_`.`id` = 2 OR 
`DateTime_`.`id` = 3 OR `DateTime_`.`i
 d` = 4 OR `DateTime_`.`id` = 5 OR `DateTime_`.`id` = 6) GROUP BY 
IF(((`DateTime_`.`id` = 1) OR (`DateTime_`.`id` = 2)),IF((`DateTime_`.`id` = 
1),(CASE WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN 
TO_DATE(`DateTime_`.`datetime`) ELSE NULL END),(CASE WHEN true THEN 
`DateTime_`.`date_` WHEN NOT true THEN TO_DATE(`DateTime_`.`datetime`) ELSE 
TO_DATE(`DateTime_`.`time`) END)),IF((`DateTime_`.`id` = 3),(CASE       WHEN 
(`DateTime_`.`date_` IS NULL) OR (TO_DATE(`DateTime_`.`datetime`) IS NULL) THEN 
NULL       WHEN `DateTime_`.`date_` > TO_DATE(`DateTime_`.`datetime`) THEN 
`DateTime_`.`date_`     ELSE TO_DATE(`DateTime_`.`datetime`) END),NULL)),   
`DateTime_`.`id`,   (CASE WHEN (`DateTime_`.`id` = 6) THEN (CASE    WHEN 
(CONCAT(`DateTime_`.`date_`, ' 00:00:00') IS NULL) OR (`DateTime_`.`datetime` 
IS NULL) THEN NULL   WHEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') > 
`DateTime_`.`datetime` THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00')    ELSE 
`DateTime_`.`datetime` END) WHEN (`DateTime
 _`.`id` = 5) THEN (CASE         WHEN (`DateTime_`.`date_` IS NULL) OR 
(`DateTime_`.`datetime` IS NULL) THEN NULL        WHEN `DateTime_`.`date_` > 
`DateTime_`.`datetime` THEN `DateTime_`.`date_`      ELSE 
`DateTime_`.`datetime` END) WHEN (`DateTime_`.`id` = 3) THEN (CASE WHEN true 
THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE NULL END) WHEN (`DateTime_`.`id` = 4) THEN (CASE 
WHEN true THEN CONCAT(`DateTime_`.`date_`, ' 00:00:00') WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE `DateTime_`.`time` END) WHEN (`DateTime_`.`id` = 1) 
THEN (CASE WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN 
`DateTime_`.`datetime` ELSE NULL END) WHEN (`DateTime_`.`id` = 2) THEN (CASE 
WHEN true THEN `DateTime_`.`date_` WHEN NOT true THEN `DateTime_`.`datetime` 
ELSE `DateTime_`.`time` END) ELSE NULL END)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@datetime
+#### 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/lateral_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lateral_view.q.out 
b/ql/src/test/results/clientpositive/llap/lateral_view.q.out
index 3fae367..c1bca18 100644
--- a/ql/src/test/results/clientpositive/llap/lateral_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/lateral_view.q.out
@@ -17,8 +17,12 @@ POSTHOOK: Output: default@tmp_pyang_lv
 POSTHOOK: Lineage: tmp_pyang_lv.inputs SIMPLE [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
 PREHOOK: query: EXPLAIN SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) 
myTable AS myCol SORT BY key ASC, myCol ASC LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) 
myTable AS myCol SORT BY key ASC, myCol ASC 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
@@ -120,8 +124,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT myTable.* FROM src LATERAL VIEW 
explode(array(1,2,3)) myTable AS myCol LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT myTable.* FROM src LATERAL VIEW 
explode(array(1,2,3)) myTable AS myCol LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -158,8 +166,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT myTable.myCol, myTable2.myCol2 FROM src LATERAL 
VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW explode(array('a', 
'b', 'c')) myTable2 AS myCol2 LIMIT 9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT myTable.myCol, myTable2.myCol2 FROM src 
LATERAL VIEW explode(array(1,2,3)) myTable AS myCol LATERAL VIEW 
explode(array('a', 'b', 'c')) myTable2 AS myCol2 LIMIT 9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -234,8 +246,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT myTable2.* FROM src LATERAL VIEW 
explode(array(array(1,2,3))) myTable AS myCol LATERAL VIEW 
explode(myTable.myCol) myTable2 AS myCol2 LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT myTable2.* FROM src LATERAL VIEW 
explode(array(array(1,2,3))) myTable AS myCol LATERAL VIEW 
explode(myTable.myCol) myTable2 AS myCol2 LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -355,9 +371,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: EXPLAIN
 SELECT myCol from tmp_pyang_lv LATERAL VIEW explode(array(1,2,3)) myTab as 
myCol limit 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tmp_pyang_lv
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT myCol from tmp_pyang_lv LATERAL VIEW explode(array(1,2,3)) myTab as 
myCol limit 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tmp_pyang_lv
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -610,9 +630,13 @@ POSTHOOK: Input: default@tmp_pyang_src_rcfile
 PREHOOK: query: EXPLAIN SELECT value, myCol from (SELECT key, array(value[0]) 
AS value FROM tmp_pyang_src_rcfile GROUP BY value[0], key) a
 LATERAL VIEW explode(value) myTable AS myCol
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tmp_pyang_src_rcfile
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT value, myCol from (SELECT key, array(value[0]) 
AS value FROM tmp_pyang_src_rcfile GROUP BY value[0], key) a
 LATERAL VIEW explode(value) myTable AS myCol
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tmp_pyang_src_rcfile
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

Reply via email to