Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/udtf_json_tuple.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udtf_json_tuple.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/udtf_json_tuple.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/udtf_json_tuple.q.out 
Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table json_t (key string, jstring string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@json_t
 POSTHOOK: query: create table json_t (key string, jstring string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -65,10 +66,10 @@ STAGE PLANS:
                 outputColumnNames: key
                 Statistics: Num rows: 6 Data size: 236 Basic stats: COMPLETE 
Column stats: NONE
                 Lateral View Join Operator
-                  outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8
+                  outputColumnNames: _col0, _col5, _col6, _col7, _col8, _col9
                   Statistics: Num rows: 12 Data size: 472 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col4 (type: string), 
_col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: 
string)
+                    expressions: _col0 (type: string), _col5 (type: string), 
_col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: 
string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 12 Data size: 472 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
@@ -84,10 +85,10 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 236 Basic stats: COMPLETE 
Column stats: NONE
                   function name: json_tuple
                   Lateral View Join Operator
-                    outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8
+                    outputColumnNames: _col0, _col5, _col6, _col7, _col8, _col9
                     Statistics: Num rows: 12 Data size: 472 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col0 (type: string), _col4 (type: string), 
_col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: 
string)
+                      expressions: _col0 (type: string), _col5 (type: string), 
_col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: 
string)
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5
                       Statistics: Num rows: 12 Data size: 472 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -214,10 +215,10 @@ STAGE PLANS:
                 outputColumnNames: key
                 Statistics: Num rows: 6 Data size: 236 Basic stats: COMPLETE 
Column stats: NONE
                 Lateral View Join Operator
-                  outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8
+                  outputColumnNames: _col0, _col5, _col6, _col7, _col8, _col9
                   Statistics: Num rows: 12 Data size: 472 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col5 (type: string), 
_col8 (type: string)
+                    expressions: _col0 (type: string), _col6 (type: string), 
_col9 (type: string)
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 12 Data size: 472 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
@@ -233,10 +234,10 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 236 Basic stats: COMPLETE 
Column stats: NONE
                   function name: json_tuple
                   Lateral View Join Operator
-                    outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8
+                    outputColumnNames: _col0, _col5, _col6, _col7, _col8, _col9
                     Statistics: Num rows: 12 Data size: 472 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col0 (type: string), _col5 (type: string), 
_col8 (type: string)
+                      expressions: _col0 (type: string), _col6 (type: string), 
_col9 (type: string)
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 12 Data size: 472 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -300,15 +301,15 @@ STAGE PLANS:
               Select Operator
                 Statistics: Num rows: 6 Data size: 236 Basic stats: COMPLETE 
Column stats: NONE
                 Lateral View Join Operator
-                  outputColumnNames: _col4, _col5, _col6, _col7, _col8
+                  outputColumnNames: _col5, _col6, _col7, _col8, _col9
                   Statistics: Num rows: 9 Data size: 354 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: string)
-                    outputColumnNames: _col5
+                    expressions: _col6 (type: string)
+                    outputColumnNames: _col6
                     Statistics: Num rows: 9 Data size: 354 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: _col5 (type: string)
+                      keys: _col6 (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 9 Data size: 354 Basic stats: 
COMPLETE Column stats: NONE
@@ -329,15 +330,15 @@ STAGE PLANS:
                     predicate: c0 is not null (type: boolean)
                     Statistics: Num rows: 3 Data size: 118 Basic stats: 
COMPLETE Column stats: NONE
                     Lateral View Join Operator
-                      outputColumnNames: _col4, _col5, _col6, _col7, _col8
+                      outputColumnNames: _col5, _col6, _col7, _col8, _col9
                       Statistics: Num rows: 9 Data size: 354 Basic stats: 
COMPLETE Column stats: NONE
                       Select Operator
-                        expressions: _col5 (type: string)
-                        outputColumnNames: _col5
+                        expressions: _col6 (type: string)
+                        outputColumnNames: _col6
                         Statistics: Num rows: 9 Data size: 354 Basic stats: 
COMPLETE Column stats: NONE
                         Group By Operator
                           aggregations: count()
-                          keys: _col5 (type: string)
+                          keys: _col6 (type: string)
                           mode: hash
                           outputColumnNames: _col0, _col1
                           Statistics: Num rows: 9 Data size: 354 Basic stats: 
COMPLETE Column stats: NONE
@@ -409,6 +410,7 @@ PREHOOK: query: -- Verify that json_tupl
 CREATE TABLE dest1(c1 STRING) STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1
 POSTHOOK: query: -- Verify that json_tuple can handle new lines in JSON values
 
 CREATE TABLE dest1(c1 STRING) STORED AS RCFILE

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out 
Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table url_t (key string, fullurl string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@url_t
 POSTHOOK: query: create table url_t (key string, fullurl string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -82,10 +83,10 @@ STAGE PLANS:
                 outputColumnNames: key
                 Statistics: Num rows: 6 Data size: 213 Basic stats: COMPLETE 
Column stats: NONE
                 Lateral View Join Operator
-                  outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8, 
_col9, _col10, _col11, _col12
+                  outputColumnNames: _col0, _col5, _col6, _col7, _col8, _col9, 
_col10, _col11, _col12, _col13
                   Statistics: Num rows: 12 Data size: 426 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col4 (type: string), 
_col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: 
string), _col9 (type: string), _col10 (type: string), _col11 (type: string), 
_col12 (type: string)
+                    expressions: _col0 (type: string), _col5 (type: string), 
_col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: 
string), _col10 (type: string), _col11 (type: string), _col12 (type: string), 
_col13 (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9
                     Statistics: Num rows: 12 Data size: 426 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
@@ -101,10 +102,10 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 213 Basic stats: COMPLETE 
Column stats: NONE
                   function name: parse_url_tuple
                   Lateral View Join Operator
-                    outputColumnNames: _col0, _col4, _col5, _col6, _col7, 
_col8, _col9, _col10, _col11, _col12
+                    outputColumnNames: _col0, _col5, _col6, _col7, _col8, 
_col9, _col10, _col11, _col12, _col13
                     Statistics: Num rows: 12 Data size: 426 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col0 (type: string), _col4 (type: string), 
_col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: 
string), _col9 (type: string), _col10 (type: string), _col11 (type: string), 
_col12 (type: string)
+                      expressions: _col0 (type: string), _col5 (type: string), 
_col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: 
string), _col10 (type: string), _col11 (type: string), _col12 (type: string), 
_col13 (type: string)
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9
                       Statistics: Num rows: 12 Data size: 426 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -233,10 +234,10 @@ STAGE PLANS:
                 outputColumnNames: key
                 Statistics: Num rows: 6 Data size: 213 Basic stats: COMPLETE 
Column stats: NONE
                 Lateral View Join Operator
-                  outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8, 
_col9, _col10, _col11, _col12, _col13, _col14, _col15
+                  outputColumnNames: _col0, _col5, _col6, _col7, _col8, _col9, 
_col10, _col11, _col12, _col13, _col14, _col15, _col16
                   Statistics: Num rows: 12 Data size: 426 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col4 (type: string), 
_col6 (type: string), _col12 (type: string), _col13 (type: string), _col14 
(type: string), _col15 (type: string)
+                    expressions: _col0 (type: string), _col5 (type: string), 
_col7 (type: string), _col13 (type: string), _col14 (type: string), _col15 
(type: string), _col16 (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6
                     Statistics: Num rows: 12 Data size: 426 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
@@ -252,10 +253,10 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 213 Basic stats: COMPLETE 
Column stats: NONE
                   function name: parse_url_tuple
                   Lateral View Join Operator
-                    outputColumnNames: _col0, _col4, _col5, _col6, _col7, 
_col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15
+                    outputColumnNames: _col0, _col5, _col6, _col7, _col8, 
_col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16
                     Statistics: Num rows: 12 Data size: 426 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col0 (type: string), _col4 (type: string), 
_col6 (type: string), _col12 (type: string), _col13 (type: string), _col14 
(type: string), _col15 (type: string)
+                      expressions: _col0 (type: string), _col5 (type: string), 
_col7 (type: string), _col13 (type: string), _col14 (type: string), _col15 
(type: string), _col16 (type: string)
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6
                       Statistics: Num rows: 12 Data size: 426 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -318,15 +319,15 @@ STAGE PLANS:
               Select Operator
                 Statistics: Num rows: 6 Data size: 213 Basic stats: COMPLETE 
Column stats: NONE
                 Lateral View Join Operator
-                  outputColumnNames: _col4, _col5, _col6, _col7, _col8, _col9, 
_col10, _col11, _col12
+                  outputColumnNames: _col5, _col6, _col7, _col8, _col9, 
_col10, _col11, _col12, _col13
                   Statistics: Num rows: 9 Data size: 319 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col4 (type: string)
-                    outputColumnNames: _col4
+                    expressions: _col5 (type: string)
+                    outputColumnNames: _col5
                     Statistics: Num rows: 9 Data size: 319 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: _col4 (type: string)
+                      keys: _col5 (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 9 Data size: 319 Basic stats: 
COMPLETE Column stats: NONE
@@ -347,15 +348,15 @@ STAGE PLANS:
                     predicate: c8 is not null (type: boolean)
                     Statistics: Num rows: 3 Data size: 106 Basic stats: 
COMPLETE Column stats: NONE
                     Lateral View Join Operator
-                      outputColumnNames: _col4, _col5, _col6, _col7, _col8, 
_col9, _col10, _col11, _col12
+                      outputColumnNames: _col5, _col6, _col7, _col8, _col9, 
_col10, _col11, _col12, _col13
                       Statistics: Num rows: 9 Data size: 319 Basic stats: 
COMPLETE Column stats: NONE
                       Select Operator
-                        expressions: _col4 (type: string)
-                        outputColumnNames: _col4
+                        expressions: _col5 (type: string)
+                        outputColumnNames: _col5
                         Statistics: Num rows: 9 Data size: 319 Basic stats: 
COMPLETE Column stats: NONE
                         Group By Operator
                           aggregations: count()
-                          keys: _col4 (type: string)
+                          keys: _col5 (type: string)
                           mode: hash
                           outputColumnNames: _col0, _col1
                           Statistics: Num rows: 9 Data size: 319 Basic stats: 
COMPLETE Column stats: NONE

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/udtf_posexplode.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udtf_posexplode.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/udtf_posexplode.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/udtf_posexplode.q.out 
Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ deductions MAP<STRING, FLOAT>,
 address STRUCT<street:STRING, city:STRING, state:STRING, zip:INT>)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@employees
 POSTHOOK: query: CREATE TABLE employees (
 name STRING,
 salary FLOAT,

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/udtf_stack.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udtf_stack.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/udtf_stack.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/udtf_stack.q.out Fri 
Aug 22 21:36:47 2014
@@ -23,10 +23,10 @@ STAGE PLANS:
               Select Operator
                 Statistics: Num rows: 0 Data size: 5812 Basic stats: PARTIAL 
Column stats: COMPLETE
                 Lateral View Join Operator
-                  outputColumnNames: _col4, _col5
+                  outputColumnNames: _col5, _col6
                   Statistics: Num rows: 0 Data size: 11624 Basic stats: 
PARTIAL Column stats: COMPLETE
                   Select Operator
-                    expressions: _col4 (type: string), _col5 (type: array<int>)
+                    expressions: _col5 (type: string), _col6 (type: array<int>)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 0 Data size: 11624 Basic stats: 
PARTIAL Column stats: COMPLETE
                     Limit
@@ -47,10 +47,10 @@ STAGE PLANS:
                   Statistics: Num rows: 0 Data size: 5812 Basic stats: PARTIAL 
Column stats: COMPLETE
                   function name: stack
                   Lateral View Join Operator
-                    outputColumnNames: _col4, _col5
+                    outputColumnNames: _col5, _col6
                     Statistics: Num rows: 0 Data size: 11624 Basic stats: 
PARTIAL Column stats: COMPLETE
                     Select Operator
-                      expressions: _col4 (type: string), _col5 (type: 
array<int>)
+                      expressions: _col5 (type: string), _col6 (type: 
array<int>)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 0 Data size: 11624 Basic stats: 
PARTIAL Column stats: COMPLETE
                       Limit
@@ -90,10 +90,10 @@ STAGE PLANS:
               Select Operator
                 Statistics: Num rows: 0 Data size: 5812 Basic stats: PARTIAL 
Column stats: COMPLETE
                 Lateral View Join Operator
-                  outputColumnNames: _col4, _col5
+                  outputColumnNames: _col5, _col6
                   Statistics: Num rows: 0 Data size: 11624 Basic stats: 
PARTIAL Column stats: COMPLETE
                   Select Operator
-                    expressions: _col4 (type: string), _col5 (type: array<int>)
+                    expressions: _col5 (type: string), _col6 (type: array<int>)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 0 Data size: 11624 Basic stats: 
PARTIAL Column stats: COMPLETE
                     Limit
@@ -114,10 +114,10 @@ STAGE PLANS:
                   Statistics: Num rows: 0 Data size: 5812 Basic stats: PARTIAL 
Column stats: COMPLETE
                   function name: stack
                   Lateral View Join Operator
-                    outputColumnNames: _col4, _col5
+                    outputColumnNames: _col5, _col6
                     Statistics: Num rows: 0 Data size: 11624 Basic stats: 
PARTIAL Column stats: COMPLETE
                     Select Operator
-                      expressions: _col4 (type: string), _col5 (type: 
array<int>)
+                      expressions: _col5 (type: string), _col6 (type: 
array<int>)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 0 Data size: 11624 Basic stats: 
PARTIAL Column stats: COMPLETE
                       Limit

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/unicode_notation.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/unicode_notation.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/unicode_notation.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/unicode_notation.q.out 
Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- HIVE-4618 hive should
 CREATE  TABLE k1( a string)ROW FORMAT DELIMITED FIELDS TERMINATED BY '\u0001'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@k1
 POSTHOOK: query: -- HIVE-4618 hive should accept unicode notation like \uxxxx
 
 CREATE  TABLE k1( a string)ROW FORMAT DELIMITED FIELDS TERMINATED BY '\u0001'
@@ -51,6 +52,7 @@ POSTHOOK: Output: default@k1
 PREHOOK: query: CREATE  TABLE k1( a string)ROW FORMAT DELIMITED FIELDS 
TERMINATED BY '\001'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@k1
 POSTHOOK: query: CREATE  TABLE k1( a string)ROW FORMAT DELIMITED FIELDS 
TERMINATED BY '\001'
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -97,6 +99,7 @@ POSTHOOK: Output: default@k1
 PREHOOK: query: CREATE  TABLE k1( a string)ROW FORMAT DELIMITED FIELDS 
TERMINATED BY '|'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@k1
 POSTHOOK: query: CREATE  TABLE k1( a string)ROW FORMAT DELIMITED FIELDS 
TERMINATED BY '|'
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union.q.out Fri Aug 22 
21:36:47 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union case: both subqueries are map jobs on same input, 
followed by filesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map jobs on same input, followed by filesink
 
 EXPLAIN
 FROM (
@@ -8,7 +9,8 @@ FROM (
 ) unioninput
 INSERT OVERWRITE DIRECTORY 'target/warehouse/union.out' SELECT unioninput.*
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are map jobs on same input, 
followed by filesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map jobs on same input, followed by filesink
 
 EXPLAIN
 FROM (

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union10.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union10.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union10.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union10.q.out Fri Aug 
22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- union case: all subqu
 create table tmptable(key string, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmptable
 POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way 
union, same input for all sub-queries, followed by filesink
 
 create table tmptable(key string, value int)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union11.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union11.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union11.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union11.q.out Fri Aug 
22 21:36:47 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way 
union, same input for all sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-reduce jobs, 3 way union, same input 
for all sub-queries, followed by reducesink
 
 explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value 
from src s1
@@ -7,7 +8,8 @@ explain 
                                         UNION ALL
                                             select 'tst3' as key, count(1) as 
value from src s3) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way 
union, same input for all sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-reduce jobs, 3 way union, same input 
for all sub-queries, followed by reducesink
 
 explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value 
from src s1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union12.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union12.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union12.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union12.q.out Fri Aug 
22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- union case: all subqu
 create table tmptable(key string, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmptable
 POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way 
union, different inputs for all sub-queries, followed by filesink
 
 create table tmptable(key string, value int)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union13.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union13.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union13.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union13.q.out Fri Aug 
22 21:36:47 2014
@@ -1,10 +1,12 @@
-PREHOOK: query: -- union case: both subqueries are a map-only jobs, same 
input, followed by filesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are a map-only jobs, same input, followed by 
filesink
 
 explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as 
value from src s1 UNION  ALL  
                                             select s2.key as key, s2.value as 
value from src s2) unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are a map-only jobs, same 
input, followed by filesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are a map-only jobs, same input, followed by 
filesink
 
 explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as 
value from src s1 UNION  ALL  

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union14.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union14.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union14.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union14.q.out Fri Aug 
22 21:36:47 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different 
inputs for sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by reducesink
 
 explain 
   select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value 
from src1 s2
@@ -6,7 +7,8 @@ explain 
                                       select 'tst1' as key, cast(count(1) as 
string) as value from src s1) 
   unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different 
inputs for sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by reducesink
 
 explain 
   select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value 
from src1 s2

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union15.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union15.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union15.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union15.q.out Fri Aug 
22 21:36:47 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different 
inputs for sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by reducesink
 
 explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as 
string) as value from src s1
@@ -7,7 +8,8 @@ explain 
                                         UNION  ALL  
                                             select s3.key as key, s3.value as 
value from src1 s3) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different 
inputs for sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by reducesink
 
 explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as 
string) as value from src s1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union16.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union16.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union16.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union16.q.out Fri Aug 
22 21:36:47 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_BEFORE_DIFF
+EXPLAIN
 SELECT count(1) FROM (
   SELECT key, value FROM src UNION ALL
   SELECT key, value FROM src UNION ALL
@@ -30,7 +31,8 @@ SELECT count(1) FROM (
   SELECT key, value FROM src UNION ALL
   SELECT key, value FROM src) src
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+EXPLAIN
 SELECT count(1) FROM (
   SELECT key, value FROM src UNION ALL
   SELECT key, value FROM src UNION ALL

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union17.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union17.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union17.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union17.q.out Fri Aug 
22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DEST1
 POSTHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS 
TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,11 +9,13 @@ POSTHOOK: Output: default@DEST1
 PREHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) 
STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DEST2
 POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) 
STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DEST2
-PREHOOK: query: -- union case:map-reduce sub-queries followed by multi-table 
insert
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case:map-reduce sub-queries followed by multi-table insert
 
 explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
@@ -21,7 +24,8 @@ FROM (select 'tst1' as key, cast(count(1
 INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, COUNT(DISTINCT 
SUBSTR(unionsrc.value,5)) GROUP BY unionsrc.key
 INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, 
COUNT(DISTINCT SUBSTR(unionsrc.value,5)) GROUP BY unionsrc.key, unionsrc.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case:map-reduce sub-queries followed by multi-table 
insert
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case:map-reduce sub-queries followed by multi-table insert
 
 explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union18.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union18.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union18.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union18.q.out Fri Aug 
22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DEST1
 POSTHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS 
TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@DEST1
 PREHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) 
STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DEST2
 POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) 
STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union19.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union19.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union19.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union19.q.out Fri Aug 
22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DEST1
 POSTHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS 
TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@DEST1
 PREHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) 
STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DEST2
 POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) 
STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union2.q.out Fri Aug 
22 21:36:47 2014
@@ -1,10 +1,12 @@
-PREHOOK: query: -- union case: both subqueries are map-reduce jobs on same 
input, followed by reduce sink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map-reduce jobs on same input, followed by 
reduce sink
 
 explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 
UNION  ALL  
                         select s2.key as key, s2.value as value from src s2) 
unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are map-reduce jobs on same 
input, followed by reduce sink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map-reduce jobs on same input, followed by 
reduce sink
 
 explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 
UNION  ALL  

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union20.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union20.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union20.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union20.q.out Fri Aug 
22 21:36:47 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union :map-reduce sub-queries followed by join
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union :map-reduce sub-queries followed by join
 
 explain 
 SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value
@@ -11,7 +12,8 @@ JOIN 
       select s4.key as key, s4.value as value from src s4 where s4.key < 10) 
unionsrc2
 ON (unionsrc1.key = unionsrc2.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union :map-reduce sub-queries followed by join
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union :map-reduce sub-queries followed by join
 
 explain 
 SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value
@@ -130,14 +132,14 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 36 Data size: 9792 Basic stats: COMPLETE 
Column stats: PARTIAL
+          Statistics: Num rows: 6 Data size: 1632 Basic stats: COMPLETE Column 
stats: PARTIAL
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: string), _col3 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
-            Statistics: Num rows: 36 Data size: 9792 Basic stats: COMPLETE 
Column stats: PARTIAL
+            Statistics: Num rows: 6 Data size: 1632 Basic stats: COMPLETE 
Column stats: PARTIAL
             File Output Operator
               compressed: false
-              Statistics: Num rows: 36 Data size: 9792 Basic stats: COMPLETE 
Column stats: PARTIAL
+              Statistics: Num rows: 6 Data size: 1632 Basic stats: COMPLETE 
Column stats: PARTIAL
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union21.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union21.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union21.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union21.q.out Fri Aug 
22 21:36:47 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union of constants, udf outputs, and columns from text 
table and thrift table
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union of constants, udf outputs, and columns from text table and thrift 
table
 
 explain
 SELECT key, count(1)
@@ -15,7 +16,8 @@ FROM (
 ) union_output
 GROUP BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union of constants, udf outputs, and columns from text 
table and thrift table
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union of constants, udf outputs, and columns from text table and thrift 
table
 
 explain
 SELECT key, count(1)

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

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

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

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union26.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union26.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union26.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union26.q.out Fri Aug 
22 21:36:47 2014
@@ -111,7 +111,7 @@ STAGE PLANS:
                 outputColumnNames: key, value
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
                 Lateral View Join Operator
-                  outputColumnNames: _col0, _col1, _col6
+                  outputColumnNames: _col0, _col1, _col7
                   Statistics: Num rows: 58 Data size: 11624 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
@@ -143,7 +143,7 @@ STAGE PLANS:
                   Statistics: Num rows: 29 Data size: 5812 Basic stats: 
COMPLETE Column stats: NONE
                   function name: explode
                   Lateral View Join Operator
-                    outputColumnNames: _col0, _col1, _col6
+                    outputColumnNames: _col0, _col1, _col7
                     Statistics: Num rows: 58 Data size: 11624 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col0 (type: string), _col1 (type: string)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union27.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union27.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union27.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union27.q.out Fri Aug 
22 21:36:47 2014
@@ -1,7 +1,9 @@
-PREHOOK: query: create table jackson_sev_same as select * from src
+PREHOOK: query: -- SORT_BEFORE_DIFF
+create table jackson_sev_same as select * from src
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
-POSTHOOK: query: create table jackson_sev_same as select * from src
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+create table jackson_sev_same as select * from src
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@jackson_sev_same
@@ -82,10 +84,10 @@ STAGE PLANS:
           condition expressions:
             0 
             1 {VALUE._col0}
-          outputColumnNames: _col5
+          outputColumnNames: _col6
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: '97' (type: string), _col5 (type: string)
+            expressions: '97' (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator

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

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

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union3.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union3.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union3.q.out Fri Aug 
22 21:36:47 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: explain
+PREHOOK: query: -- SORT_BEFORE_DIFF
+
+explain
 SELECT *
 FROM (
   SELECT 1 AS id
@@ -16,7 +18,9 @@ FROM (
   FROM (SELECT * FROM src LIMIT 1) s2
 ) a
 PREHOOK: type: QUERY
-POSTHOOK: query: explain
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+
+explain
 SELECT *
 FROM (
   SELECT 1 AS id
@@ -280,6 +284,7 @@ STAGE PLANS:
 PREHOOK: query: CREATE TABLE union_out (id int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@union_out
 POSTHOOK: query: CREATE TABLE union_out (id int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

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

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union31.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union31.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union31.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union31.q.out Fri Aug 
22 21:36:47 2014
@@ -27,6 +27,7 @@ POSTHOOK: Output: default@t2
 PREHOOK: query: create table t3(key string, cnt int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t3
 POSTHOOK: query: create table t3(key string, cnt int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -34,6 +35,7 @@ POSTHOOK: Output: default@t3
 PREHOOK: query: create table t4(value string, cnt int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t4
 POSTHOOK: query: create table t4(value string, cnt int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -293,6 +295,7 @@ val_9       2
 PREHOOK: query: create table t5(c1 string, cnt int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t5
 POSTHOOK: query: create table t5(c1 string, cnt int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -300,6 +303,7 @@ POSTHOOK: Output: default@t5
 PREHOOK: query: create table t6(c1 string, cnt int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t6
 POSTHOOK: query: create table t6(c1 string, cnt int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -608,6 +612,7 @@ POSTHOOK: Output: default@t2
 PREHOOK: query: create table t7(c1 string, cnt int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t7
 POSTHOOK: query: create table t7(c1 string, cnt int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -615,6 +620,7 @@ POSTHOOK: Output: default@t7
 PREHOOK: query: create table t8(c1 string, cnt int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t8
 POSTHOOK: query: create table t8(c1 string, cnt int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union32.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union32.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union32.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union32.q.out Fri Aug 
22 21:36:47 2014
@@ -501,10 +501,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col4
+          outputColumnNames: _col0, _col5
           Statistics: Num rows: 5 Data size: 38 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: UDFToDouble(UDFToLong(_col0)) (type: double), 
UDFToString(UDFToDouble(_col4)) (type: string)
+            expressions: UDFToDouble(UDFToLong(_col0)) (type: double), 
UDFToString(UDFToDouble(_col5)) (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 5 Data size: 38 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
@@ -658,10 +658,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {KEY.reducesinkkey0}
-          outputColumnNames: _col0, _col4
+          outputColumnNames: _col0, _col5
           Statistics: Num rows: 5 Data size: 38 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: UDFToDouble(UDFToLong(_col0)) (type: double), 
UDFToDouble(_col4) (type: double)
+            expressions: UDFToDouble(UDFToLong(_col0)) (type: double), 
UDFToDouble(_col5) (type: double)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 5 Data size: 38 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union33.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union33.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union33.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union33.q.out Fri Aug 
22 21:36:47 2014
@@ -1,10 +1,13 @@
-PREHOOK: query: -- This tests that a union all with a map only subquery on one 
side and a 
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- This tests that a union all with a map only subquery on one side and a 
 -- subquery involving two map reduce jobs on the other runs correctly.
 
 CREATE TABLE test_src (key STRING, value STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: -- This tests that a union all with a map only subquery on 
one side and a 
+PREHOOK: Output: default@test_src
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- This tests that a union all with a map only subquery on one side and a 
 -- subquery involving two map reduce jobs on the other runs correctly.
 
 CREATE TABLE test_src (key STRING, value STRING)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union34.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union34.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union34.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union34.q.out Fri Aug 
22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table src10_1 (key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src10_1
 POSTHOOK: query: create table src10_1 (key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@src10_1
 PREHOOK: query: create table src10_2 (key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src10_2
 POSTHOOK: query: create table src10_2 (key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -15,6 +17,7 @@ POSTHOOK: Output: default@src10_2
 PREHOOK: query: create table src10_3 (key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src10_3
 POSTHOOK: query: create table src10_3 (key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -22,6 +25,7 @@ POSTHOOK: Output: default@src10_3
 PREHOOK: query: create table src10_4 (key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src10_4
 POSTHOOK: query: create table src10_4 (key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union4.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union4.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union4.q.out Fri Aug 
22 21:36:47 2014
@@ -4,6 +4,7 @@ PREHOOK: query: -- union case: both subq
 create table tmptable(key string, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmptable
 POSTHOOK: query: -- union case: both subqueries are map-reduce jobs on same 
input, followed by filesink
 
 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union5.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union5.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union5.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union5.q.out Fri Aug 
22 21:36:47 2014
@@ -1,11 +1,13 @@
-PREHOOK: query: -- union case: both subqueries are map-reduce jobs on same 
input, followed by reduce sink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map-reduce jobs on same input, followed by 
reduce sink
 
 explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value 
from src s1
                                     UNION  ALL  
                                       select 'tst2' as key, count(1) as value 
from src s2) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are map-reduce jobs on same 
input, followed by reduce sink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map-reduce jobs on same input, followed by 
reduce sink
 
 explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value 
from src s1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union6.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union6.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union6.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union6.q.out Fri Aug 
22 21:36:47 2014
@@ -4,6 +4,7 @@ PREHOOK: query: -- union case: 1 subquer
 create table tmptable(key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmptable
 POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different 
inputs for sub-queries, followed by filesink
 
 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union7.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union7.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union7.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union7.q.out Fri Aug 
22 21:36:47 2014
@@ -1,11 +1,13 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different 
inputs for sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by reducesink
 
 explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as 
string) as value from src s1
                                         UNION  ALL  
                                             select s2.key as key, s2.value as 
value from src1 s2) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different 
inputs for sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by reducesink
 
 explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as 
string) as value from src s1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union8.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union8.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union8.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union8.q.out Fri Aug 
22 21:36:47 2014
@@ -1,11 +1,13 @@
-PREHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way 
union, same input for all sub-queries, followed by filesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-only jobs, 3 way union, same input for 
all sub-queries, followed by filesink
 
 explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as 
value from src s1 UNION  ALL  
                                             select s2.key as key, s2.value as 
value from src s2 UNION  ALL  
                                             select s3.key as key, s3.value as 
value from src s3) unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way 
union, same input for all sub-queries, followed by filesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-only jobs, 3 way union, same input for 
all sub-queries, followed by filesink
 
 explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as 
value from src s1 UNION  ALL  

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union9.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union9.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union9.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union9.q.out Fri Aug 
22 21:36:47 2014
@@ -1,11 +1,13 @@
-PREHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way 
union, same input for all sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-only jobs, 3 way union, same input for 
all sub-queries, followed by reducesink
 
 explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 
UNION  ALL  
                         select s2.key as key, s2.value as value from src s2 
UNION ALL
                         select s3.key as key, s3.value as value from src s3) 
unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way 
union, same input for all sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-only jobs, 3 way union, same input for 
all sub-queries, followed by reducesink
 
 explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 
UNION  ALL  

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_date.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_date.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_date.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_date.q.out Fri 
Aug 22 21:36:47 2014
@@ -19,6 +19,7 @@ PREHOOK: query: create table union_date_
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@union_date_1
 POSTHOOK: query: create table union_date_1 (
   ORIGIN_CITY_NAME string,
   DEST_CITY_NAME string,
@@ -38,6 +39,7 @@ PREHOOK: query: create table union_date_
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@union_date_2
 POSTHOOK: query: create table union_date_2 (
   ORIGIN_CITY_NAME string,
   DEST_CITY_NAME string,

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

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_null.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_null.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_null.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_null.q.out Fri 
Aug 22 21:36:47 2014
@@ -1,22 +1,26 @@
-PREHOOK: query: -- HIVE-2901
-select x from (select value as x from src union all select NULL as x from 
src)a limit 10
+PREHOOK: query: -- SORT_BEFORE_DIFF
+
+-- HIVE-2901
+select x from (select value as x from src order by x limit 5 union all select 
NULL as x from src limit 5) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- HIVE-2901
-select x from (select value as x from src union all select NULL as x from 
src)a limit 10
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+
+-- HIVE-2901
+select x from (select value as x from src order by x limit 5 union all select 
NULL as x from src limit 5) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-val_238
+val_0
+val_0
+val_0
+val_10
+val_100
 NULL
-val_86
 NULL
-val_311
 NULL
-val_27
 NULL
-val_165
 NULL
 PREHOOK: query: -- HIVE-4837
 select * from (select null as N from src1 group by key UNION ALL select null 
as N from src1 group by key ) a

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_1.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_1.q.out 
Fri Aug 22 21:36:47 2014
@@ -11,6 +11,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 map-reduce subqueries is performed followed by select star and a 
file sink
 -- There is no need to write the temporary results of the sub-queries, and 
then read them 
@@ -28,6 +29,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as 
textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as 
textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_10.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_10.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_10.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_10.q.out 
Fri Aug 22 21:36:47 2014
@@ -15,6 +15,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 subqueries is performed (one of which is a map-only query, and 
the
 -- other one contains a nested union where one of the sub-queries requires a 
map-reduce
@@ -36,6 +37,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_11.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_11.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_11.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_11.q.out 
Fri Aug 22 21:36:47 2014
@@ -15,6 +15,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 subqueries is performed (one of which is a map-only query, and 
the
 -- other one contains a nested union where also contains map only sub-queries),
@@ -36,6 +37,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_12.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_12.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_12.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_12.q.out 
Fri Aug 22 21:36:47 2014
@@ -14,6 +14,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 subqueries is performed (one of which is a map-only query, and 
the
 -- other one is a map-join query), followed by select star and a file sink.
@@ -34,6 +35,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -172,10 +174,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                outputColumnNames: _col0, _col5
+                outputColumnNames: _col0, _col6
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), UDFToLong(_col5) (type: 
bigint)
+                  expressions: _col0 (type: string), UDFToLong(_col6) (type: 
bigint)
                   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/union_remove_13.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_13.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_13.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_13.q.out 
Fri Aug 22 21:36:47 2014
@@ -14,6 +14,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 subqueries is performed (one of which is a mapred query, and the
 -- other one is a map-join query), followed by select star and a file sink.
@@ -34,6 +35,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -195,10 +197,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                outputColumnNames: _col0, _col5
+                outputColumnNames: _col0, _col6
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), UDFToLong(_col5) (type: 
bigint)
+                  expressions: _col0 (type: string), UDFToLong(_col6) (type: 
bigint)
                   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/union_remove_14.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_14.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_14.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_14.q.out 
Fri Aug 22 21:36:47 2014
@@ -15,6 +15,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 subqueries is performed (one of which is a map-only query, and 
the
 -- other one contains a join, which should be performed as a map-join query at 
runtime),
@@ -36,6 +37,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as 
rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -174,10 +176,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                outputColumnNames: _col0, _col5
+                outputColumnNames: _col0, _col6
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), UDFToLong(_col5) (type: 
bigint)
+                  expressions: _col0 (type: string), UDFToLong(_col6) (type: 
bigint)
                   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/union_remove_15.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_15.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_15.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_15.q.out 
Fri Aug 22 21:36:47 2014
@@ -14,6 +14,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 map-reduce subqueries is performed followed by select star and a 
file sink
 -- and the results are written to a table using dynamic partitions.
@@ -34,6 +35,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned 
by (ds string) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) 
partitioned by (ds string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_16.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_16.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_16.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_16.q.out 
Fri Aug 22 21:36:47 2014
@@ -13,6 +13,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 map-reduce subqueries is performed followed by select star and a 
file sink
 -- and the results are written to a table using dynamic partitions.
@@ -32,6 +33,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned 
by (ds string) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) 
partitioned by (ds string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_17.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_17.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_17.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_17.q.out 
Fri Aug 22 21:36:47 2014
@@ -11,6 +11,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 map-reduce subqueries is performed followed by select star and a 
file sink
 -- and the results are written to a table using dynamic partitions.
@@ -28,6 +29,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned 
by (ds string) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) 
partitioned by (ds string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_18.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_18.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_18.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_18.q.out 
Fri Aug 22 21:36:47 2014
@@ -13,6 +13,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, ds string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 map-reduce subqueries is performed followed by select star and a 
file sink
 -- There is no need to write the temporary results of the sub-queries, and 
then read them 
@@ -32,6 +33,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned 
by (ds string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) 
partitioned by (ds string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out 
Fri Aug 22 21:36:47 2014
@@ -11,6 +11,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 map-reduce subqueries is performed followed by select star and a 
file sink
 -- There is no need to write the temporary results of the sub-queries, and 
then read them 
@@ -28,6 +29,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as 
textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as 
textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_2.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_2.q.out 
Fri Aug 22 21:36:47 2014
@@ -12,6 +12,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 3 subqueries is performed (exactly one of which requires a 
map-reduce job)
 -- followed by select star and a file sink.
@@ -30,6 +31,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as 
textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as 
textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_20.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_20.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_20.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_20.q.out 
Fri Aug 22 21:36:47 2014
@@ -12,6 +12,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 map-reduce subqueries is performed followed by select and a file 
sink
 -- However, the order of the columns in the select list is different. So, 
union cannot
@@ -30,6 +31,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(values bigint, key string) stored as 
textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(values bigint, key string) stored as 
textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_21.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_21.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_21.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_21.q.out 
Fri Aug 22 21:36:47 2014
@@ -12,6 +12,7 @@ PREHOOK: query: -- This is to test the u
 create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@inputTbl1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink 
optimization
 -- Union of 2 map-reduce subqueries is performed followed by select and a file 
sink
 -- However, all the columns are not selected. So, union cannot
@@ -30,6 +31,7 @@ POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@outputTbl1
 POSTHOOK: query: create table outputTbl1(key string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default


Reply via email to