http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/insert_into2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/insert_into2.q.out 
b/ql/src/test/results/clientpositive/llap/insert_into2.q.out
index 47927d5..69264f0 100644
--- a/ql/src/test/results/clientpositive/llap/insert_into2.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_into2.q.out
@@ -15,9 +15,13 @@ POSTHOOK: Output: default@insert_into2
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') 
   SELECT * FROM src order by key LIMIT 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@insert_into2@ds=1
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') 
   SELECT * FROM src order by key LIMIT 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@insert_into2@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -144,9 +148,13 @@ POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).value 
SIMPLE [(src)src.FieldSche
 PREHOOK: query: explain
 select count (*) from insert_into2 where ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain
 select count (*) from insert_into2 where ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -179,9 +187,13 @@ POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).value 
SIMPLE [(src)src.FieldSche
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -219,9 +231,13 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src order by key LIMIT 100
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@insert_into2@ds=2
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src order by key LIMIT 100
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@insert_into2@ds=2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -367,9 +383,13 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -392,9 +412,13 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src order by key LIMIT 50
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@insert_into2@ds=2
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src order by key LIMIT 50
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@insert_into2@ds=2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -540,9 +564,13 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -575,9 +603,15 @@ POSTHOOK: Lineage: insert_into2 PARTITION(ds=2).value 
SCRIPT []
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 where ds='2'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+PREHOOK: Input: default@insert_into2@ds=2
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 where ds='2'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+POSTHOOK: Input: default@insert_into2@ds=2
+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/163caed7/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 f604443..4f4d1b1 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
@@ -1792,8 +1844,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
@@ -1905,8 +1961,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
@@ -2037,8 +2097,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
@@ -2152,8 +2216,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
@@ -2347,9 +2415,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
@@ -2535,11 +2609,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
@@ -2903,9 +2989,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/163caed7/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 bd88883..a7f0379 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
@@ -190,8 +190,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
 
@@ -357,8 +361,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
 
@@ -451,8 +459,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
 
@@ -541,8 +553,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
 
@@ -649,8 +665,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
 
@@ -732,8 +752,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
@@ -899,8 +925,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/163caed7/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/163caed7/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/163caed7/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/163caed7/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 5ec8867..f5a3475 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
 
@@ -215,8 +227,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
 
@@ -255,8 +271,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
 
@@ -307,8 +327,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/163caed7/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 ade8d46..261689d 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
 
@@ -200,6 +204,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
@@ -210,6 +217,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/163caed7/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 a6baa0f..227278c 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
@@ -111,6 +115,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 
@@ -119,6 +125,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/163caed7/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 9bdec85..f1d6c22 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/163caed7/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 70ea9ac..aba0c24 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`
@@ -564,6 +574,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
@@ -571,6 +584,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`
@@ -1199,12 +1215,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 `t4`.`key`, `t0`.`value`, `t4`.`value` AS `value1`
 FROM (SELECT `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr`
 FROM `default`.`srcpart`
@@ -1742,12 +1768,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 `t2`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr`
 FROM `default`.`srcpart`
@@ -2300,12 +2336,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
@@ -2589,12 +2635,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/163caed7/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 95d3611..81d9dbf 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
@@ -266,12 +278,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
@@ -374,11 +392,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
@@ -476,11 +500,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
@@ -586,6 +616,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
@@ -593,6 +626,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
@@ -700,12 +736,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
@@ -811,12 +853,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
@@ -917,6 +965,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
@@ -924,6 +975,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
@@ -1028,12 +1082,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
@@ -1139,6 +1199,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
@@ -1146,6 +1209,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
@@ -1253,12 +1319,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
@@ -1361,12 +1433,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
@@ -1469,6 +1547,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
@@ -1476,6 +1557,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
@@ -1579,6 +1663,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
@@ -1586,6 +1673,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
@@ -1693,12 +1783,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
@@ -1804,12 +1900,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
@@ -1912,6 +2014,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
@@ -1919,6 +2024,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
@@ -2039,6 +2147,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 (
@@ -2059,6 +2170,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/163caed7/ql/src/test/results/clientpositive/llap/join_constraints_optimization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/join_constraints_optimization.q.out 
b/ql/src/test/results/clientpositive/llap/join_constraints_optimization.q.out
index 8cd2676..1098bb4 100644
--- 
a/ql/src/test/results/clientpositive/llap/join_constraints_optimization.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/join_constraints_optimization.q.out
@@ -139,11 +139,17 @@ SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -164,11 +170,17 @@ SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dates_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dates_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -192,11 +204,17 @@ SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -217,11 +235,17 @@ SELECT `lo_linenumber`, `c_region`
 FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`, `c_region`
 FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -302,11 +326,17 @@ SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@dates_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dates_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -383,12 +413,20 @@ FROM `lineorder_removal_n0`
 JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_removal_n0
+PREHOOK: Input: default@dates_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_removal_n0
+POSTHOOK: Input: default@dates_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -413,12 +451,20 @@ FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_removal_n0
+PREHOOK: Input: default@dates_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_removal_n0
+POSTHOOK: Input: default@dates_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -444,6 +490,10 @@ FROM `lineorder_removal_n0`
 JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`) subq
 LEFT OUTER JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_removal_n0
+PREHOOK: Input: default@dates_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber` FROM
 (SELECT *
@@ -451,6 +501,10 @@ FROM `lineorder_removal_n0`
 JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`) subq
 LEFT OUTER JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_removal_n0
+POSTHOOK: Input: default@dates_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -527,12 +581,20 @@ FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 LEFT OUTER JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_removal_n0
+PREHOOK: Input: default@dates_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 LEFT OUTER JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_removal_n0
+POSTHOOK: Input: default@dates_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -609,12 +671,20 @@ FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_removal_n0
+PREHOOK: Input: default@dates_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`
 FROM `lineorder_removal_n0`
 LEFT OUTER JOIN `dates_removal_n0` ON `lo_orderdate` = `d_datekey`
 LEFT OUTER JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_removal_n0
+POSTHOOK: Input: default@dates_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -724,11 +794,17 @@ SELECT `lo_linenumber`, `c_custkey`
 FROM `lineorder_removal_n0`
 JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 PREHOOK: type: QUERY
+PREHOOK: Input: default@customer_removal_n0
+PREHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT `lo_linenumber`, `c_custkey`
 FROM `lineorder_removal_n0`
 JOIN `customer_removal_n0` ON `lo_custkey` = `c_custkey`
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@customer_removal_n0
+POSTHOOK: Input: default@lineorder_removal_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/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 b5d5bd7..2c64ce8 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/163caed7/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 acb3381..98d806d 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
@@ -215,8 +223,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
@@ -339,8 +351,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
@@ -445,8 +461,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
@@ -1584,8 +1604,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/163caed7/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 c3b1eb7..cce6519 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
@@ -81,10 +85,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
@@ -160,10 +168,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
@@ -250,10 +262,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
@@ -339,10 +355,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
@@ -429,10 +449,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
@@ -518,10 +542,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
@@ -597,10 +625,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/163caed7/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 4e923c6..f659718 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
@@ -215,8 +223,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
@@ -339,8 +351,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
@@ -445,8 +461,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
@@ -1584,8 +1604,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/163caed7/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 ab17005..43dd1e9 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
@@ -216,8 +224,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
@@ -416,8 +432,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
@@ -552,8 +588,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/163caed7/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:

Reply via email to