http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out
index da3443c..3764b53 100644
--- a/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n38 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), 
sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY 
substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n38
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n38 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), 
sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY 
substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n38
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -156,10 +160,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n38 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.key,1,1)), concat(substr(src.key,1,1),sum(substr(src.value,5))), 
sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY 
substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n38
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n38 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.key,1,1)), concat(substr(src.key,1,1),sum(substr(src.value,5))), 
sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY 
substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n38
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby2_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby2_map_skew.q.out 
b/ql/src/test/results/clientpositive/groupby2_map_skew.q.out
index e137bd6..2f3b1df 100644
--- a/ql/src/test/results/clientpositive/groupby2_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/groupby2_map_skew.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n10 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) 
GROUP BY substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n10
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n10 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) 
GROUP BY substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n10
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby2_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby2_noskew.q.out 
b/ql/src/test/results/clientpositive/groupby2_noskew.q.out
index 583885c..34e9e68 100644
--- a/ql/src/test/results/clientpositive/groupby2_noskew.q.out
+++ b/ql/src/test/results/clientpositive/groupby2_noskew.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2_n1 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) 
GROUP BY substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_g2_n1
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2_n1 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) 
GROUP BY substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_g2_n1
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out
index 6998b83..445aee6 100644
--- a/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2_n3 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), 
sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY 
substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest_g2_n3
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2_n3 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), 
sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY 
substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest_g2_n3
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby3.q.out 
b/ql/src/test/results/clientpositive/groupby3.q.out
index aff5770..30f81df 100644
--- a/ql/src/test/results/clientpositive/groupby3.q.out
+++ b/ql/src/test/results/clientpositive/groupby3.q.out
@@ -19,6 +19,8 @@ INSERT OVERWRITE TABLE dest1_n119 SELECT
   variance(substr(src.value,5)),
   var_samp(substr(src.value,5))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n119
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n119 SELECT 
@@ -32,6 +34,8 @@ INSERT OVERWRITE TABLE dest1_n119 SELECT
   variance(substr(src.value,5)),
   var_samp(substr(src.value,5))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n119
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby3_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby3_map.q.out 
b/ql/src/test/results/clientpositive/groupby3_map.q.out
index a5ec308..328711a 100644
--- a/ql/src/test/results/clientpositive/groupby3_map.q.out
+++ b/ql/src/test/results/clientpositive/groupby3_map.q.out
@@ -19,6 +19,8 @@ INSERT OVERWRITE TABLE dest1_n53 SELECT
   variance(substr(src.value,5)),
   var_samp(substr(src.value,5))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n53
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n53 SELECT
@@ -32,6 +34,8 @@ INSERT OVERWRITE TABLE dest1_n53 SELECT
   variance(substr(src.value,5)),
   var_samp(substr(src.value,5))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n53
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out
index d8fe780..2bba736 100644
--- a/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out
@@ -21,6 +21,8 @@ INSERT OVERWRITE TABLE dest1_n68 SELECT
   sum(DISTINCT substr(src.value, 5)),
   count(DISTINCT substr(src.value, 5))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n68
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n68 SELECT
@@ -36,6 +38,8 @@ INSERT OVERWRITE TABLE dest1_n68 SELECT
   sum(DISTINCT substr(src.value, 5)),
   count(DISTINCT substr(src.value, 5))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n68
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby3_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby3_map_skew.q.out 
b/ql/src/test/results/clientpositive/groupby3_map_skew.q.out
index 02317a2..a699c58 100644
--- a/ql/src/test/results/clientpositive/groupby3_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/groupby3_map_skew.q.out
@@ -19,6 +19,8 @@ INSERT OVERWRITE TABLE dest1_n131 SELECT
   variance(substr(src.value,5)),
   var_samp(substr(src.value,5))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n131
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n131 SELECT
@@ -32,6 +34,8 @@ INSERT OVERWRITE TABLE dest1_n131 SELECT
   variance(substr(src.value,5)),
   var_samp(substr(src.value,5))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n131
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby3_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby3_noskew.q.out 
b/ql/src/test/results/clientpositive/groupby3_noskew.q.out
index a870fc1..075f7c7 100644
--- a/ql/src/test/results/clientpositive/groupby3_noskew.q.out
+++ b/ql/src/test/results/clientpositive/groupby3_noskew.q.out
@@ -19,6 +19,8 @@ INSERT OVERWRITE TABLE dest1_n63 SELECT
   variance(substr(src.value,5)),
   var_samp(substr(src.value,5))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n63
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n63 SELECT
@@ -32,6 +34,8 @@ INSERT OVERWRITE TABLE dest1_n63 SELECT
   variance(substr(src.value,5)),
   var_samp(substr(src.value,5))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n63
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out
index 7801a6c..a662e22 100644
--- a/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out
@@ -21,6 +21,8 @@ INSERT OVERWRITE TABLE dest1_n24 SELECT
   sum(DISTINCT substr(src.value, 5)),
   count(DISTINCT substr(src.value, 5))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n24
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n24 SELECT
@@ -36,6 +38,8 @@ INSERT OVERWRITE TABLE dest1_n24 SELECT
   sum(DISTINCT substr(src.value, 5)),
   count(DISTINCT substr(src.value, 5))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n24
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby4.q.out 
b/ql/src/test/results/clientpositive/groupby4.q.out
index 9763761..9421907 100644
--- a/ql/src/test/results/clientpositive/groupby4.q.out
+++ b/ql/src/test/results/clientpositive/groupby4.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n168 SELECT substr(src.key,1,1) GROUP BY 
substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n168
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n168 SELECT substr(src.key,1,1) GROUP BY 
substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n168
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby4_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby4_map.q.out 
b/ql/src/test/results/clientpositive/groupby4_map.q.out
index 8d805ac..c5fec0b 100644
--- a/ql/src/test/results/clientpositive/groupby4_map.q.out
+++ b/ql/src/test/results/clientpositive/groupby4_map.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@dest1_n40
 PREHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n40 SELECT count(1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n40
 POSTHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n40 SELECT count(1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n40
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby4_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby4_map_skew.q.out 
b/ql/src/test/results/clientpositive/groupby4_map_skew.q.out
index 29309a8..c96e0de 100644
--- a/ql/src/test/results/clientpositive/groupby4_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/groupby4_map_skew.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@dest1_n141
 PREHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n141 SELECT count(1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n141
 POSTHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n141 SELECT count(1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n141
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby4_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby4_noskew.q.out 
b/ql/src/test/results/clientpositive/groupby4_noskew.q.out
index c3bbb20..6ec0204 100644
--- a/ql/src/test/results/clientpositive/groupby4_noskew.q.out
+++ b/ql/src/test/results/clientpositive/groupby4_noskew.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n33 SELECT substr(src.key,1,1) GROUP BY 
substr(src.key,1,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n33
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n33 SELECT substr(src.key,1,1) GROUP BY 
substr(src.key,1,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n33
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby5.q.out 
b/ql/src/test/results/clientpositive/groupby5.q.out
index b3c2da2..7386229 100644
--- a/ql/src/test/results/clientpositive/groupby5.q.out
+++ b/ql/src/test/results/clientpositive/groupby5.q.out
@@ -12,12 +12,16 @@ SELECT src.key, sum(substr(src.value,5))
 FROM src
 GROUP BY src.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n36
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE dest1_n36 
 SELECT src.key, sum(substr(src.value,5)) 
 FROM src
 GROUP BY src.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n36
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby5_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby5_map.q.out 
b/ql/src/test/results/clientpositive/groupby5_map.q.out
index ea4d7c5..499986f 100644
--- a/ql/src/test/results/clientpositive/groupby5_map.q.out
+++ b/ql/src/test/results/clientpositive/groupby5_map.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@dest1_n75
 PREHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n75 SELECT sum(src.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n75
 POSTHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n75 SELECT sum(src.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n75
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby5_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby5_map_skew.q.out 
b/ql/src/test/results/clientpositive/groupby5_map_skew.q.out
index 9634b2c..f5ddd19 100644
--- a/ql/src/test/results/clientpositive/groupby5_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/groupby5_map_skew.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@dest1_n76
 PREHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n76 SELECT sum(src.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n76
 POSTHOOK: query: EXPLAIN
 FROM src INSERT OVERWRITE TABLE dest1_n76 SELECT sum(src.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n76
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby5_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby5_noskew.q.out 
b/ql/src/test/results/clientpositive/groupby5_noskew.q.out
index 5307bc7..36f241f 100644
--- a/ql/src/test/results/clientpositive/groupby5_noskew.q.out
+++ b/ql/src/test/results/clientpositive/groupby5_noskew.q.out
@@ -12,12 +12,16 @@ SELECT src.key, sum(substr(src.value,5))
 FROM src
 GROUP BY src.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n31
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE dest1_n31 
 SELECT src.key, sum(substr(src.value,5)) 
 FROM src
 GROUP BY src.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n31
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby6.q.out 
b/ql/src/test/results/clientpositive/groupby6.q.out
index 5928da6..0b58c94 100644
--- a/ql/src/test/results/clientpositive/groupby6.q.out
+++ b/ql/src/test/results/clientpositive/groupby6.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n92 SELECT DISTINCT substr(src.value,5,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n92
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n92 SELECT DISTINCT substr(src.value,5,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n92
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby6_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby6_map.q.out 
b/ql/src/test/results/clientpositive/groupby6_map.q.out
index 3e6c10c..a2fee3f 100644
--- a/ql/src/test/results/clientpositive/groupby6_map.q.out
+++ b/ql/src/test/results/clientpositive/groupby6_map.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n19 SELECT DISTINCT substr(src.value,5,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n19
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n19 SELECT DISTINCT substr(src.value,5,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n19
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby6_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby6_map_skew.q.out 
b/ql/src/test/results/clientpositive/groupby6_map_skew.q.out
index 71aa30c..0cac232 100644
--- a/ql/src/test/results/clientpositive/groupby6_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/groupby6_map_skew.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n98 SELECT DISTINCT substr(src.value,5,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n98
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n98 SELECT DISTINCT substr(src.value,5,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n98
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby6_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby6_noskew.q.out 
b/ql/src/test/results/clientpositive/groupby6_noskew.q.out
index 5a99961..4504b53 100644
--- a/ql/src/test/results/clientpositive/groupby6_noskew.q.out
+++ b/ql/src/test/results/clientpositive/groupby6_noskew.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n100 SELECT DISTINCT substr(src.value,5,1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n100
 POSTHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1_n100 SELECT DISTINCT substr(src.value,5,1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n100
 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/c39b5d1b/ql/src/test/results/clientpositive/groupby7_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby7_map.q.out 
b/ql/src/test/results/clientpositive/groupby7_map.q.out
index 5b4b9af..cb4f3b2 100644
--- a/ql/src/test/results/clientpositive/groupby7_map.q.out
+++ b/ql/src/test/results/clientpositive/groupby7_map.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n82 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n19 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n82
+PREHOOK: Output: default@dest2_n19
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n82 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n19 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n82
+POSTHOOK: Output: default@dest2_n19
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby7_map_multi_single_reducer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby7_map_multi_single_reducer.q.out 
b/ql/src/test/results/clientpositive/groupby7_map_multi_single_reducer.q.out
index 00d26b9..a41037c 100644
--- a/ql/src/test/results/clientpositive/groupby7_map_multi_single_reducer.q.out
+++ b/ql/src/test/results/clientpositive/groupby7_map_multi_single_reducer.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n15 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n3 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP 
BY SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n15
+PREHOOK: Output: default@dest2_n3
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n15 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n3 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP 
BY SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n15
+POSTHOOK: Output: default@dest2_n3
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby7_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby7_map_skew.q.out 
b/ql/src/test/results/clientpositive/groupby7_map_skew.q.out
index 089a14e..e5dea0d 100644
--- a/ql/src/test/results/clientpositive/groupby7_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/groupby7_map_skew.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n21 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n5 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP 
BY SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n21
+PREHOOK: Output: default@dest2_n5
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n21 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n5 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP 
BY SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n21
+POSTHOOK: Output: default@dest2_n5
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby7_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby7_noskew.q.out 
b/ql/src/test/results/clientpositive/groupby7_noskew.q.out
index ec83bb6..49ebc26 100644
--- a/ql/src/test/results/clientpositive/groupby7_noskew.q.out
+++ b/ql/src/test/results/clientpositive/groupby7_noskew.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n101 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n28 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n101
+PREHOOK: Output: default@dest2_n28
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n101 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n28 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n101
+POSTHOOK: Output: default@dest2_n28
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out 
b/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out
index c844e51..f07c58a 100644
--- 
a/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out
+++ 
b/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n170 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key ORDER BY SRC.key limit 10
 INSERT OVERWRITE TABLE DEST2_n42 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key ORDER BY SRC.key limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n170
+PREHOOK: Output: default@dest2_n42
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n170 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key ORDER BY SRC.key limit 10
 INSERT OVERWRITE TABLE DEST2_n42 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key ORDER BY SRC.key limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n170
+POSTHOOK: Output: default@dest2_n42
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby8.q.out 
b/ql/src/test/results/clientpositive/groupby8.q.out
index 2d8ea6f..1c5d16d 100644
--- a/ql/src/test/results/clientpositive/groupby8.q.out
+++ b/ql/src/test/results/clientpositive/groupby8.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n71 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n15 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n71
+PREHOOK: Output: default@dest2_n15
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n71 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n15 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n71
+POSTHOOK: Output: default@dest2_n15
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -970,11 +976,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n71 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n15 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n71
+PREHOOK: Output: default@dest2_n15
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n71 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n15 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n71
+POSTHOOK: Output: default@dest2_n15
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby8_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby8_map.q.out 
b/ql/src/test/results/clientpositive/groupby8_map.q.out
index cf3ade6..e61020e 100644
--- a/ql/src/test/results/clientpositive/groupby8_map.q.out
+++ b/ql/src/test/results/clientpositive/groupby8_map.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n136 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n35 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n136
+PREHOOK: Output: default@dest2_n35
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n136 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n35 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n136
+POSTHOOK: Output: default@dest2_n35
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby8_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby8_map_skew.q.out 
b/ql/src/test/results/clientpositive/groupby8_map_skew.q.out
index 86598aa..85325e9 100644
--- a/ql/src/test/results/clientpositive/groupby8_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/groupby8_map_skew.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n87 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n22 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n87
+PREHOOK: Output: default@dest2_n22
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n87 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n22 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n87
+POSTHOOK: Output: default@dest2_n22
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby8_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby8_noskew.q.out 
b/ql/src/test/results/clientpositive/groupby8_noskew.q.out
index a3d3656..44e4946 100644
--- a/ql/src/test/results/clientpositive/groupby8_noskew.q.out
+++ b/ql/src/test/results/clientpositive/groupby8_noskew.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n48 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n9 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n48
+PREHOOK: Output: default@dest2_n9
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n48 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n9 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n48
+POSTHOOK: Output: default@dest2_n9
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby9.q.out 
b/ql/src/test/results/clientpositive/groupby9.q.out
index 8d97bdf..043d1b5 100644
--- a/ql/src/test/results/clientpositive/groupby9.q.out
+++ b/ql/src/test/results/clientpositive/groupby9.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key, SRC.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n117
+PREHOOK: Output: default@dest2_n31
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key, SRC.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n117
+POSTHOOK: Output: default@dest2_n31
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2
@@ -892,11 +898,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.value, SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n117
+PREHOOK: Output: default@dest2_n31
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.value, SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n117
+POSTHOOK: Output: default@dest2_n31
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2
@@ -1765,11 +1777,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key, SRC.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n117
+PREHOOK: Output: default@dest2_n31
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key, SRC.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n117
+POSTHOOK: Output: default@dest2_n31
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2
@@ -2638,11 +2656,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, 
COUNT(SUBSTR(SRC.value,5)) GROUP BY SRC.key, SRC.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n117
+PREHOOK: Output: default@dest2_n31
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(SUBSTR(SRC.value,5)) 
GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, 
COUNT(SUBSTR(SRC.value,5)) GROUP BY SRC.key, SRC.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n117
+POSTHOOK: Output: default@dest2_n31
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2
@@ -3514,11 +3538,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.value, SRC.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n117
+PREHOOK: Output: default@dest2_n31
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n117 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
 INSERT OVERWRITE TABLE DEST2_n31 SELECT SRC.key, SRC.value, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.value, SRC.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n117
+POSTHOOK: Output: default@dest2_n31
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_complex_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_complex_types.q.out 
b/ql/src/test/results/clientpositive/groupby_complex_types.q.out
index e40d26a..5d4eb7c 100644
--- a/ql/src/test/results/clientpositive/groupby_complex_types.q.out
+++ b/ql/src/test/results/clientpositive/groupby_complex_types.q.out
@@ -28,12 +28,20 @@ INSERT OVERWRITE TABLE DEST1_n163 SELECT ARRAY(SRC.key), 
COUNT(1) GROUP BY ARRAY
 INSERT OVERWRITE TABLE DEST2_n41 SELECT MAP(SRC.key, SRC.value), COUNT(1) 
GROUP BY MAP(SRC.key, SRC.value)
 INSERT OVERWRITE TABLE DEST3_n7 SELECT STRUCT(SRC.key, SRC.value), COUNT(1) 
GROUP BY STRUCT(SRC.key, SRC.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n163
+PREHOOK: Output: default@dest2_n41
+PREHOOK: Output: default@dest3_n7
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n163 SELECT ARRAY(SRC.key), COUNT(1) GROUP BY 
ARRAY(SRC.key)
 INSERT OVERWRITE TABLE DEST2_n41 SELECT MAP(SRC.key, SRC.value), COUNT(1) 
GROUP BY MAP(SRC.key, SRC.value)
 INSERT OVERWRITE TABLE DEST3_n7 SELECT STRUCT(SRC.key, SRC.value), COUNT(1) 
GROUP BY STRUCT(SRC.key, SRC.value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n163
+POSTHOOK: Output: default@dest2_n41
+POSTHOOK: Output: default@dest3_n7
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
   Stage-0 depends on stages: Stage-3

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out
 
b/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out
index d52b277..fcb12ee 100644
--- 
a/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out
+++ 
b/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out
@@ -19,11 +19,17 @@ FROM SRC
 INSERT OVERWRITE TABLE DEST1_n47 SELECT ARRAY(SRC.key) as keyarray, COUNT(1) 
GROUP BY ARRAY(SRC.key) ORDER BY keyarray limit 10
 INSERT OVERWRITE TABLE DEST2_n8 SELECT MAP(SRC.key, SRC.value) as kvmap, 
COUNT(1) GROUP BY MAP(SRC.key, SRC.value) ORDER BY kvmap limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1_n47
+PREHOOK: Output: default@dest2_n8
 POSTHOOK: query: EXPLAIN
 FROM SRC
 INSERT OVERWRITE TABLE DEST1_n47 SELECT ARRAY(SRC.key) as keyarray, COUNT(1) 
GROUP BY ARRAY(SRC.key) ORDER BY keyarray limit 10
 INSERT OVERWRITE TABLE DEST2_n8 SELECT MAP(SRC.key, SRC.value) as kvmap, 
COUNT(1) GROUP BY MAP(SRC.key, SRC.value) ORDER BY kvmap limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1_n47
+POSTHOOK: Output: default@dest2_n8
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_cube1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_cube1.q.out 
b/ql/src/test/results/clientpositive/groupby_cube1.q.out
index da87cbf..188c64e 100644
--- a/ql/src/test/results/clientpositive/groupby_cube1.q.out
+++ b/ql/src/test/results/clientpositive/groupby_cube1.q.out
@@ -17,9 +17,13 @@ POSTHOOK: Output: default@t1_n82
 PREHOOK: query: EXPLAIN
 SELECT key, val, count(1) FROM T1_n82 GROUP BY key, val with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT key, val, count(1) FROM T1_n82 GROUP BY key, val with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -76,9 +80,13 @@ STAGE PLANS:
 PREHOOK: query: EXPLAIN
 SELECT key, val, count(1) FROM T1_n82 GROUP BY CUBE(key, val)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT key, val, count(1) FROM T1_n82 GROUP BY CUBE(key, val)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -161,9 +169,13 @@ NULL       NULL    6
 PREHOOK: query: EXPLAIN
 SELECT key, val, GROUPING__ID, count(1) FROM T1_n82 GROUP BY key, val with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT key, val, GROUPING__ID, count(1) FROM T1_n82 GROUP BY key, val with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -245,9 +257,13 @@ NULL       NULL    3       6
 PREHOOK: query: EXPLAIN
 SELECT key, count(distinct val) FROM T1_n82 GROUP BY key with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT key, count(distinct val) FROM T1_n82 GROUP BY key with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -317,9 +333,13 @@ NULL       6
 PREHOOK: query: EXPLAIN
 SELECT key, val, count(1) FROM T1_n82 GROUP BY key, val with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT key, val, count(1) FROM T1_n82 GROUP BY key, val with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -427,9 +447,13 @@ NULL       NULL    6
 PREHOOK: query: EXPLAIN
 SELECT key, count(distinct val) FROM T1_n82 GROUP BY key with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT key, count(distinct val) FROM T1_n82 GROUP BY key with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n82
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -542,11 +566,17 @@ FROM T1_n82
 INSERT OVERWRITE TABLE T2_n51 SELECT key, val, count(1) group by key, val with 
cube
 INSERT OVERWRITE TABLE T3_n16 SELECT key, val, sum(1) group by key, val with 
cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n82
+PREHOOK: Output: default@t2_n51
+PREHOOK: Output: default@t3_n16
 POSTHOOK: query: EXPLAIN
 FROM T1_n82
 INSERT OVERWRITE TABLE T2_n51 SELECT key, val, count(1) group by key, val with 
cube
 INSERT OVERWRITE TABLE T3_n16 SELECT key, val, sum(1) group by key, val with 
cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n82
+POSTHOOK: Output: default@t2_n51
+POSTHOOK: Output: default@t3_n16
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out 
b/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
index 5f08df6..477aee9 100644
--- a/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
+++ b/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
@@ -22,6 +22,9 @@ insert into table t2_n13 select
 key, value
 group by key, value grouping sets ((key), (key, value))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@t1_n21
+PREHOOK: Output: default@t2_n13
 POSTHOOK: query: explain from src
 insert into table t1_n21 select
 key, GROUPING__ID
@@ -30,6 +33,9 @@ insert into table t2_n13 select
 key, value
 group by key, value grouping sets ((key), (key, value))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@t1_n21
+POSTHOOK: Output: default@t2_n13
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-0 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out 
b/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out
index 7c11b8a..db1e2bc 100644
--- a/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out
+++ b/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out
@@ -20,8 +20,12 @@ POSTHOOK: Lineage: t1_n60.str1 SIMPLE 
[(src)src.FieldSchema(name:value, type:str
 POSTHOOK: Lineage: t1_n60.str2 SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
 PREHOOK: query: explain select Q1.int1_n60, sum(distinct Q1.int1_n60) from 
(select * from t1_n60 order by int1_n60) Q1 group by Q1.int1_n60
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n60
+#### A masked pattern was here ####
 POSTHOOK: query: explain select Q1.int1_n60, sum(distinct Q1.int1_n60) from 
(select * from t1_n60 order by int1_n60) Q1 group by Q1.int1_n60
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n60
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -71,8 +75,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select int1_n60, sum(distinct int1_n60) from t1_n60 
group by int1_n60
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n60
+#### A masked pattern was here ####
 POSTHOOK: query: explain select int1_n60, sum(distinct int1_n60) from t1_n60 
group by int1_n60
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n60
+#### 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/c39b5d1b/ql/src/test/results/clientpositive/groupby_duplicate_key.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_duplicate_key.q.out 
b/ql/src/test/results/clientpositive/groupby_duplicate_key.q.out
index cb6a647..3fe95af 100644
--- a/ql/src/test/results/clientpositive/groupby_duplicate_key.q.out
+++ b/ql/src/test/results/clientpositive/groupby_duplicate_key.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select distinct key, "" as dummy1, "" as dummy2 from src tablesample (10 rows)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select distinct key, "" as dummy1, "" as dummy2 from src tablesample (10 rows)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -77,10 +81,16 @@ PREHOOK: query: explain
 create table dummy_n6 as
 select distinct key, "X" as dummy1, "X" as dummy2 from src tablesample (10 
rows)
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@dummy_n6
 POSTHOOK: query: explain
 create table dummy_n6 as
 select distinct key, "X" as dummy1, "X" as dummy2 from src tablesample (10 
rows)
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@dummy_n6
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -184,9 +194,13 @@ POSTHOOK: Input: default@dummy_n6
 PREHOOK: query: explain
 select max('pants'), max('pANTS') from src group by key limit 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select max('pants'), max('pANTS') from src group by key limit 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_empty.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_empty.q.out 
b/ql/src/test/results/clientpositive/groupby_empty.q.out
index 22a2060..cabeb42 100644
--- a/ql/src/test/results/clientpositive/groupby_empty.q.out
+++ b/ql/src/test/results/clientpositive/groupby_empty.q.out
@@ -17,8 +17,12 @@ POSTHOOK: Output: default@t_n34
 POSTHOOK: Lineage: t_n34.a SCRIPT []
 PREHOOK: query: explain select count(*) from t_n34 group by ()
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n34
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from t_n34 group by ()
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n34
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
index 018c7da..d96d81f 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
@@ -21,6 +21,8 @@ GROUP BY key, value
 GROUPING SETS ((), (key))
 HAVING GROUPING__ID = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n86
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT key, value, GROUPING__ID, count(*)
 FROM T1_n86
@@ -28,6 +30,8 @@ GROUP BY key, value
 GROUPING SETS ((), (key))
 HAVING GROUPING__ID = 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n86
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -111,6 +115,8 @@ GROUP BY key, value
 GROUPING SETS ((), (key))
 HAVING GROUPING__ID = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n86
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT key, value, GROUPING__ID, count(*)
 FROM T1_n86
@@ -118,6 +124,8 @@ GROUP BY key, value
 GROUPING SETS ((), (key))
 HAVING GROUPING__ID = 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n86
+#### 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/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out
index 5eda076..ded3d13 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out
@@ -32,9 +32,13 @@ t1_n41.a     t1_n41.b        t1_n41.c
 PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n41 group by a, b with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n41 group by a, b with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -116,9 +120,13 @@ NULL       NULL    6
 PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n41 group by cube(a, b)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n41 group by cube(a, b)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -200,9 +208,13 @@ NULL       NULL    6
 PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM T1_n41 GROUP BY a, b  GROUPING SETS (a, (a, b), b, 
())
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM T1_n41 GROUP BY a, b  GROUPING SETS (a, (a, b), b, 
())
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -284,9 +296,13 @@ NULL       NULL    6
 PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM T1_n41 GROUP BY a, b GROUPING SETS (a, (a, b))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM T1_n41 GROUP BY a, b GROUPING SETS (a, (a, b))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -364,9 +380,13 @@ a  b       _c2
 PREHOOK: query: EXPLAIN
 SELECT a FROM T1_n41 GROUP BY a, b, c GROUPING SETS (a, b, c)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a FROM T1_n41 GROUP BY a, b, c GROUPING SETS (a, b, c)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -444,9 +464,13 @@ NULL
 PREHOOK: query: EXPLAIN
 SELECT a FROM T1_n41 GROUP BY a GROUPING SETS ((a), (a))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a FROM T1_n41 GROUP BY a GROUPING SETS ((a), (a))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -510,9 +534,13 @@ a
 PREHOOK: query: EXPLAIN
 SELECT a + b, count(*) FROM T1_n41 GROUP BY a + b GROUPING SETS (a+b)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a + b, count(*) FROM T1_n41 GROUP BY a + b GROUPING SETS (a+b)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n41
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out
index 196d9b6..58f1f42 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out
@@ -17,9 +17,13 @@ POSTHOOK: Output: default@t1_n81
 PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n81 group by a, b with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n81
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n81 group by a, b with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n81
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -102,9 +106,13 @@ STAGE PLANS:
 PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n81 group by cube(a, b)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n81
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n81 group by cube(a, b)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n81
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -211,9 +219,13 @@ NULL       NULL    6
 PREHOOK: query: EXPLAIN
 SELECT a, b, sum(c) from T1_n81 group by a, b with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n81
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, sum(c) from T1_n81 group by a, b with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n81
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -343,9 +355,13 @@ _col0      _col1   _col2   _col3
 PREHOOK: query: EXPLAIN
 SELECT a, b, sum(c+d) from T2_n50 group by a, b with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t2_n50
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, sum(c+d) from T2_n50 group by a, b with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2_n50
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
index 8ad784c..3416616 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
@@ -25,9 +25,13 @@ POSTHOOK: Output: default@t1_n118
 PREHOOK: query: EXPLAIN
 SELECT a, b, avg(c), count(*) from T1_n118 group by a, b with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n118
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, avg(c), count(*) from T1_n118 group by a, b with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n118
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -85,9 +89,13 @@ STAGE PLANS:
 PREHOOK: query: EXPLAIN
 SELECT a, b, avg(c), count(*) from T1_n118 group by cube(a, b)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n118
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, avg(c), count(*) from T1_n118 group by cube(a, b)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n118
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -170,9 +178,13 @@ NULL       NULL    3.8333333333333335      12
 PREHOOK: query: EXPLAIN
 SELECT a, b, avg(c), count(*) from T1_n118 group by a, b with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n118
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, avg(c), count(*) from T1_n118 group by a, b with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n118
+#### A masked pattern was here ####
 Explain
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
index fd1163d..9c573dd 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
@@ -21,6 +21,8 @@ join
 (SELECT a, b, count(*) from T1_n143 where a < 3 group by a, b with cube) subq2
 on subq1.a = subq2.a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n143
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM
 (SELECT a, b, count(*) from T1_n143 where a < 3 group by a, b with cube) subq1
@@ -28,6 +30,8 @@ join
 (SELECT a, b, count(*) from T1_n143 where a < 3 group by a, b with cube) subq2
 on subq1.a = subq2.a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n143
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -168,6 +172,8 @@ join
 (SELECT a, b, count(*) from T1_n143 where a < 3 group by cube(a, b) ) subq2
 on subq1.a = subq2.a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n143
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM
 (SELECT a, b, count(*) from T1_n143 where a < 3 group by cube(a, b) ) subq1
@@ -175,6 +181,8 @@ join
 (SELECT a, b, count(*) from T1_n143 where a < 3 group by cube(a, b) ) subq2
 on subq1.a = subq2.a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n143
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-3
@@ -344,6 +352,8 @@ join
 (SELECT a, b, count(*) from T1_n143 where a < 3 group by a, b with cube) subq2
 on subq1.a = subq2.a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n143
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT * FROM
 (SELECT a, b, count(*) from T1_n143 where a < 3 group by a, b with cube) subq1
@@ -351,6 +361,8 @@ join
 (SELECT a, b, count(*) from T1_n143 where a < 3 group by a, b with cube) subq2
 on subq1.a = subq2.a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n143
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out
index b6754db..5037c84 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out
@@ -18,10 +18,14 @@ PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM
 (SELECT a, b, count(1) from T1_n24 group by a, b) subq1 group by a, b with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n24
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM
 (SELECT a, b, count(1) from T1_n24 group by a, b) subq1 group by a, b with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n24
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -107,10 +111,14 @@ PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM
 (SELECT a, b, count(1) from T1_n24 group by a, b) subq1 group by cube(a, b)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n24
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM
 (SELECT a, b, count(1) from T1_n24 group by a, b) subq1 group by cube(a, b)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n24
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -221,10 +229,14 @@ PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM
 (SELECT a, b, count(1) from T1_n24 group by a, b) subq1 group by a, b with cube
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n24
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM
 (SELECT a, b, count(1) from T1_n24 group by a, b) subq1 group by a, b with cube
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n24
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
index 38c1cb0..996452c 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
@@ -19,11 +19,15 @@ SELECT a, b FROM
 (SELECT a, b from T1_n75 group by a, b grouping sets ( (a,b),a )) res
 WHERE res.a=5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n75
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b FROM
 (SELECT a, b from T1_n75 group by a, b grouping sets ( (a,b),a )) res
 WHERE res.a=5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n75
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -88,11 +92,15 @@ SELECT a, b FROM
 (SELECT a, b from T1_n75 group by a, b grouping sets ( (a,b),a )) res
 WHERE res.a=5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n75
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b FROM
 (SELECT a, b from T1_n75 group by a, b grouping sets ( (a,b),a )) res
 WHERE res.a=5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n75
+#### 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/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
index d5945ea..3b5a097 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
@@ -19,11 +19,15 @@ select key, value, `grouping__id`, grouping(key), 
grouping(value)
 from T1_n64
 group by rollup(key, value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, `grouping__id`, grouping(key), grouping(value)
 from T1_n64
 group by rollup(key, value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -101,11 +105,15 @@ select key, value, `grouping__id`, grouping(key), 
grouping(value)
 from T1_n64
 group by cube(key, value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, `grouping__id`, grouping(key), grouping(value)
 from T1_n64
 group by cube(key, value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -189,12 +197,16 @@ from T1_n64
 group by cube(key, value)
 having grouping(key) = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value
 from T1_n64
 group by cube(key, value)
 having grouping(key) = 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -274,6 +286,8 @@ group by cube(key, value)
 having grouping(key) = 1 OR grouping(value) = 1
 order by x desc, case when x = 1 then key end
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, grouping(key)+grouping(value) as x
 from T1_n64
@@ -281,6 +295,8 @@ group by cube(key, value)
 having grouping(key) = 1 OR grouping(value) = 1
 order by x desc, case when x = 1 then key end
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -386,11 +402,15 @@ select key, value, `grouping__id`, grouping(key), 
grouping(value)
 from T1_n64
 group by rollup(key, value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, `grouping__id`, grouping(key), grouping(value)
 from T1_n64
 group by rollup(key, value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -468,11 +488,15 @@ select key, value, `grouping__id`, grouping(key), 
grouping(value)
 from T1_n64
 group by cube(key, value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, `grouping__id`, grouping(key), grouping(value)
 from T1_n64
 group by cube(key, value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -556,12 +580,16 @@ from T1_n64
 group by cube(key, value)
 having grouping(key) = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value
 from T1_n64
 group by cube(key, value)
 having grouping(key) = 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -638,6 +666,8 @@ group by cube(key, value)
 having grouping(key) = 1 OR grouping(value) = 1
 order by x desc, case when x = 1 then key end
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, grouping(key)+grouping(value) as x
 from T1_n64
@@ -645,6 +675,8 @@ group by cube(key, value)
 having grouping(key) = 1 OR grouping(value) = 1
 order by x desc, case when x = 1 then key end
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -750,11 +782,15 @@ select key, value, grouping(key), grouping(value)
 from T1_n64
 group by key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, grouping(key), grouping(value)
 from T1_n64
 group by key, value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -827,11 +863,15 @@ select key, value, grouping(value)
 from T1_n64
 group by key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, grouping(value)
 from T1_n64
 group by key, value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -905,12 +945,16 @@ from T1_n64
 group by key, value
 having grouping(key) = 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value
 from T1_n64
 group by key, value
 having grouping(key) = 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -981,11 +1025,15 @@ select key, value, `grouping__id`, grouping(key, value)
 from T1_n64
 group by cube(key, value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, `grouping__id`, grouping(key, value)
 from T1_n64
 group by cube(key, value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1068,11 +1116,15 @@ select key, value, `grouping__id`, grouping(value, key)
 from T1_n64
 group by cube(key, value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, `grouping__id`, grouping(value, key)
 from T1_n64
 group by cube(key, value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1155,11 +1207,15 @@ select key, value, `grouping__id`, grouping(key, value)
 from T1_n64
 group by rollup(key, value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, `grouping__id`, grouping(key, value)
 from T1_n64
 group by rollup(key, value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1237,11 +1293,15 @@ select key, value, `grouping__id`, grouping(value, key)
 from T1_n64
 group by rollup(key, value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n64
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value, `grouping__id`, grouping(value, key)
 from T1_n64
 group by rollup(key, value)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n64
+#### 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/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_sets_limit.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby_grouping_sets_limit.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets_limit.q.out
index 241dfb9..7719284 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets_limit.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets_limit.q.out
@@ -17,9 +17,13 @@ POSTHOOK: Output: default@t1_n141
 PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n141 group by a, b with cube LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) from T1_n141 group by a, b with cube LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -99,9 +103,13 @@ NULL        NULL    6
 PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM T1_n141 GROUP BY a, b  GROUPING SETS (a, (a, b), b, 
()) LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM T1_n141 GROUP BY a, b  GROUPING SETS (a, (a, b), b, 
()) LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -181,9 +189,13 @@ NULL       NULL    6
 PREHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM T1_n141 GROUP BY a, b GROUPING SETS (a, (a, b)) 
LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a, b, count(*) FROM T1_n141 GROUP BY a, b GROUPING SETS (a, (a, b)) 
LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -263,9 +275,13 @@ POSTHOOK: Input: default@t1_n141
 PREHOOK: query: EXPLAIN
 SELECT a FROM T1_n141 GROUP BY a, b, c GROUPING SETS (a, b, c) LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a FROM T1_n141 GROUP BY a, b, c GROUPING SETS (a, b, c) LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -342,9 +358,13 @@ NULL
 PREHOOK: query: EXPLAIN
 SELECT a FROM T1_n141 GROUP BY a GROUPING SETS ((a), (a)) LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a FROM T1_n141 GROUP BY a GROUPING SETS ((a), (a)) LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -411,9 +431,13 @@ POSTHOOK: Input: default@t1_n141
 PREHOOK: query: EXPLAIN
 SELECT a + b, count(*) FROM T1_n141 GROUP BY a + b GROUPING SETS (a+b) LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_n141
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT a + b, count(*) FROM T1_n141 GROUP BY a + b GROUPING SETS (a+b) LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_n141
+#### 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/c39b5d1b/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_window.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
index f50b8dc..2bb9a97 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
@@ -24,6 +24,8 @@ GROUP BY category
 GROUPING SETS ((), (category))
 HAVING max(comments) > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t_n33
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select category, max(live) live, max(comments) comments, rank() OVER 
(PARTITION BY category ORDER BY comments) rank1
 FROM t_n33
@@ -31,6 +33,8 @@ GROUP BY category
 GROUPING SETS ((), (category))
 HAVING max(comments) > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t_n33
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

Reply via email to