You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/02/14 11:53:39 UTC

svn commit: r1568236 [24/25] - in /hive/branches/tez: ./ bin/ cli/src/java/org/apache/hadoop/hive/cli/ cli/src/test/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/java/org/apache/hadoop/hive/conf/ conf/ data/...

Modified: hive/branches/tez/ql/src/test/results/clientpositive/union_remove_24.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/union_remove_24.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/union_remove_24.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/union_remove_24.q.out Fri Feb 14 10:53:31 2014
@@ -50,9 +50,6 @@ SELECT * FROM
   SELECT CAST(key AS BIGINT) AS key, count(1) as values FROM inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION TOK_DOUBLE (TOK_TABLE_OR_COL key)) key) (TOK_SELEXPR (TOK_FUNCTION count 1) values)) (TOK_GROUPBY (TOK_TABLE_OR_COL key)))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION TOK_BIGINT (TOK_TABLE_OR_COL key)) key) (TOK_SELEXPR (TOK_FUNCTION count 1) values)) (TOK_GROUPBY (TOK_TABLE_OR_COL key))))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME outputTbl1))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1, Stage-2
@@ -61,56 +58,40 @@ STAGE DEPENDENCIES:
 STAGE PLANS:
   Stage: Stage-1
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery2:a-subquery2:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
+              expressions: key (type: string)
               outputColumnNames: key
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                keys:
-                      expr: key
-                      type: string
+                aggregations: count(1)
+                keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col1
-                        type: bigint
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
+          aggregations: count(VALUE._col0)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
+          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions:
-                  expr: UDFToDouble(UDFToLong(_col0))
-                  type: double
-                  expr: _col1
-                  type: bigint
+            expressions: UDFToDouble(UDFToLong(_col0)) (type: double), _col1 (type: bigint)
             outputColumnNames: _col0, _col1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
               compressed: false
-              GlobalTableId: 1
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -129,63 +110,46 @@ STAGE PLANS:
 
   Stage: Stage-2
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery1:a-subquery1:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
+              expressions: key (type: string)
               outputColumnNames: key
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                keys:
-                      expr: key
-                      type: string
+                aggregations: count(1)
+                keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col1
-                        type: bigint
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
+          aggregations: count(VALUE._col0)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
+          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions:
-                  expr: UDFToDouble(_col0)
-                  type: double
-                  expr: _col1
-                  type: bigint
+            expressions: UDFToDouble(_col0) (type: double), _col1 (type: bigint)
             outputColumnNames: _col0, _col1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
               compressed: false
-              GlobalTableId: 1
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: default.outputtbl1
 
-
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
 SELECT * FROM
 (

Modified: hive/branches/tez/ql/src/test/results/clientpositive/union_remove_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/union_remove_3.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/union_remove_3.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/union_remove_3.q.out Fri Feb 14 10:53:31 2014
@@ -58,9 +58,6 @@ FROM (
   SELECT key, 3 as values from inputTbl1
 ) a
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR 1 values)))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR 2 values))))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR 3 values))))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME outputTbl1))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -68,80 +65,65 @@ STAGE DEPENDENCIES:
 STAGE PLANS:
   Stage: Stage-1
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery1-subquery1:a-subquery1-subquery1:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: 1
-                    type: int
+              expressions: key (type: string), 3 (type: int)
               outputColumnNames: _col0, _col1
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Union
+                Statistics: Num rows: 0 Data size: 90 Basic stats: PARTIAL Column stats: NONE
                 Select Operator
-                  expressions:
-                        expr: _col0
-                        type: string
-                        expr: UDFToLong(_col1)
-                        type: bigint
+                  expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint)
                   outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 0 Data size: 90 Basic stats: PARTIAL Column stats: NONE
                   File Output Operator
                     compressed: false
-                    GlobalTableId: 1
+                    Statistics: Num rows: 0 Data size: 90 Basic stats: PARTIAL Column stats: NONE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         name: default.outputtbl1
-        null-subquery1-subquery2:a-subquery1-subquery2:inputtbl1 
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: 2
-                    type: int
+              expressions: key (type: string), 1 (type: int)
               outputColumnNames: _col0, _col1
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Union
+                Statistics: Num rows: 0 Data size: 90 Basic stats: PARTIAL Column stats: NONE
                 Select Operator
-                  expressions:
-                        expr: _col0
-                        type: string
-                        expr: UDFToLong(_col1)
-                        type: bigint
+                  expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint)
                   outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 0 Data size: 90 Basic stats: PARTIAL Column stats: NONE
                   File Output Operator
                     compressed: false
-                    GlobalTableId: 1
+                    Statistics: Num rows: 0 Data size: 90 Basic stats: PARTIAL Column stats: NONE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         name: default.outputtbl1
-        null-subquery2:a-subquery2:inputtbl1 
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: 3
-                    type: int
+              expressions: key (type: string), 2 (type: int)
               outputColumnNames: _col0, _col1
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Union
+                Statistics: Num rows: 0 Data size: 90 Basic stats: PARTIAL Column stats: NONE
                 Select Operator
-                  expressions:
-                        expr: _col0
-                        type: string
-                        expr: UDFToLong(_col1)
-                        type: bigint
+                  expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint)
                   outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 0 Data size: 90 Basic stats: PARTIAL Column stats: NONE
                   File Output Operator
                     compressed: false
-                    GlobalTableId: 1
+                    Statistics: Num rows: 0 Data size: 90 Basic stats: PARTIAL Column stats: NONE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/branches/tez/ql/src/test/results/clientpositive/union_remove_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/union_remove_4.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/union_remove_4.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/union_remove_4.q.out Fri Feb 14 10:53:31 2014
@@ -52,9 +52,6 @@ FROM (
   SELECT key, count(1) as values from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_FUNCTION count 1) values)) (TOK_GROUPBY (TOK_TABLE_OR_COL key)))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_FUNCTION count 1) values)) (TOK_GROUPBY (TOK_TABLE_OR_COL key))))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME outputTbl1))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1, Stage-7 , consists of Stage-3, Stage-2, Stage-4
@@ -68,56 +65,40 @@ STAGE DEPENDENCIES:
 STAGE PLANS:
   Stage: Stage-1
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery2:a-subquery2:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
+              expressions: key (type: string)
               outputColumnNames: key
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                keys:
-                      expr: key
-                      type: string
+                aggregations: count(1)
+                keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col1
-                        type: bigint
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
+          aggregations: count(VALUE._col0)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
+          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions:
-                  expr: _col0
-                  type: string
-                  expr: _col1
-                  type: bigint
+            expressions: _col0 (type: string), _col1 (type: bigint)
             outputColumnNames: _col0, _col1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
               compressed: false
-              GlobalTableId: 1
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -145,12 +126,10 @@ STAGE PLANS:
 
   Stage: Stage-2
     Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
+      Map Operator Tree:
           TableScan
             File Output Operator
               compressed: false
-              GlobalTableId: 0
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -159,12 +138,10 @@ STAGE PLANS:
 
   Stage: Stage-4
     Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
+      Map Operator Tree:
           TableScan
             File Output Operator
               compressed: false
-              GlobalTableId: 0
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -179,63 +156,46 @@ STAGE PLANS:
 
   Stage: Stage-7
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery1:a-subquery1:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
+              expressions: key (type: string)
               outputColumnNames: key
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                keys:
-                      expr: key
-                      type: string
+                aggregations: count(1)
+                keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col1
-                        type: bigint
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
+          aggregations: count(VALUE._col0)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
+          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions:
-                  expr: _col0
-                  type: string
-                  expr: _col1
-                  type: bigint
+            expressions: _col0 (type: string), _col1 (type: bigint)
             outputColumnNames: _col0, _col1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
               compressed: false
-              GlobalTableId: 1
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: default.outputtbl1
 
-
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (

Modified: hive/branches/tez/ql/src/test/results/clientpositive/union_remove_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/union_remove_5.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/union_remove_5.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/union_remove_5.q.out Fri Feb 14 10:53:31 2014
@@ -60,9 +60,6 @@ FROM (
   SELECT key, 2 as values from inputTbl1
 ) a
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_FUNCTION count 1) values)) (TOK_GROUPBY (TOK_TABLE_OR_COL key)))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR 1 values))))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR 2 values))))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME outputTbl1))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1, Stage-7, Stage-8 , consists of Stage-3, Stage-2, Stage-4
@@ -77,20 +74,17 @@ STAGE DEPENDENCIES:
 STAGE PLANS:
   Stage: Stage-1
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery2:a-subquery2:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: UDFToLong(2)
-                    type: bigint
+              expressions: key (type: string), UDFToLong(2) (type: bigint)
               outputColumnNames: _col0, _col1
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               File Output Operator
                 compressed: false
-                GlobalTableId: 1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -118,12 +112,10 @@ STAGE PLANS:
 
   Stage: Stage-2
     Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
+      Map Operator Tree:
           TableScan
             File Output Operator
               compressed: false
-              GlobalTableId: 0
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -132,12 +124,10 @@ STAGE PLANS:
 
   Stage: Stage-4
     Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
+      Map Operator Tree:
           TableScan
             File Output Operator
               compressed: false
-              GlobalTableId: 0
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -152,56 +142,40 @@ STAGE PLANS:
 
   Stage: Stage-7
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery1-subquery1:a-subquery1-subquery1:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
+              expressions: key (type: string)
               outputColumnNames: key
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                keys:
-                      expr: key
-                      type: string
+                aggregations: count(1)
+                keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col1
-                        type: bigint
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
+          aggregations: count(VALUE._col0)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
+          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions:
-                  expr: _col0
-                  type: string
-                  expr: _col1
-                  type: bigint
+            expressions: _col0 (type: string), _col1 (type: bigint)
             outputColumnNames: _col0, _col1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
               compressed: false
-              GlobalTableId: 1
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -210,27 +184,23 @@ STAGE PLANS:
 
   Stage: Stage-8
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery1-subquery2:a-subquery1-subquery2:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: UDFToLong(1)
-                    type: bigint
+              expressions: key (type: string), UDFToLong(1) (type: bigint)
               outputColumnNames: _col0, _col1
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               File Output Operator
                 compressed: false
-                GlobalTableId: 1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.outputtbl1
 
-
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (

Modified: hive/branches/tez/ql/src/test/results/clientpositive/union_remove_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/union_remove_7.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/union_remove_7.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/union_remove_7.q.out Fri Feb 14 10:53:31 2014
@@ -56,9 +56,6 @@ FROM (
   SELECT key, count(1) as values from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_FUNCTION count 1) values)) (TOK_GROUPBY (TOK_TABLE_OR_COL key)))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_FUNCTION count 1) values)) (TOK_GROUPBY (TOK_TABLE_OR_COL key))))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME outputTbl1))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1, Stage-2
@@ -67,56 +64,40 @@ STAGE DEPENDENCIES:
 STAGE PLANS:
   Stage: Stage-1
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery2:a-subquery2:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
+              expressions: key (type: string)
               outputColumnNames: key
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                keys:
-                      expr: key
-                      type: string
+                aggregations: count(1)
+                keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col1
-                        type: bigint
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
+          aggregations: count(VALUE._col0)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
+          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions:
-                  expr: _col0
-                  type: string
-                  expr: _col1
-                  type: bigint
+            expressions: _col0 (type: string), _col1 (type: bigint)
             outputColumnNames: _col0, _col1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
               compressed: false
-              GlobalTableId: 1
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               table:
                   input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -135,63 +116,46 @@ STAGE PLANS:
 
   Stage: Stage-2
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery1:a-subquery1:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
+              expressions: key (type: string)
               outputColumnNames: key
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                keys:
-                      expr: key
-                      type: string
+                aggregations: count(1)
+                keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col1
-                        type: bigint
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
+          aggregations: count(VALUE._col0)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
+          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions:
-                  expr: _col0
-                  type: string
-                  expr: _col1
-                  type: bigint
+            expressions: _col0 (type: string), _col1 (type: bigint)
             outputColumnNames: _col0, _col1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
               compressed: false
-              GlobalTableId: 1
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               table:
                   input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
                   name: default.outputtbl1
 
-
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (

Modified: hive/branches/tez/ql/src/test/results/clientpositive/union_remove_8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/union_remove_8.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/union_remove_8.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/union_remove_8.q.out Fri Feb 14 10:53:31 2014
@@ -62,9 +62,6 @@ FROM (
   SELECT key, 2 as values from inputTbl1
 ) a
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_FUNCTION count 1) values)) (TOK_GROUPBY (TOK_TABLE_OR_COL key)))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR 1 values))))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR 2 values))))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME outputTbl1))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1, Stage-2, Stage-3
@@ -74,20 +71,17 @@ STAGE DEPENDENCIES:
 STAGE PLANS:
   Stage: Stage-1
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery2:a-subquery2:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: UDFToLong(2)
-                    type: bigint
+              expressions: key (type: string), UDFToLong(2) (type: bigint)
               outputColumnNames: _col0, _col1
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               File Output Operator
                 compressed: false
-                GlobalTableId: 1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 table:
                     input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                     output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -106,56 +100,40 @@ STAGE PLANS:
 
   Stage: Stage-2
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery1-subquery1:a-subquery1-subquery1:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
+              expressions: key (type: string)
               outputColumnNames: key
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                keys:
-                      expr: key
-                      type: string
+                aggregations: count(1)
+                keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col1
-                        type: bigint
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
+          aggregations: count(VALUE._col0)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
+          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions:
-                  expr: _col0
-                  type: string
-                  expr: _col1
-                  type: bigint
+            expressions: _col0 (type: string), _col1 (type: bigint)
             outputColumnNames: _col0, _col1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
               compressed: false
-              GlobalTableId: 1
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               table:
                   input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -164,27 +142,23 @@ STAGE PLANS:
 
   Stage: Stage-3
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery1-subquery2:a-subquery1-subquery2:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: UDFToLong(1)
-                    type: bigint
+              expressions: key (type: string), UDFToLong(1) (type: bigint)
               outputColumnNames: _col0, _col1
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               File Output Operator
                 compressed: false
-                GlobalTableId: 1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 table:
                     input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                     output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                     serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
                     name: default.outputtbl1
 
-
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (

Modified: hive/branches/tez/ql/src/test/results/clientpositive/union_remove_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/union_remove_9.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/union_remove_9.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/union_remove_9.q.out Fri Feb 14 10:53:31 2014
@@ -64,9 +64,6 @@ select * FROM (
 ) a
 )b
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_FUNCTION count 1) values)) (TOK_GROUPBY (TOK_TABLE_OR_COL key)))) (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR 1 values)))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME inputTbl1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR 2 values))))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))) b)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME outputTbl1))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-6 depends on stages: Stage-1, Stage-7 , consists of Stage-3, Stage-2, Stage-4
@@ -80,54 +77,44 @@ STAGE DEPENDENCIES:
 STAGE PLANS:
   Stage: Stage-1
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery2:b-subquery2-subquery1:a-subquery1:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: 1
-                    type: int
+              expressions: key (type: string), 1 (type: int)
               outputColumnNames: _col0, _col1
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Union
+                Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL Column stats: NONE
                 Select Operator
-                  expressions:
-                        expr: _col0
-                        type: string
-                        expr: UDFToLong(_col1)
-                        type: bigint
+                  expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint)
                   outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL Column stats: NONE
                   File Output Operator
                     compressed: false
-                    GlobalTableId: 1
+                    Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL Column stats: NONE
                     table:
                         input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                         output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                         serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
                         name: default.outputtbl1
-        null-subquery2:b-subquery2-subquery2:a-subquery2:inputtbl1 
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: 2
-                    type: int
+              expressions: key (type: string), 2 (type: int)
               outputColumnNames: _col0, _col1
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Union
+                Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL Column stats: NONE
                 Select Operator
-                  expressions:
-                        expr: _col0
-                        type: string
-                        expr: UDFToLong(_col1)
-                        type: bigint
+                  expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint)
                   outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL Column stats: NONE
                   File Output Operator
                     compressed: false
-                    GlobalTableId: 1
+                    Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL Column stats: NONE
                     table:
                         input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                         output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -167,63 +154,46 @@ STAGE PLANS:
 
   Stage: Stage-7
     Map Reduce
-      Alias -> Map Operator Tree:
-        null-subquery1:b-subquery1:inputtbl1 
+      Map Operator Tree:
           TableScan
             alias: inputtbl1
+            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
             Select Operator
-              expressions:
-                    expr: key
-                    type: string
+              expressions: key (type: string)
               outputColumnNames: key
+              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                keys:
-                      expr: key
-                      type: string
+                aggregations: count(1)
+                keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col1
-                        type: bigint
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
+          aggregations: count(VALUE._col0)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
+          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions:
-                  expr: _col0
-                  type: string
-                  expr: _col1
-                  type: bigint
+            expressions: _col0 (type: string), _col1 (type: bigint)
             outputColumnNames: _col0, _col1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
               compressed: false
-              GlobalTableId: 1
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               table:
                   input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
                   name: default.outputtbl1
 
-
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT * FROM
 (

Modified: hive/branches/tez/ql/src/test/results/clientpositive/union_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/union_view.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/union_view.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/union_view.q.out Fri Feb 14 10:53:31 2014
@@ -40,7 +40,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_1_src_union_1_key_idx__
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '1')) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -64,7 +64,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_1
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '1')) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -97,7 +97,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_2_src_union_2_key_idx__
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '2')) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -121,7 +121,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_2
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '2')) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -154,7 +154,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '3')) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -178,7 +178,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_3
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '3')) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -216,7 +216,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_1_src_union_1_key_idx__
-            filterExpr:
+            filterExpr: (ds = '1') (type: boolean)
             Select Operator
               expressions: _bucketname (type: string), _offsets (type: array<bigint>)
               outputColumnNames: _col0, _col1
@@ -238,7 +238,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_1
-            filterExpr:
+            filterExpr: (ds = '1') (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: COMPLETE
             Select Operator
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: COMPLETE
@@ -285,7 +285,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_2_src_union_2_key_idx__
-            filterExpr:
+            filterExpr: (ds = '2') (type: boolean)
             Select Operator
               expressions: _bucketname (type: string), _offsets (type: array<bigint>)
               outputColumnNames: _col0, _col1
@@ -307,7 +307,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_2
-            filterExpr:
+            filterExpr: (ds = '2') (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: COMPLETE
             Select Operator
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: COMPLETE
@@ -354,7 +354,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr:
+            filterExpr: (ds = '3') (type: boolean)
             Select Operator
               expressions: _bucketname (type: string), _offsets (type: array<bigint>)
               outputColumnNames: _col0, _col1
@@ -376,7 +376,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_3
-            filterExpr:
+            filterExpr: (ds = '3') (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: COMPLETE
             Select Operator
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: COMPLETE
@@ -426,7 +426,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_1_src_union_1_key_idx__
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '1')) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -450,7 +450,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_1
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '1')) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -489,7 +489,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_2_src_union_2_key_idx__
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '2')) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -513,7 +513,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_2
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '2')) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -552,7 +552,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '3')) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -576,7 +576,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_3
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '3')) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -619,7 +619,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_2_src_union_2_key_idx__
-            filterExpr:
+            filterExpr: (key = 86) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -643,7 +643,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_2
-            filterExpr:
+            filterExpr: ((key = 86) and ds is not null) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -665,7 +665,7 @@ STAGE PLANS:
                       value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
           TableScan
             alias: src_union_1
-            filterExpr:
+            filterExpr: ((key = 86) and ds is not null) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -687,7 +687,7 @@ STAGE PLANS:
                       value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
           TableScan
             alias: src_union_3
-            filterExpr:
+            filterExpr: ((key = 86) and ds is not null) (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -723,7 +723,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_1_src_union_1_key_idx__
-            filterExpr:
+            filterExpr: (key = 86) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -747,7 +747,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr:
+            filterExpr: (key = 86) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -792,7 +792,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_1_src_union_1_key_idx__
-            filterExpr:
+            filterExpr: (ds = '1') (type: boolean)
             Select Operator
               expressions: _bucketname (type: string), _offsets (type: array<bigint>)
               outputColumnNames: _col0, _col1
@@ -814,7 +814,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_1
-            filterExpr:
+            filterExpr: (ds = '1') (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string), ds (type: string)
@@ -867,7 +867,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_2_src_union_2_key_idx__
-            filterExpr:
+            filterExpr: (ds = '2') (type: boolean)
             Select Operator
               expressions: _bucketname (type: string), _offsets (type: array<bigint>)
               outputColumnNames: _col0, _col1
@@ -889,7 +889,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_2
-            filterExpr:
+            filterExpr: (ds = '2') (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string), ds (type: string)
@@ -942,7 +942,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr:
+            filterExpr: (ds = '3') (type: boolean)
             Select Operator
               expressions: _bucketname (type: string), _offsets (type: array<bigint>)
               outputColumnNames: _col0, _col1
@@ -964,7 +964,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_3
-            filterExpr:
+            filterExpr: (ds = '3') (type: boolean)
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string), ds (type: string)
@@ -1020,7 +1020,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '4')) (type: boolean)
             Filter Operator
               predicate: (key = 86) (type: boolean)
               Select Operator
@@ -1044,7 +1044,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_3
-            filterExpr:
+            filterExpr: ((key = 86) and (ds = '4')) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
@@ -1084,7 +1084,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr:
+            filterExpr: (ds = '4') (type: boolean)
             Select Operator
               expressions: _bucketname (type: string), _offsets (type: array<bigint>)
               outputColumnNames: _col0, _col1
@@ -1106,7 +1106,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_union_3
-            filterExpr:
+            filterExpr: (ds = '4') (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string), ds (type: string)

Modified: hive/branches/tez/ql/src/test/results/clientpositive/vectorization_pushdown.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/vectorization_pushdown.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/vectorization_pushdown.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/vectorization_pushdown.q.out Fri Feb 14 10:53:31 2014
@@ -13,7 +13,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: alltypesorc
-            filterExpr:
+            filterExpr: (cbigint < cdouble) (type: boolean)
             Statistics: Num rows: 23577 Data size: 377237 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (cbigint < cdouble) (type: boolean)

Modified: hive/branches/tez/ql/src/test/results/clientpositive/vectorization_short_regress.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/vectorization_short_regress.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/vectorization_short_regress.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/vectorization_short_regress.q.out Fri Feb 14 10:53:31 2014
@@ -907,6 +907,7 @@ STAGE PLANS:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+      Execution mode: vectorized
 
   Stage: Stage-0
     Fetch Operator
@@ -3257,6 +3258,7 @@ STAGE PLANS:
                   sort order: +++
                   Statistics: Num rows: 436 Data size: 118669 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col0 (type: timestamp), _col1 (type: string), _col2 (type: double), _col3 (type: float), _col4 (type: bigint), _col5 (type: smallint), _col6 (type: decimal(25,6)), _col7 (type: int), _col8 (type: double), _col9 (type: double), _col10 (type: double), _col11 (type: double), _col12 (type: float), _col13 (type: int), _col14 (type: double), _col15 (type: double)
+      Execution mode: vectorized
       Reduce Operator Tree:
         Extract
           Statistics: Num rows: 436 Data size: 118669 Basic stats: COMPLETE Column stats: NONE
@@ -6328,9 +6330,16 @@ POSTHOOK: Input: default@alltypesorc
 1969-12-31 15:59:58.962	NULL	NULL	NULL	NULL	-7196.0	NULL	NULL	1	-1	NULL	32	NULL	NULL	0.0	NULL	NULL	NULL	0.0	-0.0014139799888827128	NULL	0.0	NULL	NULL	32.0	NULL	0.001413979988882123	-32	-7196.0	0.0	NULL	NULL	0.82125	0.0	NULL	NULL	1	1	NULL
 1969-12-31 15:59:58.989	NULL	NULL	NULL	NULL	-200.0	NULL	NULL	1	-1	NULL	-10	NULL	NULL	0.0	NULL	NULL	NULL	0.0	-0.050875000000000004	NULL	0.0	NULL	NULL	-10.0	NULL	0.0	10	-200.0	0.0	NULL	NULL	-2.628	0.0	NULL	NULL	1	1	NULL
 1969-12-31 16:00:02.351	NULL	3.430705936548119E8	3.4907432904377117E9	-3.430705936548119E8	NULL	-3.430705936548119E8	-3.430706199348119E8	8	-8	1.17697441246560272E17	11	-9.4157952997248218E17	-3.4907432904377117E9	NULL	NULL	3.430705936548119E8	-2.3318815858783212E-8	0.0	NULL	4.4783048325E8	0.0	NULL	3.4907432904377117E9	11.0	NULL	NULL	-11	NULL	NULL	-1.17697441246560272E17	-8.654811918735504	2.389090909090909	0.0	3582643866	NULL	8	8	NULL
+1969-12-31 16:00:02.351	HtI02nss6t8S0fqH4vcLkCD	0.0	0.0	-0.0	NULL	-0.0	-26.28	1	-1	0.0	11	-0.0	-0.0	NULL	NULL	0.0	NULL	0.0	NULL	-7980033.0	0.0	NULL	0.0	11.0	NULL	NULL	-11	NULL	NULL	-0.0	-0.0	2.389090909090909	0.0	-7980033	NULL	1	1	NULL
+1969-12-31 16:00:02.351	MgMjEMssUEN1	0.0	0.0	-0.0	NULL	-0.0	-26.28	1	-1	0.0	11	-0.0	-0.0	NULL	NULL	0.0	NULL	0.0	NULL	-7.27471145E8	0.0	NULL	0.0	11.0	NULL	NULL	-11	NULL	NULL	-0.0	-0.0	2.389090909090909	0.0	-727471145	NULL	1	1	NULL
+1969-12-31 16:00:02.351	rss1vw14N	0.0	0.0	-0.0	NULL	-0.0	-26.28	1	-1	0.0	11	-0.0	-0.0	NULL	NULL	0.0	NULL	0.0	NULL	-2.6632375E8	0.0	NULL	0.0	11.0	NULL	NULL	-11	NULL	NULL	-0.0	-0.0	2.389090909090909	0.0	-266323750	NULL	1	1	NULL
+1969-12-31 16:00:02.351	xM1Gglkeqdcp2kE2v6ss5Cb	0.0	0.0	-0.0	NULL	-0.0	-26.28	1	-1	0.0	11	-0.0	-0.0	NULL	NULL	0.0	NULL	0.0	NULL	5.0130433E8	0.0	NULL	0.0	11.0	NULL	NULL	-11	NULL	NULL	-0.0	-0.0	2.389090909090909	0.0	501304330	NULL	1	1	NULL
 1969-12-31 16:00:08.451	NULL	2.650627591471319E8	2.6970135743220673E9	-2.650627591471319E8	NULL	-2.650627591471319E8	-2.650627854271319E8	9	-9	7.025827325253976E16	-51	-6.3232445927285786E17	-2.6970135743220673E9	NULL	NULL	2.650627591471319E8	-3.395422287521066E-8	0.0	NULL	6.486577994444444E8	0.0	NULL	2.6970135743220673E9	-51.0	NULL	NULL	51	NULL	NULL	-7.025827325253976E16	-0.14713189005851746	-0.5152941176470588	0.0	5837920195	NULL	9	9	NULL
+1969-12-31 16:00:08.451	Yssb82rdfylDv4K	NULL	NULL	NULL	NULL	NULL	NULL	1	-1	NULL	-51	NULL	NULL	NULL	NULL	NULL	NULL	0.0	NULL	NULL	0.0	NULL	NULL	-51.0	NULL	NULL	51	NULL	NULL	NULL	NULL	-0.5152941176470588	0.0	NULL	NULL	1	1	NULL
 1969-12-31 16:00:08.451	ss	8.6150685E7	8.765832198750001E8	-8.6150685E7	NULL	-8.6150685E7	-8.615071128E7	2	-2	7.421942790009227E15	-51	-1.4843885580018454E16	-8.765832198750001E8	NULL	NULL	8.6150685E7	-2.3215137523282605E-8	0.0	NULL	-5.48990416E8	0.0	NULL	8.765832198750001E8	-51.0	NULL	NULL	51	NULL	NULL	-7.421942790009227E15	-6.0	-0.5152941176470588	0.0	-1097980832	NULL	2	2	NULL
+1969-12-31 16:00:08.451	ss2PoJAipj6B1tn75O	0.0	0.0	-0.0	NULL	-0.0	-26.28	1	-1	0.0	-51	-0.0	-0.0	NULL	NULL	0.0	NULL	0.0	NULL	-5.85770596E8	0.0	NULL	0.0	-51.0	NULL	NULL	51	NULL	NULL	-0.0	-0.0	-0.5152941176470588	0.0	-585770596	NULL	1	1	NULL
 1969-12-31 16:00:15.892	NULL	3.552743011247774E8	3.61491601394461E9	-3.552743011247774E8	NULL	-3.552743011247774E8	-3.5527432740477735E8	10	-10	1.26219838376307616E17	8	-1.2621983837630761E18	-3.61491601394461E9	NULL	NULL	3.552743011247774E8	-2.8147265277394375E-8	0.0	NULL	6.585487822E8	0.0	NULL	3.61491601394461E9	8.0	NULL	NULL	-8	NULL	NULL	-1.26219838376307616E17	-5.124777376651764	3.285	0.0	6585487822	NULL	10	10	NULL
+1969-12-31 16:00:15.892	M4HtnssfQiEAD0jYL6	0.0	0.0	-0.0	NULL	-0.0	-26.28	1	-1	0.0	8	-0.0	-0.0	NULL	NULL	0.0	NULL	0.0	NULL	6.87282226E8	0.0	NULL	0.0	8.0	NULL	NULL	-8	NULL	NULL	-0.0	-0.0	3.285	0.0	687282226	NULL	1	1	NULL
 WARNING: Comparing a bigint and a double may result in a loss of precision.
 PREHOOK: query: -- TargetTypeClasses: Double, Long, String, Timestamp, Bool
 -- Functions: Max, Sum, Var, Avg, Min, VarP, StDev, StDevP
@@ -6581,5 +6590,5 @@ ORDER BY cboolean1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-false	11.0	-11.0	-2.389090909090909	-6414854016	-6.414854026175E9	1.72852155777257088E17	0.0	-0.8249999999999993	-2454.8879999999995	1.72852149362403072E17	-1887561756	7.6613856013296576E17	0.8249999999999993	1.0383630865178398E-16	9.920923341934203E-17	0.8249999999999993	483940596	43.840620433565945	2.621823279084E9	-2.137882683084E9	85.79562278396777	2.137882683084E9	9.67881192E7	-9.67881192E7	4.6839700091367048E16
-true	79.553	-79.553	-0.33034580136836733	-410715229238	-4.10715229248175E11	4.9646543309484224E16	38.162330627441406	-69.3780014038086	4856.6352637899645	4.9646132594254976E16	-2130544867	2.3549376245421737E18	69.3780014038086	3.378136183775398E-17	1.7557333480922412E-17	69.3780014038086	2253537466262	34.86827631850126	2.959326820263E9	2.250578139441737E12	9461.197516216069	-2.250578139441737E12	4.8777867235108227E8	-4.8777867235108227E8	1.0992275133867002E21
+false	11.0	-11.0	-2.389090909090909	-17881597706	-1.7881597716175E10	3.8953387713327066E17	6.0	-0.8249999999999993	-2454.8879999999995	3.8953385925167296E17	-2145884705	1.66288903197104486E18	0.8249999999999993	4.7840233756130287E-17	4.098424268084119E-17	0.8249999999999993	-1051696618	28.692556844886422	2.980633855245E9	-4.032330473245E9	85.79562278396777	4.032330473245E9	-3983699.3106060605	3983699.3106060605	4.1896430920933255E15
+true	79.553	-79.553	-0.33034580136836733	-401322621137	-4.01322621147175E11	7.9255373737244976E16	34.727455139160156	-69.3780014038086	4856.6352637899645	7.9254972414623824E16	-2130544867	2.30133924842409523E18	69.3780014038086	3.456813247089758E-17	2.0387240975807185E-18	69.3780014038086	2182477964777	34.654968050508266	2.959326820263E9	2.179518637956737E12	9461.197516216069	-2.179518637956737E12	4.592756659884259E8	-4.592756659884259E8	1.002359020778021E21

Modified: hive/branches/tez/ql/src/test/results/compiler/errors/invalid_select.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/errors/invalid_select.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/errors/invalid_select.q.out (original)
+++ hive/branches/tez/ql/src/test/results/compiler/errors/invalid_select.q.out Fri Feb 14 10:53:31 2014
@@ -1,2 +1 @@
-Parse Error: line 3:6 missing FROM at '(' near '(' in subquery source
-line 3:7 cannot recognize input near 'b' ')' 'FROM' in subquery source
\ No newline at end of file
+Parse Error: line 3:6 missing EOF at '(' near 'trim'
\ No newline at end of file

Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java Fri Feb 14 10:53:31 2014
@@ -31,9 +31,9 @@ import org.apache.hadoop.util.StringUtil
 public final class ColumnProjectionUtils {
 
   public static final String READ_COLUMN_IDS_CONF_STR = "hive.io.file.readcolumn.ids";
+  public static final String READ_ALL_COLUMNS = "hive.io.file.read.all.columns";
   public static final String READ_COLUMN_NAMES_CONF_STR = "hive.io.file.readcolumn.names";
   private static final String READ_COLUMN_IDS_CONF_STR_DEFAULT = "";
-  private static final String READ_ALL_COLUMNS = "hive.io.file.read.all.columns";
   private static final boolean READ_ALL_COLUMNS_DEFAULT = true;
 
   /**

Modified: hive/branches/tez/service/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/service/pom.xml?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/service/pom.xml (original)
+++ hive/branches/tez/service/pom.xml Fri Feb 14 10:53:31 2014
@@ -67,14 +67,9 @@
       <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${jetty.version}</version>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all</artifactId>
+        <version>${jetty.hive-service.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>

Modified: hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java (original)
+++ hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java Fri Feb 14 10:53:31 2014
@@ -51,10 +51,9 @@ public abstract class ExecuteStatementOp
       HiveSession parentSession, String statement, Map<String, String> confOverlay, boolean runAsync)
       throws HiveSQLException {
     String[] tokens = statement.trim().split("\\s+");
-    String command = tokens[0].toLowerCase();
     CommandProcessor processor = null;
     try {
-      processor = CommandProcessorFactory.getForHiveCommand(tokens[0], parentSession.getHiveConf());
+      processor = CommandProcessorFactory.getForHiveCommand(tokens, parentSession.getHiveConf());
     } catch (SQLException e) {
       throw new HiveSQLException(e.getMessage(), e.getSQLState(), e);
     }

Modified: hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java (original)
+++ hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java Fri Feb 14 10:53:31 2014
@@ -59,7 +59,7 @@ public abstract class ThriftCLIService e
   protected int portNum;
   protected InetSocketAddress serverAddress;
   protected TServer server;
-  protected org.mortbay.jetty.Server httpServer;
+  protected org.eclipse.jetty.server.Server httpServer;
 
   private boolean isStarted = false;
   protected boolean isEmbedded = false;

Modified: hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java (original)
+++ hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java Fri Feb 14 10:53:31 2014
@@ -26,10 +26,12 @@ import org.apache.hive.service.cli.CLISe
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.server.TServlet;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.thread.QueuedThreadPool;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
 
 public class ThriftHttpCLIService extends ThriftCLIService {
@@ -75,15 +77,31 @@ public class ThriftHttpCLIService extend
         }
       }
 
-      httpServer = new org.mortbay.jetty.Server();
-
+      httpServer = new org.eclipse.jetty.server.Server();
       QueuedThreadPool threadPool = new QueuedThreadPool();
       threadPool.setMinThreads(minWorkerThreads);
       threadPool.setMaxThreads(maxWorkerThreads);
       httpServer.setThreadPool(threadPool);
-      SelectChannelConnector connector = new SelectChannelConnector();
-      connector.setPort(portNum);
+      SelectChannelConnector connector;
+      Boolean useSsl = hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_USE_SSL);
+      String schemeName = useSsl ? "https" : "http";
+
+      if (useSsl) {
+        String keyStorePath = hiveConf.getVar(ConfVars.HIVE_SERVER2_SSL_KEYSTORE_PATH).trim();
+        String keyStorePassword = hiveConf.getVar(ConfVars.HIVE_SERVER2_SSL_KEYSTORE_PASSWORD);
+        if (keyStorePath.isEmpty()) {
+          throw new IllegalArgumentException(ConfVars.HIVE_SERVER2_SSL_KEYSTORE_PATH.varname +
+              " Not configured for SSL connection");
+        }
+        SslContextFactory sslContextFactory = new SslContextFactory();
+        sslContextFactory.setKeyStorePath(keyStorePath);
+        sslContextFactory.setKeyStorePassword(keyStorePassword);
+        connector = new SslSelectChannelConnector(sslContextFactory);
+      } else {
+        connector = new SelectChannelConnector();
+      }
 
+      connector.setPort(portNum);
       // Linux:yes, Windows:no
       connector.setReuseAddress(!Shell.WINDOWS);
       httpServer.addConnector(connector);
@@ -93,12 +111,15 @@ public class ThriftHttpCLIService extend
 
       TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();
       TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory);
-      final Context context = new Context(httpServer, "/", Context.SESSIONS);
+
+      final ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+      context.setContextPath("/");
+      httpServer.setHandler(context);
       context.addServlet(new ServletHolder(thriftHttpServlet), httpPath);
 
       // TODO: check defaults: maxTimeout, keepalive, maxBodySize, bodyRecieveDuration, etc.
       httpServer.start();
-      String msg = "Starting CLIService in Http mode on port " + portNum +
+      String msg = "Started ThriftHttpCLIService in " + schemeName + " mode on port " + portNum +
           " path=" + httpPath +
           " with " + minWorkerThreads + ".." + maxWorkerThreads + " worker threads";
       LOG.info(msg);

Modified: hive/branches/tez/service/src/java/org/apache/hive/service/server/HiveServer2.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/service/src/java/org/apache/hive/service/server/HiveServer2.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/service/src/java/org/apache/hive/service/server/HiveServer2.java (original)
+++ hive/branches/tez/service/src/java/org/apache/hive/service/server/HiveServer2.java Fri Feb 14 10:53:31 2014
@@ -54,8 +54,7 @@ public class HiveServer2 extends Composi
     if(transportMode == null) {
       transportMode = hiveConf.getVar(HiveConf.ConfVars.HIVE_SERVER2_TRANSPORT_MODE);
     }
-    if(transportMode != null && (transportMode.equalsIgnoreCase("http") ||
-        transportMode.equalsIgnoreCase("https"))) {
+    if(transportMode != null && (transportMode.equalsIgnoreCase("http"))) {
       thriftCLIService = new ThriftHttpCLIService(cliService);
     }
     else {

Modified: hive/branches/tez/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java (original)
+++ hive/branches/tez/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java Fri Feb 14 10:53:31 2014
@@ -788,4 +788,9 @@ public class Hadoop20Shims implements Ha
     /* not supported */
     return null;
   }
+
+  @Override
+  public Configuration getConfiguration(org.apache.hadoop.mapreduce.JobContext context) {
+    return context.getConfiguration();
+  }
 }

Modified: hive/branches/tez/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java (original)
+++ hive/branches/tez/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java Fri Feb 14 10:53:31 2014
@@ -425,4 +425,9 @@ public class Hadoop20SShims extends Hado
     /* not supported */
     return null;
   }
+  
+  @Override
+  public Configuration getConfiguration(org.apache.hadoop.mapreduce.JobContext context) {
+    return context.getConfiguration();
+  }
 }

Modified: hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Fri Feb 14 10:53:31 2014
@@ -595,4 +595,9 @@ public class Hadoop23Shims extends Hadoo
     /* not supported */
     return null;
   }
+  
+  @Override
+  public Configuration getConfiguration(org.apache.hadoop.mapreduce.JobContext context) {
+    return context.getConfiguration();
+  }
 }