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 [32/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/join_cond_pushdown_unqual4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_cond_pushdown_unqual4.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_cond_pushdown_unqual4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_cond_pushdown_unqual4.q.out Fri Aug 22 21:36:47 2014
@@ -16,6 +16,7 @@ CREATE TABLE part( 
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@part
 POSTHOOK: query: -- data setup
 CREATE TABLE part( 
     p_partkey INT,
@@ -52,6 +53,7 @@ PREHOOK: query: create table part2( 
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@part2
 POSTHOOK: query: create table part2( 
     p2_partkey INT,
     p2_name STRING,
@@ -79,6 +81,7 @@ PREHOOK: query: create table part3( 
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@part3
 POSTHOOK: query: create table part3( 
     p3_partkey INT,
     p3_name STRING,
@@ -168,13 +171,13 @@ STAGE PLANS:
             1 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7}
             2 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7}
             3 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7}
-          outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30, _col33, _col34, _col35, _col36, _col37, _col38, _col39, _col40, _col41
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col24, _col25, _col26, _col27, _col28, _col29, _col30, _col31, _col32, _col36, _col37, _col38, _col39, _col40, _col41, _col42, _col43, _col44
           Statistics: Num rows: 9 Data size: 6279 Basic stats: COMPLETE Column stats: NONE
           Filter Operator
-            predicate: ((_col12 = _col23) and (_col1 = _col34)) (type: boolean)
+            predicate: ((_col13 = _col25) and (_col1 = _col37)) (type: boolean)
             Statistics: Num rows: 2 Data size: 1395 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col11 (type: int), _col12 (type: string), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: int), _col17 (type: string), _col18 (type: double), _col19 (type: string), _col22 (type: int), _col23 (type: string), _col24 (type: string), _col25 (type: string), _col26 (type: string), _col27 (type: int), _col28 (type: string), _col29 (type: double), _col30 (type: string), _col33 (type: int), _col34 (type: string), _col35 (type: string), _col36 (type: string), _col37 (type: string), _col38 (type: int), _col39 (type: string), _col40 (type: double), _col41 (type: string)
+              expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: string), _col17 (type: int), _col18 (type: string), _col19 (type: double), _col20 (type: string), _col24 (type: int), _col25 (type: string), _col26 (type: string), _col27 (type: string), _col28 (type: string), _col29 (type: int), _col30 (type: string), _col31 (type: double), _col32 (type: string), _col36 (type: int), _col37 (type: string), _col38 (type: string), _col39 (type: string), _col40 (type: string), _col41 (type: int), _col42 (type: string), _col43 (type: double), _col44 (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30, _col31, _col32, _col33, _col34, _col35
               Statistics: Num rows: 2 Data size: 1395 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
@@ -242,7 +245,7 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6}
             1 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6}
-          outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20
           Statistics: Num rows: 2 Data size: 1395 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -268,19 +271,19 @@ STAGE PLANS:
                 value expressions: p3_partkey (type: int), p3_mfgr (type: string), p3_brand (type: string), p3_type (type: string), p3_size (type: int), p3_container (type: string), p3_retailprice (type: double), p3_comment (type: string)
           TableScan
             Reduce Output Operator
-              key expressions: _col12 (type: string)
+              key expressions: _col13 (type: string)
               sort order: +
-              Map-reduce partition columns: _col12 (type: string)
+              Map-reduce partition columns: _col13 (type: string)
               Statistics: Num rows: 2 Data size: 1395 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col11 (type: int), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: int), _col17 (type: string), _col18 (type: double), _col19 (type: string)
+              value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col12 (type: int), _col14 (type: string), _col15 (type: string), _col16 (type: string), _col17 (type: int), _col18 (type: string), _col19 (type: double), _col20 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7} {VALUE._col8} {VALUE._col11} {KEY.reducesinkkey0} {VALUE._col12} {VALUE._col13} {VALUE._col14} {VALUE._col15} {VALUE._col16} {VALUE._col17} {VALUE._col18}
+            0 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7} {VALUE._col8} {VALUE._col12} {KEY.reducesinkkey0} {VALUE._col13} {VALUE._col14} {VALUE._col15} {VALUE._col16} {VALUE._col17} {VALUE._col18} {VALUE._col19}
             1 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7}
-          outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col24, _col25, _col26, _col27, _col28, _col29, _col30, _col31, _col32
           Statistics: Num rows: 2 Data size: 1534 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -310,21 +313,21 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
               Statistics: Num rows: 2 Data size: 1534 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col11 (type: int), _col12 (type: string), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: int), _col17 (type: string), _col18 (type: double), _col19 (type: string), _col22 (type: int), _col23 (type: string), _col24 (type: string), _col25 (type: string), _col26 (type: string), _col27 (type: int), _col28 (type: string), _col29 (type: double), _col30 (type: string)
+              value expressions: _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: string), _col17 (type: int), _col18 (type: string), _col19 (type: double), _col20 (type: string), _col24 (type: int), _col25 (type: string), _col26 (type: string), _col27 (type: string), _col28 (type: string), _col29 (type: int), _col30 (type: string), _col31 (type: double), _col32 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7} {VALUE._col10} {VALUE._col11} {VALUE._col12} {VALUE._col13} {VALUE._col14} {VALUE._col15} {VALUE._col16} {VALUE._col17} {VALUE._col18} {VALUE._col21} {VALUE._col22} {VALUE._col23} {VALUE._col24} {VALUE._col25} {VALUE._col26} {VALUE._col27} {VALUE._col28} {VALUE._col29}
+            0 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7} {VALUE._col11} {VALUE._col12} {VALUE._col13} {VALUE._col14} {VALUE._col15} {VALUE._col16} {VALUE._col17} {VALUE._col18} {VALUE._col19} {VALUE._col23} {VALUE._col24} {VALUE._col25} {VALUE._col26} {VALUE._col27} {VALUE._col28} {VALUE._col29} {VALUE._col30} {VALUE._col31}
             1 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} {VALUE._col4} {VALUE._col5} {VALUE._col6} {VALUE._col7}
-          outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30, _col33, _col34, _col35, _col36, _col37, _col38, _col39, _col40, _col41
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col24, _col25, _col26, _col27, _col28, _col29, _col30, _col31, _col32, _col36, _col37, _col38, _col39, _col40, _col41, _col42, _col43, _col44
           Statistics: Num rows: 3 Data size: 2093 Basic stats: COMPLETE Column stats: NONE
           Filter Operator
-            predicate: (((_col12 = _col23) and (_col0 = _col33)) and (_col0 = _col11)) (type: boolean)
+            predicate: (((_col13 = _col25) and (_col0 = _col36)) and (_col0 = _col12)) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
-              expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col11 (type: int), _col12 (type: string), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: int), _col17 (type: string), _col18 (type: double), _col19 (type: string), _col22 (type: int), _col23 (type: string), _col24 (type: string), _col25 (type: string), _col26 (type: string), _col27 (type: int), _col28 (type: string), _col29 (type: double), _col30 (type: string), _col33 (type: int), _col34 (type: string), _col35 (type: string), _col36 (type: string), _col37 (type: string), _col38 (type: int), _col39 (type: string), _col40 (type: double), _col41 (type: string)
+              expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string), _col15 (type: string), _col16 (type: string), _col17 (type: int), _col18 (type: string), _col19 (type: double), _col20 (type: string), _col24 (type: int), _col25 (type: string), _col26 (type: string), _col27 (type: string), _col28 (type: string), _col29 (type: int), _col30 (type: string), _col31 (type: double), _col32 (type: string), _col36 (type: int), _col37 (type: string), _col38 (type: string), _col39 (type: string), _col40 (type: string), _col41 (type: int), _col42 (type: string), _col43 (type: double), _col44 (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30, _col31, _col32, _col33, _col34, _col35
               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/join_empty.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_empty.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_empty.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_empty.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table srcpart_empty(key int, value string) partitioned by (ds string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@srcpart_empty
 POSTHOOK: query: create table srcpart_empty(key int, value string) partitioned by (ds string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@srcpart_empty
 PREHOOK: query: create table src2_empty (key int, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src2_empty
 POSTHOOK: query: create table src2_empty (key int, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_filters.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_filters.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_filters.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_filters.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_AND_HASH_QUERY_R
 CREATE TABLE myinput1(key int, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@myinput1
 POSTHOOK: query: -- SORT_AND_HASH_QUERY_RESULTS
 
 CREATE TABLE myinput1(key int, value int)
@@ -542,6 +543,7 @@ LNZKrcVNAvaeDALnsg72bw==
 PREHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@smb_input1
 POSTHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -549,6 +551,7 @@ POSTHOOK: Output: default@smb_input1
 PREHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@smb_input2
 POSTHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_filters_overlap.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_filters_overlap.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/join_filters_overlap.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/join_filters_overlap.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_hive_626.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_hive_626.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_hive_626.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_hive_626.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ foo_c string, foo_d string) row format d
 stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@hive_foo
 POSTHOOK: query: create table hive_foo (foo_id int, foo_name string, foo_a string, foo_b string, 
 foo_c string, foo_d string) row format delimited fields terminated by ','
 stored as textfile
@@ -14,6 +15,7 @@ string, bar_a string, bar_b string, bar_
 delimited fields terminated by ',' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@hive_bar
 POSTHOOK: query: create table hive_bar (bar_id int, bar_0 int, foo_id int, bar_1 int, bar_name
 string, bar_a string, bar_b string, bar_c string, bar_d string) row format 
 delimited fields terminated by ',' stored as textfile
@@ -24,6 +26,7 @@ PREHOOK: query: create table hive_count 
 terminated by ',' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@hive_count
 POSTHOOK: query: create table hive_count (bar_id int, n int) row format delimited fields 
 terminated by ',' stored as textfile
 POSTHOOK: type: CREATETABLE
@@ -101,7 +104,7 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col0}
             1 {VALUE._col0} {VALUE._col3}
-          outputColumnNames: _col1, _col8, _col12
+          outputColumnNames: _col1, _col9, _col13
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           File Output Operator
             compressed: false
@@ -115,11 +118,11 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              key expressions: _col8 (type: int)
+              key expressions: _col9 (type: int)
               sort order: +
-              Map-reduce partition columns: _col8 (type: int)
+              Map-reduce partition columns: _col9 (type: int)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-              value expressions: _col1 (type: string), _col12 (type: string)
+              value expressions: _col1 (type: string), _col13 (type: string)
           TableScan
             alias: hive_count
             Statistics: Num rows: 0 Data size: 5 Basic stats: PARTIAL Column stats: NONE
@@ -137,12 +140,12 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col1} {VALUE._col11}
+            0 {VALUE._col1} {VALUE._col12}
             1 {VALUE._col0}
-          outputColumnNames: _col1, _col12, _col20
+          outputColumnNames: _col1, _col13, _col22
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col1 (type: string), _col12 (type: string), _col20 (type: int)
+            expressions: _col1 (type: string), _col13 (type: string), _col22 (type: int)
             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/join_map_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_map_ppr.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/join_map_ppr.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/join_map_ppr.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_merging.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_merging.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_merging.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_merging.q.out Fri Aug 22 21:36:47 2014
@@ -11,6 +11,7 @@ PREHOOK: query: CREATE TABLE part( 
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@part
 POSTHOOK: query: CREATE TABLE part( 
     p_partkey INT,
     p_name STRING,
@@ -81,10 +82,10 @@ STAGE PLANS:
             0 {VALUE._col4}
             1 {VALUE._col4}
             2 
-          outputColumnNames: _col5, _col16
+          outputColumnNames: _col5, _col17
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col5 (type: int), _col16 (type: int)
+            expressions: _col5 (type: int), _col17 (type: int)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -157,13 +158,13 @@ STAGE PLANS:
             0 {VALUE._col4}
             1 {VALUE._col4}
             2 
-          outputColumnNames: _col5, _col16
+          outputColumnNames: _col5, _col17
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Filter Operator
-            predicate: (_col5 > (_col16 + 10)) (type: boolean)
+            predicate: (_col5 > (_col17 + 10)) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
-              expressions: _col5 (type: int), _col16 (type: int)
+              expressions: _col5 (type: int), _col17 (type: int)
               outputColumnNames: _col0, _col1
               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/join_nulls.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_nulls.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_nulls.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_nulls.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS
 CREATE TABLE myinput1(key int, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@myinput1
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
 CREATE TABLE myinput1(key int, value int)
@@ -434,6 +435,7 @@ NULL	NULL	48	NULL
 PREHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@smb_input1
 POSTHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -441,6 +443,7 @@ POSTHOOK: Output: default@smb_input1
 PREHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@smb_input2
 POSTHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_nullsafe.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_nullsafe.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_nullsafe.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_nullsafe.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS
 CREATE TABLE myinput1(key int, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@myinput1
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
 CREATE TABLE myinput1(key int, value int)
@@ -57,10 +58,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {VALUE._col0} {KEY.reducesinkkey0}
           nullSafes: [true]
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 3 Data size: 28 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col4 (type: int), _col5 (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col5 (type: int), _col6 (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 3 Data size: 28 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -153,10 +154,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {VALUE._col0} {KEY.reducesinkkey0}
             2 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
           Statistics: Num rows: 4 Data size: 37 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col4 (type: int), _col5 (type: int), _col8 (type: int), _col9 (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col5 (type: int), _col6 (type: int), _col10 (type: int), _col11 (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
             Statistics: Num rows: 4 Data size: 37 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -232,10 +233,10 @@ STAGE PLANS:
             1 {VALUE._col0} {KEY.reducesinkkey0}
             2 {KEY.reducesinkkey0} {VALUE._col0}
           nullSafes: [true]
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
           Statistics: Num rows: 6 Data size: 57 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col4 (type: int), _col5 (type: int), _col8 (type: int), _col9 (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col5 (type: int), _col6 (type: int), _col10 (type: int), _col11 (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
             Statistics: Num rows: 6 Data size: 57 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -344,10 +345,10 @@ STAGE PLANS:
             1 {KEY.reducesinkkey1} {KEY.reducesinkkey0}
             2 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
           nullSafes: [true, false]
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
           Statistics: Num rows: 4 Data size: 37 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col4 (type: int), _col5 (type: int), _col8 (type: int), _col9 (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col5 (type: int), _col6 (type: int), _col10 (type: int), _col11 (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
             Statistics: Num rows: 4 Data size: 37 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -420,10 +421,10 @@ STAGE PLANS:
             1 {KEY.reducesinkkey1} {KEY.reducesinkkey0}
             2 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
           nullSafes: [true, true]
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
           Statistics: Num rows: 6 Data size: 57 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col4 (type: int), _col5 (type: int), _col8 (type: int), _col9 (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col5 (type: int), _col6 (type: int), _col10 (type: int), _col11 (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
             Statistics: Num rows: 6 Data size: 57 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -558,6 +559,7 @@ NULL	NULL	NULL	NULL
 PREHOOK: query: CREATE TABLE smb_input(key int, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@smb_input
 POSTHOOK: query: CREATE TABLE smb_input(key int, value int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -582,6 +584,7 @@ PREHOOK: query: -- smbs
 CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@smb_input1
 POSTHOOK: query: -- smbs
 CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 POSTHOOK: type: CREATETABLE
@@ -590,6 +593,7 @@ POSTHOOK: Output: default@smb_input1
 PREHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@smb_input2
 POSTHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -1542,10 +1546,10 @@ STAGE PLANS:
             0 {VALUE._col0}
             1 {VALUE._col0}
           nullSafes: [true]
-          outputColumnNames: _col1, _col4
+          outputColumnNames: _col1, _col5
           Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: null (type: void), _col1 (type: int), _col4 (type: int), null (type: void)
+            expressions: null (type: void), _col1 (type: int), _col5 (type: int), null (type: void)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_rc.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_rc.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_rc.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_rc.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table join_rc1(key string, value string) stored as RCFile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@join_rc1
 POSTHOOK: query: create table join_rc1(key string, value string) stored as RCFile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@join_rc1
 PREHOOK: query: create table join_rc2(key string, value string) stored as RCFile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@join_rc2
 POSTHOOK: query: create table join_rc2(key string, value string) stored as RCFile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -78,10 +80,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {VALUE._col0}
-          outputColumnNames: _col0, _col5
+          outputColumnNames: _col0, _col6
           Statistics: Num rows: 275 Data size: 2646 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 275 Data size: 2646 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@T1
 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -15,6 +17,7 @@ POSTHOOK: Output: default@T2
 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T3
 POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -88,10 +91,10 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col0} {VALUE._col1}
             1 {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 31 Data size: 3196 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: 31 Data size: 3196 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -153,10 +156,10 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col0} {VALUE._col1}
             1 {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 31 Data size: 3196 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: 31 Data size: 3196 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -248,7 +251,7 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col1, _col4
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 0 Data size: 33 Basic stats: PARTIAL Column stats: NONE
           File Output Operator
             compressed: false
@@ -266,7 +269,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
               Statistics: Num rows: 0 Data size: 33 Basic stats: PARTIAL Column stats: NONE
-              value expressions: _col0 (type: string), _col4 (type: string)
+              value expressions: _col0 (type: string), _col5 (type: string)
           TableScan
             alias: c
             Statistics: Num rows: 0 Data size: 20 Basic stats: PARTIAL Column stats: NONE
@@ -280,12 +283,12 @@ STAGE PLANS:
           condition map:
                Right Outer Join0 to 1
           condition expressions:
-            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col3}
+            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col4}
             1 {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col1, _col4, _col9
+          outputColumnNames: _col0, _col1, _col5, _col11
           Statistics: Num rows: 0 Data size: 36 Basic stats: PARTIAL Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col4 (type: string), _col1 (type: string), _col9 (type: string)
+            expressions: _col0 (type: string), _col5 (type: string), _col1 (type: string), _col11 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 36 Basic stats: PARTIAL Column stats: NONE
             File Output Operator
@@ -345,7 +348,7 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col1, _col4
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 0 Data size: 33 Basic stats: PARTIAL Column stats: NONE
           File Output Operator
             compressed: false
@@ -363,7 +366,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
               Statistics: Num rows: 0 Data size: 33 Basic stats: PARTIAL Column stats: NONE
-              value expressions: _col0 (type: string), _col4 (type: string)
+              value expressions: _col0 (type: string), _col5 (type: string)
           TableScan
             alias: c
             Statistics: Num rows: 0 Data size: 20 Basic stats: PARTIAL Column stats: NONE
@@ -377,12 +380,12 @@ STAGE PLANS:
           condition map:
                Right Outer Join0 to 1
           condition expressions:
-            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col3}
+            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col4}
             1 {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col1, _col4, _col9
+          outputColumnNames: _col0, _col1, _col5, _col11
           Statistics: Num rows: 0 Data size: 36 Basic stats: PARTIAL Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col4 (type: string), _col1 (type: string), _col9 (type: string)
+            expressions: _col0 (type: string), _col5 (type: string), _col1 (type: string), _col11 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 36 Basic stats: PARTIAL Column stats: NONE
             File Output Operator
@@ -497,10 +500,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0}
             1 {KEY.reducesinkkey0}
             2 {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col4, _col8
+          outputColumnNames: _col0, _col5, _col10
           Statistics: Num rows: 0 Data size: 66 Basic stats: PARTIAL Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col4 (type: string), _col8 (type: string)
+            expressions: _col0 (type: string), _col5 (type: string), _col10 (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 0 Data size: 66 Basic stats: PARTIAL Column stats: NONE
             File Output Operator
@@ -571,10 +574,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0}
             1 {KEY.reducesinkkey0}
             2 {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col4, _col8
+          outputColumnNames: _col0, _col5, _col10
           Statistics: Num rows: 0 Data size: 66 Basic stats: PARTIAL Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col4 (type: string), _col8 (type: string)
+            expressions: _col0 (type: string), _col5 (type: string), _col10 (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 0 Data size: 66 Basic stats: PARTIAL Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder2.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@T1
 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -15,6 +17,7 @@ POSTHOOK: Output: default@T2
 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T3
 POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -22,6 +25,7 @@ POSTHOOK: Output: default@T3
 PREHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T4
 POSTHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -137,10 +141,10 @@ STAGE PLANS:
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 {KEY.reducesinkkey0} {VALUE._col0}
             3 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9, _col12, _col13
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11, _col15, _col16
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string), _col12 (type: string), _col13 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string), _col15 (type: string), _col16 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -231,7 +235,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: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           File Output Operator
             compressed: false
@@ -249,7 +253,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-              value expressions: _col0 (type: string), _col4 (type: string), _col5 (type: string)
+              value expressions: _col0 (type: string), _col5 (type: string), _col6 (type: string)
           TableScan
             alias: c
             Statistics: Num rows: 0 Data size: 20 Basic stats: PARTIAL Column stats: NONE
@@ -267,9 +271,9 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col3} {VALUE._col4}
+            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col4} {VALUE._col5}
             1 {VALUE._col0} {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           File Output Operator
             compressed: false
@@ -299,18 +303,18 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: (_col0 + 1) (type: double)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string)
+              value expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1} {VALUE._col4} {VALUE._col5} {VALUE._col8} {VALUE._col9}
+            0 {VALUE._col0} {VALUE._col1} {VALUE._col5} {VALUE._col6} {VALUE._col10} {VALUE._col11}
             1 {VALUE._col0} {VALUE._col1}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9, _col12, _col13
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11, _col15, _col16
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string), _col12 (type: string), _col13 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string), _col15 (type: string), _col16 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
             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/join_reorder3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder3.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder3.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@T1
 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -15,6 +17,7 @@ POSTHOOK: Output: default@T2
 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T3
 POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -22,6 +25,7 @@ POSTHOOK: Output: default@T3
 PREHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T4
 POSTHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -137,10 +141,10 @@ STAGE PLANS:
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 {KEY.reducesinkkey0} {VALUE._col0}
             3 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9, _col12, _col13
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11, _col15, _col16
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string), _col12 (type: string), _col13 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string), _col15 (type: string), _col16 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -231,7 +235,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: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           File Output Operator
             compressed: false
@@ -249,7 +253,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-              value expressions: _col0 (type: string), _col4 (type: string), _col5 (type: string)
+              value expressions: _col0 (type: string), _col5 (type: string), _col6 (type: string)
           TableScan
             alias: c
             Statistics: Num rows: 0 Data size: 20 Basic stats: PARTIAL Column stats: NONE
@@ -267,9 +271,9 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col3} {VALUE._col4}
+            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col4} {VALUE._col5}
             1 {VALUE._col0} {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           File Output Operator
             compressed: false
@@ -299,18 +303,18 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: (_col0 + 1) (type: double)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string)
+              value expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1} {VALUE._col4} {VALUE._col5} {VALUE._col8} {VALUE._col9}
+            0 {VALUE._col0} {VALUE._col1} {VALUE._col5} {VALUE._col6} {VALUE._col10} {VALUE._col11}
             1 {VALUE._col0} {VALUE._col1}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9, _col12, _col13
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11, _col15, _col16
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string), _col12 (type: string), _col13 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string), _col15 (type: string), _col16 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
             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/join_reorder4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder4.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_reorder4.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE T1(key1 STRING, val1 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key1 STRING, val1 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@T1
 PREHOOK: query: CREATE TABLE T2(key2 STRING, val2 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key2 STRING, val2 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -15,6 +17,7 @@ POSTHOOK: Output: default@T2
 PREHOOK: query: CREATE TABLE T3(key3 STRING, val3 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T3
 POSTHOOK: query: CREATE TABLE T3(key3 STRING, val3 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -117,10 +120,10 @@ STAGE PLANS:
                   0 key1 (type: string)
                   1 key2 (type: string)
                   2 key3 (type: string)
-                outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+                outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 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: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   File Output Operator
@@ -226,10 +229,10 @@ STAGE PLANS:
                   0 key1 (type: string)
                   1 key2 (type: string)
                   2 key3 (type: string)
-                outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+                outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 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: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   File Output Operator
@@ -335,10 +338,10 @@ STAGE PLANS:
                   0 key1 (type: string)
                   1 key2 (type: string)
                   2 key3 (type: string)
-                outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+                outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 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: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_star.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_star.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_star.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_star.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table fact(m1 int, m2 int, d1 int, d2 int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@fact
 POSTHOOK: query: create table fact(m1 int, m2 int, d1 int, d2 int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@fact
 PREHOOK: query: create table dim1(f1 int, f2 int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dim1
 POSTHOOK: query: create table dim1(f1 int, f2 int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -15,6 +17,7 @@ POSTHOOK: Output: default@dim1
 PREHOOK: query: create table dim2(f3 int, f4 int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dim2
 POSTHOOK: query: create table dim2(f3 int, f4 int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -22,6 +25,7 @@ POSTHOOK: Output: default@dim2
 PREHOOK: query: create table dim3(f5 int, f6 int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dim3
 POSTHOOK: query: create table dim3(f5 int, f6 int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -29,6 +33,7 @@ POSTHOOK: Output: default@dim3
 PREHOOK: query: create table dim4(f7 int, f8 int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dim4
 POSTHOOK: query: create table dim4(f7 int, f8 int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -36,6 +41,7 @@ POSTHOOK: Output: default@dim4
 PREHOOK: query: create table dim5(f9 int, f10 int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dim5
 POSTHOOK: query: create table dim5(f9 int, f10 int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -43,6 +49,7 @@ POSTHOOK: Output: default@dim5
 PREHOOK: query: create table dim6(f11 int, f12 int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dim6
 POSTHOOK: query: create table dim6(f11 int, f12 int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -50,6 +57,7 @@ POSTHOOK: Output: default@dim6
 PREHOOK: query: create table dim7(f13 int, f14 int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dim7
 POSTHOOK: query: create table dim7(f13 int, f14 int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -168,10 +176,10 @@ STAGE PLANS:
                 keys:
                   0 d1 (type: int)
                   1 f1 (type: int)
-                outputColumnNames: _col0, _col1, _col7
+                outputColumnNames: _col0, _col1, _col8
                 Statistics: Num rows: 4 Data size: 53 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col7 (type: int)
+                  expressions: _col0 (type: int), _col1 (type: int), _col8 (type: int)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 4 Data size: 53 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
@@ -253,7 +261,7 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
-                  0 {_col0} {_col1} {_col7}
+                  0 {_col0} {_col1} {_col8}
                   1 {f4}
                 keys:
                   0 _col3 (type: int)
@@ -277,21 +285,21 @@ STAGE PLANS:
                 keys:
                   0 d1 (type: int)
                   1 f1 (type: int)
-                outputColumnNames: _col0, _col1, _col3, _col7
+                outputColumnNames: _col0, _col1, _col3, _col8
                 Statistics: Num rows: 2 Data size: 35 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {_col0} {_col1} {_col7}
+                    0 {_col0} {_col1} {_col8}
                     1 {f4}
                   keys:
                     0 _col3 (type: int)
                     1 f3 (type: int)
-                  outputColumnNames: _col0, _col1, _col7, _col11
+                  outputColumnNames: _col0, _col1, _col8, _col13
                   Statistics: Num rows: 2 Data size: 38 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: int), _col1 (type: int), _col7 (type: int), _col11 (type: int)
+                    expressions: _col0 (type: int), _col1 (type: int), _col8 (type: int), _col13 (type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 2 Data size: 38 Basic stats: COMPLETE Column stats: NONE
                     File Output Operator
@@ -375,10 +383,10 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
-                  0 {_col0} {_col1} {_col7}
+                  0 {_col0} {_col1} {_col8}
                   1 {f4}
                 keys:
-                  0 _col7 (type: int)
+                  0 _col8 (type: int)
                   1 f3 (type: int)
 
   Stage: Stage-4
@@ -399,21 +407,21 @@ STAGE PLANS:
                 keys:
                   0 d1 (type: int)
                   1 f1 (type: int)
-                outputColumnNames: _col0, _col1, _col7
+                outputColumnNames: _col0, _col1, _col8
                 Statistics: Num rows: 4 Data size: 53 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {_col0} {_col1} {_col7}
+                    0 {_col0} {_col1} {_col8}
                     1 {f4}
                   keys:
-                    0 _col7 (type: int)
+                    0 _col8 (type: int)
                     1 f3 (type: int)
-                  outputColumnNames: _col0, _col1, _col7, _col11
+                  outputColumnNames: _col0, _col1, _col8, _col13
                   Statistics: Num rows: 4 Data size: 58 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: int), _col1 (type: int), _col7 (type: int), _col11 (type: int)
+                    expressions: _col0 (type: int), _col1 (type: int), _col8 (type: int), _col13 (type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 4 Data size: 58 Basic stats: COMPLETE Column stats: NONE
                     File Output Operator
@@ -491,10 +499,10 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
-                0 {_col0} {_col1} {_col7}
+                0 {_col0} {_col1} {_col8}
                 1 {f4}
               keys:
-                0 _col7 (type: int)
+                0 _col8 (type: int)
                 1 f3 (type: int)
 
   Stage: Stage-4
@@ -512,21 +520,21 @@ STAGE PLANS:
               keys:
                 0 d1 (type: int)
                 1 f1 (type: int)
-              outputColumnNames: _col0, _col1, _col7
+              outputColumnNames: _col0, _col1, _col8
               Statistics: Num rows: 8 Data size: 107 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
                      Left Outer Join0 to 1
                 condition expressions:
-                  0 {_col0} {_col1} {_col7}
+                  0 {_col0} {_col1} {_col8}
                   1 {f4}
                 keys:
-                  0 _col7 (type: int)
+                  0 _col8 (type: int)
                   1 f3 (type: int)
-                outputColumnNames: _col0, _col1, _col7, _col11
+                outputColumnNames: _col0, _col1, _col8, _col13
                 Statistics: Num rows: 8 Data size: 117 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col7 (type: int), _col11 (type: int)
+                  expressions: _col0 (type: int), _col1 (type: int), _col8 (type: int), _col13 (type: int)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 8 Data size: 117 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
@@ -635,10 +643,10 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
-                0 {_col0} {_col1} {_col3} {_col7}
+                0 {_col0} {_col1} {_col3} {_col8}
                 1 {f4}
               keys:
-                0 _col7 (type: int)
+                0 _col8 (type: int)
                 1 f3 (type: int)
         dim3 
           TableScan
@@ -646,7 +654,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
-                0 {_col0} {_col1} {_col7} {_col11}
+                0 {_col0} {_col1} {_col8} {_col13}
                 1 {f6}
               keys:
                 0 _col3 (type: int)
@@ -657,11 +665,11 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
-                0 {_col0} {_col1} {_col7} {_col11} {_col15}
+                0 {_col0} {_col1} {_col8} {_col13} {_col18}
                 1 {f8}
                 2 {f12}
               keys:
-                0 _col15 (type: int)
+                0 _col18 (type: int)
                 1 f7 (type: int)
                 2 f11 (type: int)
         dim5 
@@ -670,10 +678,10 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
-                0 {_col0} {_col1} {_col7} {_col11} {_col15} {_col19} {_col23}
+                0 {_col0} {_col1} {_col8} {_col13} {_col18} {_col23} {_col28}
                 1 {f10}
               keys:
-                0 _col19 (type: int)
+                0 _col23 (type: int)
                 1 f9 (type: int)
         dim6 
           TableScan
@@ -681,11 +689,11 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
-                0 {_col0} {_col1} {_col7} {_col11} {_col15}
+                0 {_col0} {_col1} {_col8} {_col13} {_col18}
                 1 {f8}
                 2 {f12}
               keys:
-                0 _col15 (type: int)
+                0 _col18 (type: int)
                 1 f7 (type: int)
                 2 f11 (type: int)
         dim7 
@@ -694,10 +702,10 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
-                0 {_col0} {_col1} {_col7} {_col11} {_col15} {_col19} {_col23} {_col27}
+                0 {_col0} {_col1} {_col8} {_col13} {_col18} {_col23} {_col28} {_col33}
                 1 {f14}
               keys:
-                0 _col23 (type: int)
+                0 _col28 (type: int)
                 1 f13 (type: int)
 
   Stage: Stage-12
@@ -715,68 +723,68 @@ STAGE PLANS:
               keys:
                 0 d1 (type: int)
                 1 f1 (type: int)
-              outputColumnNames: _col0, _col1, _col3, _col7
+              outputColumnNames: _col0, _col1, _col3, _col8
               Statistics: Num rows: 6 Data size: 107 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
                      Left Outer Join0 to 1
                 condition expressions:
-                  0 {_col0} {_col1} {_col3} {_col7}
+                  0 {_col0} {_col1} {_col3} {_col8}
                   1 {f4}
                 keys:
-                  0 _col7 (type: int)
+                  0 _col8 (type: int)
                   1 f3 (type: int)
-                outputColumnNames: _col0, _col1, _col3, _col7, _col11
+                outputColumnNames: _col0, _col1, _col3, _col8, _col13
                 Statistics: Num rows: 6 Data size: 117 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
                        Left Outer Join0 to 1
                   condition expressions:
-                    0 {_col0} {_col1} {_col7} {_col11}
+                    0 {_col0} {_col1} {_col8} {_col13}
                     1 {f6}
                   keys:
                     0 _col3 (type: int)
                     1 f5 (type: int)
-                  outputColumnNames: _col0, _col1, _col7, _col11, _col15
+                  outputColumnNames: _col0, _col1, _col8, _col13, _col18
                   Statistics: Num rows: 6 Data size: 128 Basic stats: COMPLETE Column stats: NONE
                   Map Join Operator
                     condition map:
                          Left Outer Join0 to 1
                          Left Outer Join0 to 2
                     condition expressions:
-                      0 {_col0} {_col1} {_col7} {_col11} {_col15}
+                      0 {_col0} {_col1} {_col8} {_col13} {_col18}
                       1 {f8}
                       2 {f12}
                     keys:
-                      0 _col15 (type: int)
+                      0 _col18 (type: int)
                       1 f7 (type: int)
                       2 f11 (type: int)
-                    outputColumnNames: _col0, _col1, _col7, _col11, _col15, _col19, _col23
+                    outputColumnNames: _col0, _col1, _col8, _col13, _col18, _col23, _col28
                     Statistics: Num rows: 13 Data size: 281 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
                            Left Outer Join0 to 1
                       condition expressions:
-                        0 {_col0} {_col1} {_col7} {_col11} {_col15} {_col19} {_col23}
+                        0 {_col0} {_col1} {_col8} {_col13} {_col18} {_col23} {_col28}
                         1 {f10}
                       keys:
-                        0 _col19 (type: int)
+                        0 _col23 (type: int)
                         1 f9 (type: int)
-                      outputColumnNames: _col0, _col1, _col7, _col11, _col15, _col19, _col23, _col27
+                      outputColumnNames: _col0, _col1, _col8, _col13, _col18, _col23, _col28, _col33
                       Statistics: Num rows: 14 Data size: 309 Basic stats: COMPLETE Column stats: NONE
                       Map Join Operator
                         condition map:
                              Left Outer Join0 to 1
                         condition expressions:
-                          0 {_col0} {_col1} {_col7} {_col11} {_col15} {_col19} {_col23} {_col27}
+                          0 {_col0} {_col1} {_col8} {_col13} {_col18} {_col23} {_col28} {_col33}
                           1 {f14}
                         keys:
-                          0 _col23 (type: int)
+                          0 _col28 (type: int)
                           1 f13 (type: int)
-                        outputColumnNames: _col0, _col1, _col7, _col11, _col15, _col19, _col23, _col27, _col31
+                        outputColumnNames: _col0, _col1, _col8, _col13, _col18, _col23, _col28, _col33, _col38
                         Statistics: Num rows: 15 Data size: 339 Basic stats: COMPLETE Column stats: NONE
                         Select Operator
-                          expressions: _col0 (type: int), _col1 (type: int), _col7 (type: int), _col11 (type: int), _col15 (type: int), _col19 (type: int), _col27 (type: int), _col23 (type: int), _col31 (type: int)
+                          expressions: _col0 (type: int), _col1 (type: int), _col8 (type: int), _col13 (type: int), _col18 (type: int), _col23 (type: int), _col33 (type: int), _col28 (type: int), _col38 (type: int)
                           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                           Statistics: Num rows: 15 Data size: 339 Basic stats: COMPLETE Column stats: NONE
                           File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_thrift.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_thrift.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_thrift.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_thrift.q.out Fri Aug 22 21:36:47 2014
@@ -60,10 +60,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {VALUE._col3}
-          outputColumnNames: _col0, _col12
+          outputColumnNames: _col0, _col13
           Statistics: Num rows: 221 Data size: 885 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col12 (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
+            expressions: _col0 (type: int), _col13 (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 221 Data size: 885 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_vc.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_vc.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_vc.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_vc.q.out Fri Aug 22 21:36:47 2014
@@ -46,7 +46,7 @@ STAGE PLANS:
           condition expressions:
             0 
             1 {VALUE._col0}
-          outputColumnNames: _col5
+          outputColumnNames: _col6
           Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -72,9 +72,9 @@ STAGE PLANS:
                 value expressions: key (type: string), BLOCK__OFFSET__INSIDE__FILE (type: bigint)
           TableScan
             Reduce Output Operator
-              key expressions: _col5 (type: string)
+              key expressions: _col6 (type: string)
               sort order: +
-              Map-reduce partition columns: _col5 (type: string)
+              Map-reduce partition columns: _col6 (type: string)
               Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
@@ -83,10 +83,10 @@ STAGE PLANS:
           condition expressions:
             0 
             1 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1}
-          outputColumnNames: _col8, _col9, _col10
+          outputColumnNames: _col10, _col11, _col12
           Statistics: Num rows: 34 Data size: 3515 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col10 (type: bigint), _col8 (type: string), _col9 (type: string)
+            expressions: _col12 (type: bigint), _col10 (type: string), _col11 (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 34 Data size: 3515 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_view.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_view.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_view.q.out Fri Aug 22 21:36:47 2014
@@ -9,6 +9,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table invites (foo int, bar string) partitioned by (ds string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@invites
 POSTHOOK: query: create table invites (foo int, bar string) partitioned by (ds string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -16,6 +17,7 @@ POSTHOOK: Output: default@invites
 PREHOOK: query: create table invites2 (foo int, bar string) partitioned by (ds string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@invites2
 POSTHOOK: query: create table invites2 (foo int, bar string) partitioned by (ds string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -51,10 +53,10 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col1}
             1 {VALUE._col0}
-          outputColumnNames: _col1, _col5
+          outputColumnNames: _col1, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col1 (type: string), _col5 (type: int), _col7 (type: string)
+            expressions: _col1 (type: string), _col6 (type: int), _col8 (type: string)
             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/keyword_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/keyword_1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/keyword_1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/keyword_1.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_BEFORE_DIFF
 create table test_user (user string, `group` string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_user
 POSTHOOK: query: -- SORT_BEFORE_DIFF
 
 create table test_user (user string, `group` string)
@@ -64,6 +65,7 @@ POSTHOOK: Output: default@test_user
 PREHOOK: query: create table test_user (role string, `group` string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_user
 POSTHOOK: query: create table test_user (role string, `group` string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default