Modified: hive/branches/cbo/ql/src/test/results/clientpositive/subquery_in.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_in.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/subquery_in.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/subquery_in.q.out Fri 
Jul 25 00:38:23 2014
@@ -159,14 +159,14 @@ STAGE PLANS:
           Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -271,14 +271,14 @@ STAGE PLANS:
           Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -449,14 +449,14 @@ STAGE PLANS:
           Statistics: Num rows: 16 Data size: 1744 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 8 Data size: 872 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 16 Data size: 1744 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col1 (type: string), _col5 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 872 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 16 Data size: 1744 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 8 Data size: 872 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 16 Data size: 1744 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -620,14 +620,14 @@ STAGE PLANS:
           Statistics: Num rows: 4 Data size: 930 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 2 Data size: 465 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 4 Data size: 930 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col2 (type: string), _col1 (type: string), _col5 
(type: int)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 2 Data size: 465 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 930 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 2 Data size: 465 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 930 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -765,14 +765,14 @@ STAGE PLANS:
           Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
                 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/subquery_in_having.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_in_having.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_in_having.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_in_having.q.out 
Fri Jul 25 00:38:23 2014
@@ -138,14 +138,14 @@ STAGE PLANS:
           Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 15 Data size: 1546 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: bigint)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 15 Data size: 1546 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 15 Data size: 1546 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -345,14 +345,14 @@ STAGE PLANS:
           Statistics: Num rows: 7 Data size: 1542 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 3 Data size: 660 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 7 Data size: 1542 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: bigint)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 3 Data size: 660 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 7 Data size: 1542 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 3 Data size: 660 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 7 Data size: 1542 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -512,14 +512,14 @@ STAGE PLANS:
           Statistics: Num rows: 16 Data size: 1744 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 8 Data size: 872 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 16 Data size: 1744 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: double)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 872 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 16 Data size: 1744 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 8 Data size: 872 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 16 Data size: 1744 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -843,17 +843,17 @@ STAGE PLANS:
           Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
                 keys: _col0 (type: string), _col1 (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -869,7 +869,7 @@ STAGE PLANS:
               key expressions: _col0 (type: string), _col1 (type: string)
               sort order: ++
               Map-reduce partition columns: _col0 (type: string), _col1 (type: 
string)
-              Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col2 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -877,10 +877,10 @@ STAGE PLANS:
           keys: KEY._col0 (type: string), KEY._col1 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 4 Data size: 826 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: _col2 is not null (type: boolean)
-            Statistics: Num rows: 4 Data size: 826 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -896,7 +896,7 @@ STAGE PLANS:
               key expressions: _col2 (type: bigint)
               sort order: +
               Map-reduce partition columns: _col2 (type: bigint)
-              Statistics: Num rows: 4 Data size: 826 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col0 (type: string), _col1 (type: string)
           TableScan
             Reduce Output Operator
@@ -915,14 +915,14 @@ STAGE PLANS:
           Statistics: Num rows: 9 Data size: 991 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 4 Data size: 440 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 9 Data size: 991 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: bigint)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 4 Data size: 440 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 9 Data size: 991 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 440 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 9 Data size: 991 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1131,7 +1131,7 @@ STAGE PLANS:
               key expressions: _col2 (type: bigint)
               sort order: +
               Map-reduce partition columns: _col2 (type: bigint)
-              Statistics: Num rows: 4 Data size: 826 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col0 (type: string), _col1 (type: string)
           TableScan
             Reduce Output Operator
@@ -1150,14 +1150,14 @@ STAGE PLANS:
           Statistics: Num rows: 9 Data size: 991 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 4 Data size: 440 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 9 Data size: 991 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: bigint)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 4 Data size: 440 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 9 Data size: 991 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 440 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 9 Data size: 991 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1216,22 +1216,22 @@ STAGE PLANS:
                 Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 8 Data size: 1653 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 16 Data size: 3306 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 8 Data size: 1653 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 16 Data size: 3306 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: _col0 (type: string), _col1 (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
-                      Statistics: Num rows: 8 Data size: 1653 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 16 Data size: 3306 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string), _col1 (type: 
string)
                         sort order: ++
                         Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string)
-                        Statistics: Num rows: 8 Data size: 1653 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 16 Data size: 3306 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col2 (type: bigint)
       Local Work:
         Map Reduce Local Work
@@ -1241,10 +1241,10 @@ STAGE PLANS:
           keys: KEY._col0 (type: string), KEY._col1 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 4 Data size: 826 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: _col2 is not null (type: boolean)
-            Statistics: Num rows: 4 Data size: 826 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1653 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -1395,14 +1395,14 @@ STAGE PLANS:
           Statistics: Num rows: 8 Data size: 1861 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 4 Data size: 930 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1861 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: double)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 4 Data size: 930 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1861 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 930 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 8 Data size: 1861 Basic stats: COMPLETE 
Column stats: NONE
                 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/subquery_multiinsert.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_multiinsert.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_multiinsert.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_multiinsert.q.out 
Fri Jul 25 00:38:23 2014
@@ -184,11 +184,11 @@ STAGE PLANS:
           Statistics: Num rows: 34 Data size: 7032 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col4 is null) (type: boolean)
-            Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
                 table:
@@ -203,16 +203,16 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: string)
               sort order: +
-              Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: 
string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -272,14 +272,14 @@ STAGE PLANS:
           Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -680,14 +680,14 @@ STAGE PLANS:
               Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
               Filter Operator
                 predicate: (1 = 1) (type: boolean)
-                Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 15 Data size: 3093 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 31 Data size: 6393 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 15 Data size: 3093 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 31 Data size: 6393 Basic stats: 
COMPLETE Column stats: NONE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -752,15 +752,15 @@ STAGE PLANS:
               Statistics: Num rows: 34 Data size: 7032 Basic stats: COMPLETE 
Column stats: NONE
               Filter Operator
                 predicate: ((1 = 1) and _col4 is null) (type: boolean)
-                Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 8 Data size: 1654 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 17 Data size: 3516 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
-                    Statistics: Num rows: 8 Data size: 1654 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 17 Data size: 3516 Basic stats: 
COMPLETE Column stats: NONE
                     value expressions: _col1 (type: string)
       Local Work:
         Map Reduce Local Work
@@ -768,10 +768,10 @@ STAGE PLANS:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: 
string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
             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/subquery_notexists.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notexists.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notexists.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notexists.q.out 
Fri Jul 25 00:38:23 2014
@@ -60,14 +60,14 @@ STAGE PLANS:
           Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col6 is null) (type: boolean)
-            Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -313,14 +313,14 @@ STAGE PLANS:
           Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col5 is null) (type: boolean)
-            Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
                 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/subquery_notexists_having.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notexists_having.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notexists_having.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notexists_having.q.out
 Fri Jul 25 00:38:23 2014
@@ -94,14 +94,14 @@ STAGE PLANS:
           Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col4 is null) (type: boolean)
-            Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -238,14 +238,14 @@ STAGE PLANS:
           Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col3 is null) (type: boolean)
-            Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 7 Data size: 1443 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 15 Data size: 3093 Basic stats: COMPLETE 
Column stats: NONE
                 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/subquery_notin.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notin.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notin.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notin.q.out 
Fri Jul 25 00:38:23 2014
@@ -229,14 +229,14 @@ STAGE PLANS:
           Statistics: Num rows: 34 Data size: 7032 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col4 is null) (type: boolean)
-            Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 8 Data size: 1654 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 17 Data size: 3516 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -470,14 +470,14 @@ STAGE PLANS:
           Statistics: Num rows: 17 Data size: 3839 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col11 is null) (type: boolean)
-            Statistics: Num rows: 4 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1806 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col2 (type: string), _col1 (type: string), _col5 
(type: int)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 4 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1806 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 8 Data size: 1806 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -744,14 +744,14 @@ STAGE PLANS:
           Statistics: Num rows: 36 Data size: 3839 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col11 is null) (type: boolean)
-            Statistics: Num rows: 9 Data size: 959 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 18 Data size: 1919 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col1 (type: string), _col5 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 9 Data size: 959 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 18 Data size: 1919 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 9 Data size: 959 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 18 Data size: 1919 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1041,14 +1041,14 @@ STAGE PLANS:
           Statistics: Num rows: 17 Data size: 3839 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col11 is null) (type: boolean)
-            Statistics: Num rows: 4 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1806 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col2 (type: string), _col1 (type: string), _col5 
(type: int)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 4 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1806 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 8 Data size: 1806 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1568,14 +1568,14 @@ STAGE PLANS:
           Statistics: Num rows: 22 Data size: 2302 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col1 is null) (type: boolean)
-            Statistics: Num rows: 5 Data size: 523 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 11 Data size: 1151 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 5 Data size: 523 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 11 Data size: 1151 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 5 Data size: 523 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 11 Data size: 1151 Basic stats: COMPLETE 
Column stats: NONE
                 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/subquery_notin_having.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notin_having.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notin_having.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notin_having.q.out
 Fri Jul 25 00:38:23 2014
@@ -177,14 +177,14 @@ STAGE PLANS:
           Statistics: Num rows: 69 Data size: 7032 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col2 is null) (type: boolean)
-            Statistics: Num rows: 17 Data size: 1732 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 34 Data size: 3465 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: bigint)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 17 Data size: 1732 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 34 Data size: 3465 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 17 Data size: 1732 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 34 Data size: 3465 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -355,14 +355,14 @@ STAGE PLANS:
           Statistics: Num rows: 34 Data size: 3839 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col4 is null) (type: boolean)
-            Statistics: Num rows: 8 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 17 Data size: 1919 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: double)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 17 Data size: 1919 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 8 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 17 Data size: 1919 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -647,14 +647,14 @@ STAGE PLANS:
           Statistics: Num rows: 34 Data size: 3839 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: ((1 = 1) and _col3 is null) (type: boolean)
-            Statistics: Num rows: 8 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 17 Data size: 1919 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: double)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 17 Data size: 1919 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 8 Data size: 903 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 17 Data size: 1919 Basic stats: COMPLETE 
Column stats: NONE
                 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/subquery_unqualcolumnrefs.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
 Fri Jul 25 00:38:23 2014
@@ -121,14 +121,14 @@ STAGE PLANS:
           Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -194,14 +194,14 @@ STAGE PLANS:
           Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -611,14 +611,14 @@ STAGE PLANS:
           Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -720,14 +720,14 @@ STAGE PLANS:
           Statistics: Num rows: 7 Data size: 1542 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 3 Data size: 660 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 7 Data size: 1542 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: bigint)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 3 Data size: 660 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 7 Data size: 1542 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 3 Data size: 660 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 7 Data size: 1542 Basic stats: COMPLETE 
Column stats: NONE
                 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/tez/bucket2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket2.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket2.q.out 
(original) and 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket2.q.out Fri Jul 
25 00:38:23 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket3.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket3.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket3.q.out 
(original) and 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket3.q.out Fri Jul 
25 00:38:23 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket4.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket4.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket4.q.out 
(original) and 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket4.q.out Fri Jul 
25 00:38:23 2014 differ

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
 Fri Jul 25 00:38:23 2014
@@ -247,21 +247,21 @@ STAGE PLANS:
                 Statistics: Num rows: 1 Data size: 125 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 125 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: _col0 (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
               Group By Operator
@@ -362,21 +362,21 @@ STAGE PLANS:
                 Statistics: Num rows: 1 Data size: 125 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 125 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: _col0 (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
               Group By Operator
@@ -500,21 +500,21 @@ STAGE PLANS:
                 Statistics: Num rows: 1 Data size: 125 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 125 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: _col0 (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
               Group By Operator

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
 Fri Jul 25 00:38:23 2014
@@ -210,21 +210,21 @@ STAGE PLANS:
                       Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                       Filter Operator
                         predicate: (1 = 1) (type: boolean)
-                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                         Select Operator
                           expressions: _col0 (type: string)
                           outputColumnNames: _col0
-                          Statistics: Num rows: 0 Data size: 0 Basic stats: 
NONE Column stats: NONE
+                          Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                           Group By Operator
                             keys: _col0 (type: string)
                             mode: hash
                             outputColumnNames: _col0
-                            Statistics: Num rows: 0 Data size: 0 Basic stats: 
NONE Column stats: NONE
+                            Statistics: Num rows: 1 Data size: 125 Basic 
stats: COMPLETE Column stats: NONE
                             Reduce Output Operator
                               key expressions: _col0 (type: string)
                               sort order: +
                               Map-reduce partition columns: _col0 (type: 
string)
-                              Statistics: Num rows: 0 Data size: 0 Basic 
stats: NONE Column stats: NONE
+                              Statistics: Num rows: 1 Data size: 125 Basic 
stats: COMPLETE Column stats: NONE
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -324,21 +324,21 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                     Filter Operator
                       predicate: (1 = 1) (type: boolean)
-                      Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col0 (type: string)
                         outputColumnNames: _col0
-                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                         Group By Operator
                           keys: _col0 (type: string)
                           mode: hash
                           outputColumnNames: _col0
-                          Statistics: Num rows: 0 Data size: 0 Basic stats: 
NONE Column stats: NONE
+                          Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                           Reduce Output Operator
                             key expressions: _col0 (type: string)
                             sort order: +
                             Map-reduce partition columns: _col0 (type: string)
-                            Statistics: Num rows: 0 Data size: 0 Basic stats: 
NONE Column stats: NONE
+                            Statistics: Num rows: 1 Data size: 125 Basic 
stats: COMPLETE Column stats: NONE
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -439,21 +439,21 @@ STAGE PLANS:
                       Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                       Filter Operator
                         predicate: (1 = 1) (type: boolean)
-                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                         Select Operator
                           expressions: _col0 (type: string)
                           outputColumnNames: _col0
-                          Statistics: Num rows: 0 Data size: 0 Basic stats: 
NONE Column stats: NONE
+                          Statistics: Num rows: 1 Data size: 125 Basic stats: 
COMPLETE Column stats: NONE
                           Group By Operator
                             keys: _col0 (type: string)
                             mode: hash
                             outputColumnNames: _col0
-                            Statistics: Num rows: 0 Data size: 0 Basic stats: 
NONE Column stats: NONE
+                            Statistics: Num rows: 1 Data size: 125 Basic 
stats: COMPLETE Column stats: NONE
                             Reduce Output Operator
                               key expressions: _col0 (type: string)
                               sort order: +
                               Map-reduce partition columns: _col0 (type: 
string)
-                              Statistics: Num rows: 0 Data size: 0 Basic 
stats: NONE Column stats: NONE
+                              Statistics: Num rows: 1 Data size: 125 Basic 
stats: COMPLETE Column stats: NONE
         Map 3 
             Map Operator Tree:
                 TableScan

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/subquery_exists.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/subquery_exists.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/tez/subquery_exists.q.out 
Fri Jul 25 00:38:23 2014
@@ -76,14 +76,14 @@ STAGE PLANS:
                 Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 8 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 4 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 8 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 4 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 8 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       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/tez/subquery_in.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/subquery_in.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/tez/subquery_in.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/tez/subquery_in.q.out 
Fri Jul 25 00:38:23 2014
@@ -167,14 +167,14 @@ STAGE PLANS:
                 Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 8 Data size: 1653 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 16 Data size: 3306 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 8 Data size: 1653 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 16 Data size: 3306 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 8 Data size: 1653 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 16 Data size: 3306 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -287,14 +287,14 @@ STAGE PLANS:
                 Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 8 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 4 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 8 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 4 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 8 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -453,14 +453,14 @@ STAGE PLANS:
                 Statistics: Num rows: 16 Data size: 1744 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 8 Data size: 872 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 16 Data size: 1744 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col1 (type: string), _col5 (type: int)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 8 Data size: 872 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 16 Data size: 1744 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 8 Data size: 872 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 16 Data size: 1744 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -562,14 +562,14 @@ STAGE PLANS:
                 Statistics: Num rows: 4 Data size: 930 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 2 Data size: 465 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 930 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col2 (type: string), _col1 (type: string), 
_col5 (type: int)
                     outputColumnNames: _col0, _col1, _col2
-                    Statistics: Num rows: 2 Data size: 465 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 4 Data size: 930 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 2 Data size: 465 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 4 Data size: 930 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -734,14 +734,14 @@ STAGE PLANS:
                 Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 8 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 4 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 8 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 4 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 8 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       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/udaf_sum_list.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udaf_sum_list.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/udaf_sum_list.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/udaf_sum_list.q.out 
Fri Jul 25 00:38:23 2014
@@ -3,13 +3,13 @@ PREHOOK: query: -- HIVE-5279
 -- After
 create temporary function sum_list as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSumList'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: sum_list
 POSTHOOK: query: -- HIVE-5279
 -- GenericUDAFSumList has Converter which does not have default constructor
 -- After
 create temporary function sum_list as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSumList'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: sum_list
 PREHOOK: query: select sum_list(array(key, key)) from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_compare_java_string.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udf_compare_java_string.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_compare_java_string.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_compare_java_string.q.out
 Fri Jul 25 00:38:23 2014
@@ -12,10 +12,10 @@ STAGE PLANS:
 
 PREHOOK: query: CREATE TEMPORARY FUNCTION test_udf_get_java_string AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestGetJavaString'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_udf_get_java_string
 POSTHOOK: query: CREATE TEMPORARY FUNCTION test_udf_get_java_string AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestGetJavaString'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_udf_get_java_string
 PREHOOK: query: select * from src where value = 
test_udf_get_java_string("val_66")
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_context_aware.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udf_context_aware.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_context_aware.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_context_aware.q.out 
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
 PREHOOK: query: create temporary function counter as 
'org.apache.hadoop.hive.ql.udf.generic.DummyContextUDF'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: counter
 POSTHOOK: query: create temporary function counter as 
'org.apache.hadoop.hive.ql.udf.generic.DummyContextUDF'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: counter
 PREHOOK: query: select *, counter(key) from src limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_logic_java_boolean.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udf_logic_java_boolean.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_logic_java_boolean.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_logic_java_boolean.q.out
 Fri Jul 25 00:38:23 2014
@@ -12,10 +12,10 @@ STAGE PLANS:
 
 PREHOOK: query: CREATE TEMPORARY FUNCTION test_udf_get_java_boolean AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestGetJavaBoolean'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_udf_get_java_boolean
 POSTHOOK: query: CREATE TEMPORARY FUNCTION test_udf_get_java_boolean AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestGetJavaBoolean'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_udf_get_java_boolean
 PREHOOK: query: select 1 from src where test_udf_get_java_boolean("false") and 
True limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -171,7 +171,7 @@ POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 PREHOOK: query: DROP TEMPORARY FUNCTION test_udf_get_java_boolean
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_udf_get_java_boolean
 POSTHOOK: query: DROP TEMPORARY FUNCTION test_udf_get_java_boolean
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_udf_get_java_boolean

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength.q.out 
Fri Jul 25 00:38:23 2014
@@ -12,10 +12,10 @@ STAGE PLANS:
 
 PREHOOK: query: CREATE TEMPORARY FUNCTION testlength AS 
'org.apache.hadoop.hive.ql.udf.UDFTestLength'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: testlength
 POSTHOOK: query: CREATE TEMPORARY FUNCTION testlength AS 
'org.apache.hadoop.hive.ql.udf.UDFTestLength'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: testlength
 PREHOOK: query: SELECT testlength(src.value) FROM src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -526,7 +526,7 @@ POSTHOOK: Input: default@src
 6
 PREHOOK: query: DROP TEMPORARY FUNCTION testlength
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: testlength
 POSTHOOK: query: DROP TEMPORARY FUNCTION testlength
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: testlength

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength2.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength2.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength2.q.out 
Fri Jul 25 00:38:23 2014
@@ -12,10 +12,10 @@ STAGE PLANS:
 
 PREHOOK: query: CREATE TEMPORARY FUNCTION testlength2 AS 
'org.apache.hadoop.hive.ql.udf.UDFTestLength2'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: testlength2
 POSTHOOK: query: CREATE TEMPORARY FUNCTION testlength2 AS 
'org.apache.hadoop.hive.ql.udf.UDFTestLength2'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: testlength2
 PREHOOK: query: SELECT testlength2(src.value) FROM src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -526,7 +526,7 @@ POSTHOOK: Input: default@src
 6
 PREHOOK: query: DROP TEMPORARY FUNCTION testlength2
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: testlength2
 POSTHOOK: query: DROP TEMPORARY FUNCTION testlength2
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: testlength2

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/udf_using.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udf_using.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/udf_using.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/udf_using.q.out Fri 
Jul 25 00:38:23 2014
@@ -1,9 +1,11 @@
 #### A masked pattern was here ####
 PREHOOK: type: CREATEFUNCTION
 PREHOOK: Output: database:default
+PREHOOK: Output: lookup
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEFUNCTION
 POSTHOOK: Output: database:default
+POSTHOOK: Output: lookup
 PREHOOK: query: create table udf_using (c1 string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -41,7 +43,9 @@ POSTHOOK: Output: default@udf_using
 PREHOOK: query: drop function lookup
 PREHOOK: type: DROPFUNCTION
 PREHOOK: Output: database:default
+PREHOOK: Output: lookup
 POSTHOOK: query: drop function lookup
 POSTHOOK: type: DROPFUNCTION
 POSTHOOK: Output: database:default
+POSTHOOK: Output: lookup
 #### A masked pattern was here ####

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/windowing_udaf2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/windowing_udaf2.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/windowing_udaf2.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/windowing_udaf2.q.out 
Fri Jul 25 00:38:23 2014
@@ -1,11 +1,11 @@
 PREHOOK: query: -- user-added aggregates should be usable as windowing 
functions
 create temporary function mysum as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: mysum
 POSTHOOK: query: -- user-added aggregates should be usable as windowing 
functions
 create temporary function mysum as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: mysum
 PREHOOK: query: select sum(key) over (), mysum(key) over () from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src

Modified: 
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionBase.java
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionBase.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionBase.java
 (original)
+++ 
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionBase.java
 Fri Jul 25 00:38:23 2014
@@ -24,6 +24,8 @@ import org.apache.hive.service.cli.Sessi
 import org.apache.hive.service.cli.operation.OperationManager;
 import org.apache.hive.service.cli.thrift.TProtocolVersion;
 
+import java.util.Map;
+
 /**
  * Methods that don't need to be executed under a doAs
  * context are here. Rest of them in HiveSession interface
@@ -49,6 +51,12 @@ public interface HiveSessionBase {
    */
   public void setOperationManager(OperationManager operationManager);
 
+  /**
+   * Initialize the session
+   * @param sessionConfMap
+   */
+  public void initialize(Map<String, String> sessionConfMap);
+
   public SessionHandle getSessionHandle();
 
   public String getUsername();

Modified: 
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java
 (original)
+++ 
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java
 Fri Jul 25 00:38:23 2014
@@ -18,7 +18,11 @@
 
 package org.apache.hive.service.cli.session;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +30,8 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.common.cli.HiveFileProcessor;
+import org.apache.hadoop.hive.common.cli.IHiveFileProcessor;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
@@ -82,7 +88,7 @@ public class HiveSessionImpl implements 
   private final Set<OperationHandle> opHandleSet = new 
HashSet<OperationHandle>();
 
   public HiveSessionImpl(TProtocolVersion protocol, String username, String 
password,
-      HiveConf serverhiveConf, Map<String, String> sessionConfMap, String 
ipAddress) {
+      HiveConf serverhiveConf, String ipAddress) {
     this.username = username;
     this.password = password;
     this.sessionHandle = new SessionHandle(protocol);
@@ -98,8 +104,16 @@ public class HiveSessionImpl implements 
     hiveConf.setInt(ListSinkOperator.OUTPUT_PROTOCOL, protocol.getValue());
 
     sessionState = new SessionState(hiveConf, username);
+    sessionState.setUserIpAddress(ipAddress);
     sessionState.setIsHiveServerQuery(true);
     SessionState.start(sessionState);
+  }
+
+  @Override
+  public void initialize(Map<String, String> sessionConfMap) {
+    //process global init file: .hiverc
+    processGlobalInitFile();
+    SessionState.setCurrentSessionState(sessionState);
 
     //set conf properties specified by user from client side
     if (sessionConfMap != null) {
@@ -107,6 +121,53 @@ public class HiveSessionImpl implements 
     }
   }
 
+  /**
+   * It is used for processing hiverc file from HiveServer2 side.
+   */
+  private class GlobalHivercFileProcessor extends HiveFileProcessor {
+    @Override
+    protected BufferedReader loadFile(String fileName) throws IOException {
+      FileInputStream initStream = null;
+      BufferedReader bufferedReader = null;
+      initStream = new FileInputStream(fileName);
+      bufferedReader = new BufferedReader(new InputStreamReader(initStream));
+      return bufferedReader;
+    }
+
+    @Override
+    protected int processCmd(String cmd) {
+      int rc = 0;
+      String cmd_trimed = cmd.trim();
+      try {
+        executeStatementInternal(cmd_trimed, null, false);
+      } catch (HiveSQLException e) {
+        rc = -1;
+        LOG.warn("Failed to execute HQL command in global .hiverc file.", e);
+      }
+      return rc;
+    }
+  }
+
+  private void processGlobalInitFile() {
+    IHiveFileProcessor processor = new GlobalHivercFileProcessor();
+
+    try {
+      if (hiveConf.getVar(ConfVars.HIVE_GLOBAL_INIT_FILE_LOCATION) != null) {
+        String hiverc = 
hiveConf.getVar(ConfVars.HIVE_GLOBAL_INIT_FILE_LOCATION)
+            + File.separator + SessionManager.HIVERCFILE;
+        if (new File(hiverc).exists()) {
+          LOG.info("Running global init file: " + hiverc);
+          int rc = processor.processFile(hiverc);
+          if (rc != 0) {
+            LOG.warn("Failed on initializing global .hiverc file");
+          }
+        }
+      }
+    } catch (IOException e) {
+      LOG.warn("Failed on initializing global .hiverc file", e);
+    }
+  }
+
   private void configureSession(Map<String, String> sessionConfMap) {
     for (Map.Entry<String, String> entry : sessionConfMap.entrySet()) {
       String key = entry.getKey();

Modified: 
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java
 (original)
+++ 
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java
 Fri Jul 25 00:38:23 2014
@@ -44,9 +44,8 @@ public class HiveSessionImplwithUGI exte
   private HiveSession proxySession = null;
 
   public HiveSessionImplwithUGI(TProtocolVersion protocol, String username, 
String password,
-      HiveConf hiveConf, Map<String, String> sessionConf, String ipAddress,
-       String delegationToken) throws HiveSQLException {
-    super(protocol, username, password, hiveConf, sessionConf, ipAddress);
+      HiveConf hiveConf, String ipAddress, String delegationToken) throws 
HiveSQLException {
+    super(protocol, username, password, hiveConf, ipAddress);
     setSessionUGI(username);
     setDelegationToken(delegationToken);
   }


Reply via email to