You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/08/22 23:37:21 UTC

svn commit: r1619936 [24/49] - in /hive/branches/cbo: ./ accumulo-handler/ ant/src/org/apache/hadoop/hive/ant/ bin/ common/src/java/org/apache/hadoop/hive/ant/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/java/org/apache/hadoop/hive/c...

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer1.q.out Fri Aug 22 21:36:47 2014
@@ -1085,15 +1085,15 @@ STAGE PLANS:
           condition expressions:
             0 
             1 {KEY.reducesinkkey0}
-          outputColumnNames: _col4
+          outputColumnNames: _col5
           Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col4 (type: string)
-            outputColumnNames: _col4
+            expressions: _col5 (type: string)
+            outputColumnNames: _col5
             Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col4 (type: string)
+              keys: _col5 (type: string)
               mode: hash
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
@@ -1231,15 +1231,15 @@ STAGE PLANS:
           condition expressions:
             0 
             1 {KEY.reducesinkkey0}
-          outputColumnNames: _col4
+          outputColumnNames: _col5
           Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col4 (type: string)
-            outputColumnNames: _col4
+            expressions: _col5 (type: string)
+            outputColumnNames: _col5
             Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col4 (type: string)
+              keys: _col5 (type: string)
               mode: hash
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
@@ -1380,15 +1380,15 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {KEY.reducesinkkey1}
-          outputColumnNames: _col0, _col5
+          outputColumnNames: _col0, _col6
           Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col5 (type: string)
-            outputColumnNames: _col0, _col5
+            expressions: _col0 (type: string), _col6 (type: string)
+            outputColumnNames: _col0, _col6
             Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col0 (type: string), _col5 (type: string)
+              keys: _col0 (type: string), _col6 (type: string)
               mode: hash
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
@@ -1506,15 +1506,15 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {KEY.reducesinkkey1}
-          outputColumnNames: _col0, _col5
+          outputColumnNames: _col0, _col6
           Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col5 (type: string)
-            outputColumnNames: _col0, _col5
+            expressions: _col0 (type: string), _col6 (type: string)
+            outputColumnNames: _col0, _col6
             Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col0 (type: string), _col5 (type: string)
+              keys: _col0 (type: string), _col6 (type: string)
               mode: hash
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
@@ -1641,15 +1641,15 @@ STAGE PLANS:
           condition expressions:
             0 
             1 {KEY.reducesinkkey0}
-          outputColumnNames: _col4
+          outputColumnNames: _col5
           Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col4 (type: string)
-            outputColumnNames: _col4
+            expressions: _col5 (type: string)
+            outputColumnNames: _col5
             Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col4 (type: string)
+              keys: _col5 (type: string)
               mode: hash
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
@@ -1788,17 +1788,17 @@ STAGE PLANS:
             condition expressions:
               0 
               1 {KEY.reducesinkkey0}
-            outputColumnNames: _col4
+            outputColumnNames: _col5
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
-              expressions: _col4 (type: string)
-              outputColumnNames: _col4
+              expressions: _col5 (type: string)
+              outputColumnNames: _col5
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Mux Operator
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 Group By Operator
                   aggregations: count(1)
-                  keys: _col4 (type: string)
+                  keys: _col5 (type: string)
                   mode: complete
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer11.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer11.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer11.q.out Fri Aug 22 21:36:47 2014
@@ -4,6 +4,7 @@ PREHOOK: query: -- Tests in this file ar
 CREATE TABLE part_table(key string, value string) PARTITIONED BY (partitionId int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@part_table
 POSTHOOK: query: -- Tests in this file are used to make sure Correlation Optimizer
 -- can correctly handle tables with partitions
 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer13.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer13.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer13.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp
 POSTHOOK: query: CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer4.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer4.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE T1(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -16,6 +17,7 @@ POSTHOOK: Output: default@t1
 PREHOOK: query: CREATE TABLE T2(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -31,6 +33,7 @@ POSTHOOK: Output: default@t2
 PREHOOK: query: CREATE TABLE T3(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T3
 POSTHOOK: query: CREATE TABLE T3(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -115,15 +118,15 @@ STAGE PLANS:
             0 
             1 {KEY.reducesinkkey0}
             2 
-          outputColumnNames: _col4
+          outputColumnNames: _col5
           Statistics: Num rows: 8 Data size: 37 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col4 (type: int)
-            outputColumnNames: _col4
+            expressions: _col5 (type: int)
+            outputColumnNames: _col5
             Statistics: Num rows: 8 Data size: 37 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col4 (type: int)
+              keys: _col5 (type: int)
               mode: hash
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 8 Data size: 37 Basic stats: COMPLETE Column stats: NONE
@@ -283,17 +286,17 @@ STAGE PLANS:
               0 
               1 {KEY.reducesinkkey0}
               2 
-            outputColumnNames: _col4
+            outputColumnNames: _col5
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
-              expressions: _col4 (type: int)
-              outputColumnNames: _col4
+              expressions: _col5 (type: int)
+              outputColumnNames: _col5
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Mux Operator
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 Group By Operator
                   aggregations: count(1)
-                  keys: _col4 (type: int)
+                  keys: _col5 (type: int)
                   mode: complete
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
@@ -449,15 +452,15 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                   2 key (type: int)
-                outputColumnNames: _col4
+                outputColumnNames: _col5
                 Statistics: Num rows: 8 Data size: 37 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col4 (type: int)
-                  outputColumnNames: _col4
+                  expressions: _col5 (type: int)
+                  outputColumnNames: _col5
                   Statistics: Num rows: 8 Data size: 37 Basic stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: count(1)
-                    keys: _col4 (type: int)
+                    keys: _col5 (type: int)
                     mode: hash
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 8 Data size: 37 Basic stats: COMPLETE Column stats: NONE
@@ -903,15 +906,15 @@ STAGE PLANS:
             0 
             1 {KEY.reducesinkkey0}
             2 
-          outputColumnNames: _col4
+          outputColumnNames: _col5
           Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col4 (type: int)
-            outputColumnNames: _col4
+            expressions: _col5 (type: int)
+            outputColumnNames: _col5
             Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col4 (type: int)
+              keys: _col5 (type: int)
               mode: hash
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
@@ -1065,15 +1068,15 @@ STAGE PLANS:
             0 
             1 
             2 {KEY.reducesinkkey0}
-          outputColumnNames: _col8
+          outputColumnNames: _col10
           Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col8 (type: int)
-            outputColumnNames: _col8
+            expressions: _col10 (type: int)
+            outputColumnNames: _col10
             Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col8 (type: int)
+              keys: _col10 (type: int)
               mode: hash
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
@@ -1224,17 +1227,17 @@ STAGE PLANS:
               0 
               1 
               2 {KEY.reducesinkkey0}
-            outputColumnNames: _col8
+            outputColumnNames: _col10
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
-              expressions: _col8 (type: int)
-              outputColumnNames: _col8
+              expressions: _col10 (type: int)
+              outputColumnNames: _col10
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Mux Operator
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 Group By Operator
                   aggregations: count(1)
-                  keys: _col8 (type: int)
+                  keys: _col10 (type: int)
                   mode: complete
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
@@ -1366,15 +1369,15 @@ STAGE PLANS:
             0 
             1 {KEY.reducesinkkey0}
             2 
-          outputColumnNames: _col4
+          outputColumnNames: _col5
           Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col4 (type: int)
-            outputColumnNames: _col4
+            expressions: _col5 (type: int)
+            outputColumnNames: _col5
             Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col4 (type: int)
+              keys: _col5 (type: int)
               mode: hash
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
@@ -1528,15 +1531,15 @@ STAGE PLANS:
             0 
             1 {KEY.reducesinkkey0}
             2 
-          outputColumnNames: _col4
+          outputColumnNames: _col5
           Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col4 (type: int)
-            outputColumnNames: _col4
+            expressions: _col5 (type: int)
+            outputColumnNames: _col5
             Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col4 (type: int)
+              keys: _col5 (type: int)
               mode: hash
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
@@ -1686,15 +1689,15 @@ STAGE PLANS:
             0 
             1 {KEY.reducesinkkey0}
             2 
-          outputColumnNames: _col4
+          outputColumnNames: _col5
           Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col4 (type: int)
-            outputColumnNames: _col4
+            expressions: _col5 (type: int)
+            outputColumnNames: _col5
             Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
               aggregations: count(1)
-              keys: _col4 (type: int)
+              keys: _col5 (type: int)
               mode: hash
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 15 Data size: 66 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer5.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer5.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer5.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE T1(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -16,6 +17,7 @@ POSTHOOK: Output: default@t1
 PREHOOK: query: CREATE TABLE T2(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -31,6 +33,7 @@ POSTHOOK: Output: default@t2
 PREHOOK: query: CREATE TABLE T3(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T3
 POSTHOOK: query: CREATE TABLE T3(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -46,6 +49,7 @@ POSTHOOK: Output: default@t3
 PREHOOK: query: CREATE TABLE T4(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T4
 POSTHOOK: query: CREATE TABLE T4(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -61,6 +65,7 @@ POSTHOOK: Output: default@t4
 PREHOOK: query: CREATE TABLE dest_co1(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest_co1
 POSTHOOK: query: CREATE TABLE dest_co1(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -68,6 +73,7 @@ POSTHOOK: Output: default@dest_co1
 PREHOOK: query: CREATE TABLE dest_co2(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest_co2
 POSTHOOK: query: CREATE TABLE dest_co2(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -75,6 +81,7 @@ POSTHOOK: Output: default@dest_co2
 PREHOOK: query: CREATE TABLE dest_co3(key INT, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest_co3
 POSTHOOK: query: CREATE TABLE dest_co3(key INT, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -142,10 +149,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {VALUE._col0}
-          outputColumnNames: _col0, _col5
+          outputColumnNames: _col0, _col6
           Statistics: Num rows: 29 Data size: 118 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col5 (type: string)
+            expressions: _col0 (type: int), _col6 (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 29 Data size: 118 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -394,10 +401,10 @@ STAGE PLANS:
             condition expressions:
               0 {KEY.reducesinkkey0}
               1 {VALUE._col0}
-            outputColumnNames: _col0, _col5
+            outputColumnNames: _col0, _col6
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
-              expressions: _col0 (type: int), _col5 (type: string)
+              expressions: _col0 (type: int), _col6 (type: string)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Mux Operator
@@ -539,10 +546,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: int)
                   1 key (type: int)
-                outputColumnNames: _col0, _col5
+                outputColumnNames: _col0, _col6
                 Statistics: Num rows: 29 Data size: 118 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col5 (type: string)
+                  expressions: _col0 (type: int), _col6 (type: string)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 29 Data size: 118 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer6.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer6.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer6.q.out Fri Aug 22 21:36:47 2014
@@ -811,10 +811,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col4, _col5
+          outputColumnNames: _col0, _col5, _col6
           Statistics: Num rows: 15 Data size: 1542 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col4 (type: string), _col5 (type: bigint)
+            expressions: _col0 (type: string), _col5 (type: string), _col6 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 15 Data size: 1542 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -930,10 +930,10 @@ STAGE PLANS:
               condition expressions:
                 0 {KEY.reducesinkkey0}
                 1 {KEY.reducesinkkey0} {VALUE._col0}
-              outputColumnNames: _col0, _col4, _col5
+              outputColumnNames: _col0, _col5, _col6
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col4 (type: string), _col5 (type: bigint)
+                expressions: _col0 (type: string), _col5 (type: string), _col6 (type: bigint)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 File Output Operator
@@ -961,10 +961,10 @@ STAGE PLANS:
                   condition expressions:
                     0 {KEY.reducesinkkey0}
                     1 {KEY.reducesinkkey0} {VALUE._col0}
-                  outputColumnNames: _col0, _col4, _col5
+                  outputColumnNames: _col0, _col5, _col6
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col4 (type: string), _col5 (type: bigint)
+                    expressions: _col0 (type: string), _col5 (type: string), _col6 (type: bigint)
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     File Output Operator
@@ -1148,10 +1148,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col4, _col5
+          outputColumnNames: _col0, _col5, _col6
           Statistics: Num rows: 16 Data size: 1700 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col4 (type: string), _col5 (type: bigint)
+            expressions: _col0 (type: string), _col5 (type: string), _col6 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 16 Data size: 1700 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -1267,10 +1267,10 @@ STAGE PLANS:
               condition expressions:
                 0 {KEY.reducesinkkey0}
                 1 {KEY.reducesinkkey0} {VALUE._col0}
-              outputColumnNames: _col0, _col4, _col5
+              outputColumnNames: _col0, _col5, _col6
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col4 (type: string), _col5 (type: bigint)
+                expressions: _col0 (type: string), _col5 (type: string), _col6 (type: bigint)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 File Output Operator
@@ -1312,10 +1312,10 @@ STAGE PLANS:
                         condition expressions:
                           0 {KEY.reducesinkkey0}
                           1 {KEY.reducesinkkey0} {VALUE._col0}
-                        outputColumnNames: _col0, _col4, _col5
+                        outputColumnNames: _col0, _col5, _col6
                         Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                         Select Operator
-                          expressions: _col0 (type: string), _col4 (type: string), _col5 (type: bigint)
+                          expressions: _col0 (type: string), _col5 (type: string), _col6 (type: bigint)
                           outputColumnNames: _col0, _col1, _col2
                           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                           File Output Operator
@@ -1909,10 +1909,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0}
             1 
             2 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col8, _col9
+          outputColumnNames: _col0, _col10, _col11
           Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col8 (type: string), _col9 (type: bigint)
+            expressions: _col0 (type: string), _col10 (type: string), _col11 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -2073,10 +2073,10 @@ STAGE PLANS:
                 0 {KEY.reducesinkkey0}
                 1 
                 2 {KEY.reducesinkkey0} {VALUE._col0}
-              outputColumnNames: _col0, _col8, _col9
+              outputColumnNames: _col0, _col10, _col11
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col8 (type: string), _col9 (type: bigint)
+                expressions: _col0 (type: string), _col10 (type: string), _col11 (type: bigint)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 File Output Operator
@@ -2120,10 +2120,10 @@ STAGE PLANS:
                           0 {KEY.reducesinkkey0}
                           1 
                           2 {KEY.reducesinkkey0} {VALUE._col0}
-                        outputColumnNames: _col0, _col8, _col9
+                        outputColumnNames: _col0, _col10, _col11
                         Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                         Select Operator
-                          expressions: _col0 (type: string), _col8 (type: string), _col9 (type: bigint)
+                          expressions: _col0 (type: string), _col10 (type: string), _col11 (type: bigint)
                           outputColumnNames: _col0, _col1, _col2
                           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                           File Output Operator
@@ -2346,10 +2346,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 
-          outputColumnNames: _col0, _col4, _col5
+          outputColumnNames: _col0, _col5, _col6
           Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col4 (type: string), _col5 (type: bigint)
+            expressions: _col0 (type: string), _col5 (type: string), _col6 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -2504,10 +2504,10 @@ STAGE PLANS:
                 0 {KEY.reducesinkkey0}
                 1 {KEY.reducesinkkey0} {VALUE._col0}
                 2 
-              outputColumnNames: _col0, _col4, _col5
+              outputColumnNames: _col0, _col5, _col6
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col4 (type: string), _col5 (type: bigint)
+                expressions: _col0 (type: string), _col5 (type: string), _col6 (type: bigint)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 File Output Operator
@@ -2551,10 +2551,10 @@ STAGE PLANS:
                           0 {KEY.reducesinkkey0}
                           1 {KEY.reducesinkkey0} {VALUE._col0}
                           2 
-                        outputColumnNames: _col0, _col4, _col5
+                        outputColumnNames: _col0, _col5, _col6
                         Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                         Select Operator
-                          expressions: _col0 (type: string), _col4 (type: string), _col5 (type: bigint)
+                          expressions: _col0 (type: string), _col5 (type: string), _col6 (type: bigint)
                           outputColumnNames: _col0, _col1, _col2
                           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                           File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer9.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer9.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/correlationoptimizer9.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS
 CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
 CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/count.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/count.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/count.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/count.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table abcd (a int, b int, c int, d int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@abcd
 POSTHOOK: query: create table abcd (a int, b int, c int, d int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/cp_mj_rc.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/cp_mj_rc.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/cp_mj_rc.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/cp_mj_rc.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table src_six_columns (k1 string, v1 string, k2 string, v2 string, k3 string, v3 string) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src_six_columns
 POSTHOOK: query: create table src_six_columns (k1 string, v1 string, k2 string, v2 string, k3 string, v3 string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -22,6 +23,7 @@ POSTHOOK: Lineage: src_six_columns.v3 SI
 PREHOOK: query: create table src_two_columns (k1 string, v1 string) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src_two_columns
 POSTHOOK: query: create table src_two_columns (k1 string, v1 string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_1.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table1
 POSTHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -30,6 +31,7 @@ POSTHOOK: type: CREATETABLE
 PREHOOK: query: CREATE TABLE IF NOT EXISTS table2 (a STRING, b INT) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table2
 POSTHOOK: query: CREATE TABLE IF NOT EXISTS table2 (a STRING, b INT) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -57,6 +59,7 @@ ROW FORMAT DELIMITED FIELDS TERMINATED B
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table3
 POSTHOOK: query: CREATE TABLE table3 (a STRING, b STRING)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'
 STORED AS TEXTFILE
@@ -86,6 +89,7 @@ ROW FORMAT DELIMITED FIELDS TERMINATED B
 STORED AS SEQUENCEFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table4
 POSTHOOK: query: CREATE TABLE table4 (a STRING, b STRING)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'
 STORED AS SEQUENCEFILE
@@ -115,6 +119,7 @@ ROW FORMAT DELIMITED FIELDS TERMINATED B
 STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table5
 POSTHOOK: query: CREATE TABLE table5 (a STRING, b STRING)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'
 STORED AS RCFILE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ CREATE TABLE  if not exists stored_as_di
 SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78))  stored as DIRECTORIES
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@stored_as_dirs_multiple
 POSTHOOK: query: -- Test stored as directories
 -- it covers a few cases
 
@@ -152,6 +153,7 @@ PREHOOK: query: -- 4. alter a table to s
 CREATE TABLE stored_as_dirs_single (key STRING, value STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@stored_as_dirs_single
 POSTHOOK: query: -- 4. alter a table to stored as directories
 CREATE TABLE stored_as_dirs_single (key STRING, value STRING)
 POSTHOOK: type: CREATETABLE
@@ -310,6 +312,7 @@ PREHOOK: query: -- 7. create table like
 create table stored_as_dirs_single_like like stored_as_dirs_single
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@stored_as_dirs_single_like
 POSTHOOK: query: -- 7. create table like
 create table stored_as_dirs_single_like like stored_as_dirs_single
 POSTHOOK: type: CREATETABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_default_prop.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_default_prop.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_default_prop.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_default_prop.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE table_p1 (a STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table_p1
 POSTHOOK: query: CREATE TABLE table_p1 (a STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -17,6 +18,7 @@ a                   	string             
 PREHOOK: query: CREATE TABLE table_p2 LIKE table_p1
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table_p2
 POSTHOOK: query: CREATE TABLE table_p2 LIKE table_p1
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_escape.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_escape.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_escape.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_escape.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ ROW FORMAT DELIMITED FIELDS TERMINATED B
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table1
 POSTHOOK: query: CREATE TABLE table1 (a STRING, b STRING)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' ESCAPED BY '\\'
 STORED AS TEXTFILE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_func1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_func1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_func1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_func1.q.out Fri Aug 22 21:36:47 2014
@@ -11,8 +11,10 @@ POSTHOOK: Input: default@src
 true	false
 PREHOOK: query: create database mydb
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:mydb
 POSTHOOK: query: create database mydb
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:mydb
 PREHOOK: query: create function mydb.func1 as 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFUpper'
 PREHOOK: type: CREATEFUNCTION
 PREHOOK: Output: database:mydb
@@ -61,8 +63,10 @@ POSTHOOK: Output: database:mydb
 POSTHOOK: Output: mydb.qtest_get_java_boolean
 PREHOOK: query: use default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: use default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 PREHOOK: query: -- unqualified function should resolve to one in default db
 select qtest_get_java_boolean('abc'), default.qtest_get_java_boolean('abc'), mydb.qtest_get_java_boolean('abc') from default.src limit 1
 PREHOOK: type: QUERY
@@ -76,8 +80,10 @@ POSTHOOK: Input: default@src
 NULL	NULL	ABC
 PREHOOK: query: use mydb
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:mydb
 POSTHOOK: query: use mydb
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:mydb
 PREHOOK: query: -- unqualified function should resolve to one in mydb db
 select qtest_get_java_boolean('abc'), default.qtest_get_java_boolean('abc'), mydb.qtest_get_java_boolean('abc') from default.src limit 1
 PREHOOK: type: QUERY

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudf.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudf.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudf.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudf.q.out Fri Aug 22 21:36:47 2014
@@ -19,6 +19,7 @@ POSTHOOK: Output: test_translate
 PREHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 STRING, c6 STRING, c7 STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1
 POSTHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 STRING, c6 STRING, c7 STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_insert_outputformat.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_insert_outputformat.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_insert_outputformat.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_insert_outputformat.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: CREATE TABLE table_test_
   OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table_test_output_format
 POSTHOOK: query: CREATE TABLE table_test_output_format(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
   OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat'
@@ -34,6 +35,7 @@ PREHOOK: query: CREATE TABLE table_test_
   OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table_test_output_format_sequencefile
 POSTHOOK: query: CREATE TABLE table_test_output_format_sequencefile(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat'
   OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat'
@@ -65,6 +67,7 @@ PREHOOK: query: CREATE TABLE table_test_
   OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table_test_output_format_hivesequencefile
 POSTHOOK: query: CREATE TABLE table_test_output_format_hivesequencefile(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat'
   OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat'

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_like.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_like.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_like.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_like.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table1
 POSTHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -39,6 +40,7 @@ Storage Desc Params:	 	 
 PREHOOK: query: CREATE TABLE table2 LIKE table1
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table2
 POSTHOOK: query: CREATE TABLE table2 LIKE table1
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -85,6 +87,7 @@ POSTHOOK: type: CREATETABLE
 PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE table1
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table3
 POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE table1
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -164,6 +167,7 @@ POSTHOOK: Input: default@table2
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table4
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
 #### A masked pattern was here ####
@@ -173,6 +177,7 @@ POSTHOOK: Output: default@table4
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table5
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
 #### A masked pattern was here ####
@@ -240,6 +245,7 @@ POSTHOOK: Output: default@table4
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table4
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
 #### A masked pattern was here ####

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_like2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_like2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_like2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_like2.q.out Fri Aug 22 21:36:47 2014
@@ -4,6 +4,7 @@ PREHOOK: query: -- Tests the copying ove
 CREATE TABLE table1(a INT, b STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table1
 POSTHOOK: query: -- Tests the copying over of Table Parameters according to a HiveConf setting
 -- when doing a CREATE TABLE LIKE.
 
@@ -22,6 +23,7 @@ POSTHOOK: Output: default@table1
 PREHOOK: query: CREATE TABLE table2 LIKE table1
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table2
 POSTHOOK: query: CREATE TABLE table2 LIKE table1
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_like_tbl_props.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_like_tbl_props.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_like_tbl_props.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_like_tbl_props.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- Test that CREATE TABL
 CREATE TABLE test_table LIKE src TBLPROPERTIES('key'='value')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table
 POSTHOOK: query: -- Test that CREATE TABLE LIKE commands can take explicit table properties
 
 CREATE TABLE test_table LIKE src TBLPROPERTIES('key'='value')
@@ -46,6 +47,7 @@ PREHOOK: query: --Test that CREATE TABLE
 CREATE TABLE test_table1 LIKE src
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table1
 POSTHOOK: query: --Test that CREATE TABLE LIKE commands can take default table properties
 
 CREATE TABLE test_table1 LIKE src
@@ -89,6 +91,7 @@ PREHOOK: query: -- Test that CREATE TABL
 CREATE TABLE test_table2 LIKE src TBLPROPERTIES('key2' = 'value2')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table2
 POSTHOOK: query: -- Test that CREATE TABLE LIKE commands can take default and explicit table properties
 
 CREATE TABLE test_table2 LIKE src TBLPROPERTIES('key2' = 'value2')
@@ -133,6 +136,7 @@ PREHOOK: query: -- Test that properties 
 CREATE TABLE test_table3 LIKE test_table2 TBLPROPERTIES('key2' = 'value3')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table3
 POSTHOOK: query: -- Test that properties inherited are overwritten by explicitly set ones
 
 CREATE TABLE test_table3 LIKE test_table2 TBLPROPERTIES('key2' = 'value3')
@@ -186,6 +190,7 @@ POSTHOOK: Output: default@test_view
 PREHOOK: query: CREATE TABLE test_table4 LIKE test_view TBLPROPERTIES('key'='value')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table4
 POSTHOOK: query: CREATE TABLE test_table4 LIKE test_view TBLPROPERTIES('key'='value')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_like_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_like_view.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_like_view.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_like_view.q.out Fri Aug 22 21:36:47 2014
@@ -21,6 +21,7 @@ POSTHOOK: type: DROPVIEW
 PREHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table1
 POSTHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -74,6 +75,7 @@ POSTHOOK: Output: default@view1
 PREHOOK: query: CREATE TABLE table2 LIKE view1
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table2
 POSTHOOK: query: CREATE TABLE table2 LIKE view1
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -128,6 +130,7 @@ POSTHOOK: type: CREATETABLE
 PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE view1
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table3
 POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE view1
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -247,6 +250,7 @@ POSTHOOK: Output: default@view1
 PREHOOK: query: create table table1 like view1
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table1
 POSTHOOK: query: create table table1 like view1
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_merge_compressed.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_merge_compressed.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_merge_compressed.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_merge_compressed.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table src_rc_merge_test(key int, value string) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src_rc_merge_test
 POSTHOOK: query: create table src_rc_merge_test(key int, value string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -16,6 +17,7 @@ POSTHOOK: Output: default@src_rc_merge_t
 PREHOOK: query: create table tgt_rc_merge_test(key int, value string) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tgt_rc_merge_test
 POSTHOOK: query: create table tgt_rc_merge_test(key int, value string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_nested_type.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_nested_type.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_nested_type.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_nested_type.q.out Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ PREHOOK: query: CREATE TABLE table1 (
        ) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table1
 POSTHOOK: query: CREATE TABLE table1 (
        a STRING,
        b ARRAY<STRING>,

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_or_replace_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_or_replace_view.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_or_replace_view.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_or_replace_view.q.out Fri Aug 22 21:36:47 2014
@@ -290,6 +290,7 @@ PREHOOK: query: -- updating to fix view 
 create table srcpart_temp like srcpart
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@srcpart_temp
 POSTHOOK: query: -- updating to fix view with invalid definition
 create table srcpart_temp like srcpart
 POSTHOOK: type: CREATETABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_skewed_table1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_skewed_table1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_skewed_table1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_skewed_table1.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON ('1','5','6')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@list_bucket_single
 POSTHOOK: query: CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON ('1','5','6')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@list_bucket_si
 PREHOOK: query: CREATE TABLE list_bucket_single_2 (key STRING, value STRING) SKEWED BY (key) ON ((1),(5),(6))
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@list_bucket_single_2
 POSTHOOK: query: CREATE TABLE list_bucket_single_2 (key STRING, value STRING) SKEWED BY (key) ON ((1),(5),(6))
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -15,6 +17,7 @@ POSTHOOK: Output: default@list_bucket_si
 PREHOOK: query: CREATE TABLE list_bucket_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78))
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@list_bucket_multiple
 POSTHOOK: query: CREATE TABLE list_bucket_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78))
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_struct_table.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_struct_table.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_struct_table.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_struct_table.q.out Fri Aug 22 21:36:47 2014
@@ -4,6 +4,7 @@ row format delimited
   collection items terminated by '\001'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@abc
 POSTHOOK: query: create table abc(strct struct<a:int, b:string, c:string>)
 row format delimited
   fields terminated by '\t'

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_udaf.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_udaf.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_udaf.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_udaf.q.out Fri Aug 22 21:36:47 2014
@@ -19,6 +19,7 @@ POSTHOOK: Output: test_max
 PREHOOK: query: CREATE TABLE dest1(col INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1
 POSTHOOK: query: CREATE TABLE dest1(col INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_union_table.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_union_table.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_union_table.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_union_table.q.out Fri Aug 22 21:36:47 2014
@@ -21,6 +21,7 @@ PREHOOK: query: create table abc(mydata 
 strct struct<a:int, b:string, c:string>)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@abc
 POSTHOOK: query: create table abc(mydata uniontype<int,double,array<string>,struct<a:int,b:string>>,
 strct struct<a:int, b:string, c:string>)
 POSTHOOK: type: CREATETABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_view.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_view.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_view.q.out Fri Aug 22 21:36:47 2014
@@ -408,6 +408,7 @@ View Expanded Text: 	SELECT `_c0` AS `va
 PREHOOK: query: CREATE TABLE table1 (key int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table1
 POSTHOOK: query: CREATE TABLE table1 (key int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_view_translate.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_view_translate.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_view_translate.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_view_translate.q.out Fri Aug 22 21:36:47 2014
@@ -112,6 +112,7 @@ PREHOOK: query: -- HIVE-4116 Can't use v
 CREATE TABLE items (id INT, name STRING, info MAP<STRING,STRING>)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@items
 POSTHOOK: query: -- HIVE-4116 Can't use views using map datatype.
 
 CREATE TABLE items (id INT, name STRING, info MAP<STRING,STRING>)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_1.q.out Fri Aug 22 21:36:47 2014
@@ -52,10 +52,10 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col0} {VALUE._col1}
             1 {VALUE._col0} {VALUE._col1}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -117,7 +117,7 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -133,7 +133,7 @@ STAGE PLANS:
             Reduce Output Operator
               sort order: 
               Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+              value expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -146,12 +146,12 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1} {VALUE._col4} {VALUE._col5}
+            0 {VALUE._col0} {VALUE._col1} {VALUE._col5} {VALUE._col6}
             1 {VALUE._col0} {VALUE._col1}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
             Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -284,10 +284,10 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col0} {VALUE._col1}
             1 {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -406,10 +406,10 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col0} {VALUE._col1}
             1 {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_2.q.out Fri Aug 22 21:36:47 2014
@@ -63,10 +63,10 @@ STAGE PLANS:
               keys:
                 0 
                 1 
-              outputColumnNames: _col0, _col1, _col4, _col5
+              outputColumnNames: _col0, _col1, _col5, _col6
               Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+                expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -112,7 +112,7 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
-                0 {_col0} {_col1} {_col4} {_col5}
+                0 {_col0} {_col1} {_col5} {_col6}
                 1 {key} {value}
               keys:
                 0 
@@ -150,21 +150,21 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                outputColumnNames: _col0, _col1, _col4, _col5
+                outputColumnNames: _col0, _col1, _col5, _col6
                 Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {_col0} {_col1} {_col4} {_col5}
+                    0 {_col0} {_col1} {_col5} {_col6}
                     1 {key} {value}
                   keys:
                     0 
                     1 
-                  outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+                  outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string)
+                    expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                     File Output Operator
@@ -309,10 +309,10 @@ STAGE PLANS:
               keys:
                 0 
                 1 
-              outputColumnNames: _col0, _col1, _col4
+              outputColumnNames: _col0, _col1, _col5
               Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string)
+                expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -446,10 +446,10 @@ STAGE PLANS:
               keys:
                 0 
                 1 
-              outputColumnNames: _col0, _col1, _col4
+              outputColumnNames: _col0, _col1, _col5
               Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string)
+                expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/ct_case_insensitive.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/ct_case_insensitive.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/ct_case_insensitive.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/ct_case_insensitive.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE tmp_pyang_bucket3 (userId INT) CLUSTERED BY (userid) INTO 32 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_pyang_bucket3
 POSTHOOK: query: CREATE TABLE tmp_pyang_bucket3 (userId INT) CLUSTERED BY (userid) INTO 32 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -16,6 +17,7 @@ POSTHOOK: Output: default@tmp_pyang_buck
 PREHOOK: query: CREATE TABLE tmp_pyang_bucket3 (userId INT) CLUSTERED BY (userid) SORTED BY (USERID) INTO 32 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_pyang_bucket3
 POSTHOOK: query: CREATE TABLE tmp_pyang_bucket3 (userId INT) CLUSTERED BY (userid) SORTED BY (USERID) INTO 32 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/ctas.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/ctas.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/ctas.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/ctas.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_
 create table nzhang_Tmp(a int, b string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_Tmp
 POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 
 create table nzhang_Tmp(a int, b string)
@@ -912,6 +913,7 @@ POSTHOOK: Output: default@nzhang_ctas5
 PREHOOK: query: create table nzhang_ctas6 (key string, `to` string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_ctas6
 POSTHOOK: query: create table nzhang_ctas6 (key string, `to` string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/ctas_char.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/ctas_char.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/ctas_char.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/ctas_char.q.out Fri Aug 22 21:36:47 2014
@@ -13,6 +13,7 @@ POSTHOOK: type: DROPVIEW
 PREHOOK: query: create table ctas_char_1 (key char(10), value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@ctas_char_1
 POSTHOOK: query: create table ctas_char_1 (key char(10), value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/ctas_date.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/ctas_date.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/ctas_date.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/ctas_date.q.out Fri Aug 22 21:36:47 2014
@@ -17,6 +17,7 @@ POSTHOOK: type: DROPVIEW
 PREHOOK: query: create table ctas_date_1 (key int, value string, dd date)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@ctas_date_1
 POSTHOOK: query: create table ctas_date_1 (key int, value string, dd date)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ PREHOOK: query: -- Tests that CTAS queri
 CREATE DATABASE db1
 #### A masked pattern was here ####
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db1
 #### A masked pattern was here ####
 POSTHOOK: query: -- Tests that CTAS queries in non-default databases use the location of the database
 -- not the hive.metastore.warehouse.dir for intermediate files (FileSinkOperator output).
@@ -13,11 +14,14 @@ POSTHOOK: query: -- Tests that CTAS quer
 CREATE DATABASE db1
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db1
 #### A masked pattern was here ####
 PREHOOK: query: USE db1
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:db1
 POSTHOOK: query: USE db1
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:db1
 PREHOOK: query: EXPLAIN CREATE TABLE table_db1 AS SELECT * FROM default.src
 PREHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: query: EXPLAIN CREATE TABLE table_db1 AS SELECT * FROM default.src

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/ctas_varchar.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/ctas_varchar.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/ctas_varchar.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/ctas_varchar.q.out Fri Aug 22 21:36:47 2014
@@ -13,6 +13,7 @@ POSTHOOK: type: DROPVIEW
 PREHOOK: query: create table ctas_varchar_1 (key varchar(10), value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@ctas_varchar_1
 POSTHOOK: query: create table ctas_varchar_1 (key varchar(10), value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/cte_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/cte_2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/cte_2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/cte_2.q.out Fri Aug 22 21:36:47 2014
@@ -20,6 +20,7 @@ PREHOOK: query: -- insert test
 create table s1 like src
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@s1
 POSTHOOK: query: -- insert test
 create table s1 like src
 POSTHOOK: type: CREATETABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/custom_input_output_format.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/custom_input_output_format.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/custom_input_output_format.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/custom_input_output_format.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ CREATE TABLE src1_rot13_iof(key STRING, 
             OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.udf.Rot13OutputFormat'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src1_rot13_iof
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
 CREATE TABLE src1_rot13_iof(key STRING, value STRING)