You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2011/07/13 18:49:42 UTC

svn commit: r1146129 [7/41] - in /hive/trunk: common/src/java/org/apache/hadoop/hive/conf/ contrib/src/test/results/clientpositive/ hbase-handler/src/test/results/ ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/java/org/apache/hadoop/hive/ql/ppd/ q...

Modified: hive/trunk/ql/src/test/results/clientpositive/having.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/having.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/having.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/having.q.out Wed Jul 13 16:49:22 2011
@@ -153,23 +153,19 @@ STAGE PLANS:
                 type: string
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Filter Operator
-            predicate:
-                expr: (_col0 <> 302)
-                type: boolean
-            Select Operator
-              expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: string
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: string
+                  expr: _col1
+                  type: string
+            outputColumnNames: _col0, _col1
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator
@@ -798,38 +794,34 @@ STAGE PLANS:
               predicate:
                   expr: (key > 300)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > 300)
-                    type: boolean
-                Select Operator
-                  expressions:
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: key, value
+                Group By Operator
+                  aggregations:
+                        expr: max(value)
+                  bucketGroup: false
+                  keys:
                         expr: key
                         type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: key, value
-                  Group By Operator
-                    aggregations:
-                          expr: max(value)
-                    bucketGroup: false
-                    keys:
-                          expr: key
+                  mode: hash
+                  outputColumnNames: _col0, _col1
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col1
                           type: string
-                    mode: hash
-                    outputColumnNames: _col0, _col1
-                    Reduce Output Operator
-                      key expressions:
-                            expr: _col0
-                            type: string
-                      sort order: +
-                      Map-reduce partition columns:
-                            expr: _col0
-                            type: string
-                      tag: -1
-                      value expressions:
-                            expr: _col1
-                            type: string
       Reduce Operator Tree:
         Group By Operator
           aggregations:

Modified: hive/trunk/ql/src/test/results/clientpositive/implicit_cast1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/implicit_cast1.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/implicit_cast1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/implicit_cast1.q.out Wed Jul 13 16:49:22 2011
@@ -31,23 +31,19 @@ STAGE PLANS:
               predicate:
                   expr: (a <> 0)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (a <> 0)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: a
-                        type: bigint
-                        expr: b
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: a
+                      type: bigint
+                      expr: b
+                      type: string
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out Wed Jul 13 16:49:22 2011
@@ -84,28 +84,24 @@ STAGE PLANS:
               predicate:
                   expr: ((key > 80) and (key < 100))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key > 80) and (key < 100))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -185,23 +181,19 @@ STAGE PLANS:
               predicate:
                   expr: ((key > 80) and (key < 100))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key > 80) and (key < 100))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: _bucketname
-                        type: string
-                        expr: _offsets
-                        type: array<bigint>
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offsets
+                      type: array<bigint>
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-6
     Conditional Operator
@@ -231,28 +223,24 @@ STAGE PLANS:
               predicate:
                   expr: ((key > 80) and (key < 100))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key > 80) and (key < 100))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
       Reduce Operator Tree:
         Extract
           File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out Wed Jul 13 16:49:22 2011
@@ -48,23 +48,19 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: _bucketname
-                        type: string
-                        expr: _offsets
-                        type: array<bigint>
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offsets
+                      type: array<bigint>
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-6
     Conditional Operator
@@ -94,28 +90,24 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
                         type: string
-                        expr: value
+                        expr: _col1
                         type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -188,23 +180,19 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: _bucketname
-                        type: string
-                        expr: _offsets
-                        type: array<bigint>
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offsets
+                      type: array<bigint>
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-6
     Conditional Operator
@@ -234,28 +222,24 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
                         type: string
-                        expr: value
+                        expr: _col1
                         type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out Wed Jul 13 16:49:22 2011
@@ -71,23 +71,19 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: _bucketname
-                        type: string
-                        expr: _offsets
-                        type: array<bigint>
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offsets
+                      type: array<bigint>
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-6
     Conditional Operator
@@ -117,28 +113,24 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
                         type: string
-                        expr: value
+                        expr: _col1
                         type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out Wed Jul 13 16:49:22 2011
@@ -60,23 +60,19 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key = 86) and (ds = '2008-04-09'))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: _bucketname
-                        type: string
-                        expr: _offsets
-                        type: array<bigint>
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offsets
+                      type: array<bigint>
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-6
     Conditional Operator
@@ -106,28 +102,24 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key = 86) and (ds = '2008-04-09'))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
                         type: string
-                        expr: value
+                        expr: _col1
                         type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out Wed Jul 13 16:49:22 2011
@@ -47,28 +47,24 @@ STAGE PLANS:
               predicate:
                   expr: ((key > 80) and (key < 100))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key > 80) and (key < 100))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -143,28 +139,24 @@ STAGE PLANS:
               predicate:
                   expr: ((key > 80) and (key < 100))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key > 80) and (key < 100))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -239,28 +231,24 @@ STAGE PLANS:
               predicate:
                   expr: ((key < 10) or (key > 480))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key < 10) or (key > 480))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -379,28 +367,24 @@ STAGE PLANS:
               predicate:
                   expr: ((key > 80) and (key < 100))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key > 80) and (key < 100))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -521,36 +505,32 @@ STAGE PLANS:
               predicate:
                   expr: (key < 10)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (((ds = '2008-04-09') and (hr = 12)) and (key < 10))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                        expr: ds
-                        type: string
-                        expr: hr
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
-                          expr: _col2
-                          type: string
-                          expr: _col3
-                          type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
+                        expr: _col2
+                        type: string
+                        expr: _col3
+                        type: string
       Reduce Operator Tree:
         Extract
           File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap3.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_bitmap3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap3.q.out Wed Jul 13 16:49:22 2011
@@ -1147,39 +1147,35 @@ STAGE PLANS:
               predicate:
                   expr: (key = 0)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 0)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: _bucketname
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offset
+                      type: bigint
+                      expr: _bitmaps
+                      type: array<bigint>
+                outputColumnNames: _col0, _col1, _col2
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: bigint
+                  sort order: ++
+                  Map-reduce partition columns:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: bigint
+                  tag: 0
+                  value expressions:
+                        expr: _col0
                         type: string
-                        expr: _offset
+                        expr: _col1
                         type: bigint
-                        expr: _bitmaps
+                        expr: _col2
                         type: array<bigint>
-                  outputColumnNames: _col0, _col1, _col2
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                    sort order: ++
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                    tag: 0
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                          expr: _col2
-                          type: array<bigint>
         b:default__src_src2_index__ 
           TableScan
             alias: default__src_src2_index__
@@ -1187,35 +1183,31 @@ STAGE PLANS:
               predicate:
                   expr: (value = 'val_0')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (value = 'val_0')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: _bucketname
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offset
+                      type: bigint
+                      expr: _bitmaps
+                      type: array<bigint>
+                outputColumnNames: _col0, _col1, _col2
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: bigint
+                  sort order: ++
+                  Map-reduce partition columns:
+                        expr: _col0
                         type: string
-                        expr: _offset
+                        expr: _col1
                         type: bigint
-                        expr: _bitmaps
+                  tag: 1
+                  value expressions:
+                        expr: _col2
                         type: array<bigint>
-                  outputColumnNames: _col0, _col1, _col2
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                    sort order: ++
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                    tag: 1
-                    value expressions:
-                          expr: _col2
-                          type: array<bigint>
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto.q.out Wed Jul 13 16:49:22 2011
@@ -1166,39 +1166,35 @@ STAGE PLANS:
               predicate:
                   expr: (key = 0)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 0)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: _bucketname
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offset
+                      type: bigint
+                      expr: _bitmaps
+                      type: array<bigint>
+                outputColumnNames: _col0, _col1, _col2
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: bigint
+                  sort order: ++
+                  Map-reduce partition columns:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: bigint
+                  tag: 0
+                  value expressions:
+                        expr: _col0
                         type: string
-                        expr: _offset
+                        expr: _col1
                         type: bigint
-                        expr: _bitmaps
+                        expr: _col2
                         type: array<bigint>
-                  outputColumnNames: _col0, _col1, _col2
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                    sort order: ++
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                    tag: 0
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                          expr: _col2
-                          type: array<bigint>
         b:default__src_src2_index__ 
           TableScan
             alias: default__src_src2_index__
@@ -1206,35 +1202,31 @@ STAGE PLANS:
               predicate:
                   expr: (value = 'val_0')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (value = 'val_0')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: _bucketname
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offset
+                      type: bigint
+                      expr: _bitmaps
+                      type: array<bigint>
+                outputColumnNames: _col0, _col1, _col2
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: bigint
+                  sort order: ++
+                  Map-reduce partition columns:
+                        expr: _col0
                         type: string
-                        expr: _offset
+                        expr: _col1
                         type: bigint
-                        expr: _bitmaps
+                  tag: 1
+                  value expressions:
+                        expr: _col2
                         type: array<bigint>
-                  outputColumnNames: _col0, _col1, _col2
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                    sort order: ++
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: bigint
-                    tag: 1
-                    value expressions:
-                          expr: _col2
-                          type: array<bigint>
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out Wed Jul 13 16:49:22 2011
@@ -59,58 +59,50 @@ STAGE PLANS:
               predicate:
                   expr: ((key = 86) and (not EWAH_BITMAP_EMPTY(_bitmaps)))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key = 86) and (ds = '2008-04-09'))
-                    type: boolean
+              Select Operator
+                expressions:
+                      expr: _bucketname
+                      type: string
+                      expr: _offset
+                      type: bigint
+                      expr: _bitmaps
+                      type: array<bigint>
+                outputColumnNames: _col1, _col2, _col3
                 Select Operator
                   expressions:
-                        expr: _bucketname
+                        expr: _col1
                         type: string
-                        expr: _offset
+                        expr: _col2
                         type: bigint
-                        expr: _bitmaps
-                        type: array<bigint>
-                  outputColumnNames: _col1, _col2, _col3
-                  Filter Operator
-                    predicate:
-                        expr: (not EWAH_BITMAP_EMPTY(_col3))
-                        type: boolean
-                    Select Operator
-                      expressions:
-                            expr: _col1
+                  outputColumnNames: _col0, _col1
+                  Select Operator
+                    expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: bigint
+                    outputColumnNames: _col0, _col1
+                    Group By Operator
+                      aggregations:
+                            expr: collect_set(_col1)
+                      bucketGroup: false
+                      keys:
+                            expr: _col0
                             type: string
-                            expr: _col2
-                            type: bigint
+                      mode: hash
                       outputColumnNames: _col0, _col1
-                      Select Operator
-                        expressions:
+                      Reduce Output Operator
+                        key expressions:
                               expr: _col0
                               type: string
+                        sort order: +
+                        Map-reduce partition columns:
+                              expr: _col0
+                              type: string
+                        tag: -1
+                        value expressions:
                               expr: _col1
-                              type: bigint
-                        outputColumnNames: _col0, _col1
-                        Group By Operator
-                          aggregations:
-                                expr: collect_set(_col1)
-                          bucketGroup: false
-                          keys:
-                                expr: _col0
-                                type: string
-                          mode: hash
-                          outputColumnNames: _col0, _col1
-                          Reduce Output Operator
-                            key expressions:
-                                  expr: _col0
-                                  type: string
-                            sort order: +
-                            Map-reduce partition columns:
-                                  expr: _col0
-                                  type: string
-                            tag: -1
-                            value expressions:
-                                  expr: _col1
-                                  type: array<bigint>
+                              type: array<bigint>
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -154,28 +146,24 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key = 86) and (ds = '2008-04-09'))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
                         type: string
-                        expr: value
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
                         type: string
-                  outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/input11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input11.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input11.q.out Wed Jul 13 16:49:22 2011
@@ -33,32 +33,28 @@ STAGE PLANS:
               predicate:
                   expr: (key < 100)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key < 100)
-                    type: boolean
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
                 Select Operator
                   expressions:
-                        expr: key
-                        type: string
-                        expr: value
+                        expr: UDFToInteger(_col0)
+                        type: int
+                        expr: _col1
                         type: string
                   outputColumnNames: _col0, _col1
-                  Select Operator
-                    expressions:
-                          expr: UDFToInteger(_col0)
-                          type: int
-                          expr: _col1
-                          type: string
-                    outputColumnNames: _col0, _col1
-                    File Output Operator
-                      compressed: false
-                      GlobalTableId: 1
-                      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.dest1
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 1
+                    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.dest1
 
   Stage: Stage-5
     Conditional Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out Wed Jul 13 16:49:22 2011
@@ -30,26 +30,22 @@ STAGE PLANS:
               predicate:
                   expr: (key < 100)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key < 100)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Limit
-                    Reduce Output Operator
-                      sort order: 
-                      tag: -1
-                      value expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col1
-                            type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Limit
+                  Reduce Output Operator
+                    sort order: 
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
           Limit

Modified: hive/trunk/ql/src/test/results/clientpositive/input14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input14.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input14.q.out Wed Jul 13 16:49:22 2011
@@ -48,48 +48,48 @@ STAGE PLANS:
                 output info:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < 100)
+                      type: boolean
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
-          Filter Operator
-            predicate:
-                expr: (_col0 < 100)
-                type: boolean
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: string
+                  expr: _col1
+                  type: string
+            outputColumnNames: _col0, _col1
             Select Operator
               expressions:
-                    expr: _col0
-                    type: string
+                    expr: UDFToInteger(_col0)
+                    type: int
                     expr: _col1
                     type: string
               outputColumnNames: _col0, _col1
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                      expr: _col1
-                      type: string
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  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.dest1
+              File Output Operator
+                compressed: false
+                GlobalTableId: 1
+                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.dest1
 
   Stage: Stage-0
     Move Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/input18.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input18.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input18.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input18.q.out Wed Jul 13 16:49:22 2011
@@ -52,48 +52,48 @@ STAGE PLANS:
                 output info:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < 100)
+                      type: boolean
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
-          Filter Operator
-            predicate:
-                expr: (_col0 < 100)
-                type: boolean
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: string
+                  expr: regexp_replace(_col1, '	', '+')
+                  type: string
+            outputColumnNames: _col0, _col1
             Select Operator
               expressions:
-                    expr: _col0
-                    type: string
-                    expr: regexp_replace(_col1, '	', '+')
+                    expr: UDFToInteger(_col0)
+                    type: int
+                    expr: _col1
                     type: string
               outputColumnNames: _col0, _col1
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                      expr: _col1
-                      type: string
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  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.dest1
+              File Output Operator
+                compressed: false
+                GlobalTableId: 1
+                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.dest1
 
   Stage: Stage-0
     Move Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/input23.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input23.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input23.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input23.q.out Wed Jul 13 16:49:22 2011
@@ -106,47 +106,42 @@ STAGE PLANS:
             1 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3}
           handleSkewJoin: false
           outputColumnNames: _col0, _col1, _col2, _col3, _col6, _col7, _col8, _col9
-          Filter Operator
-            isSamplingPred: false
-            predicate:
-                expr: ((((_col2 = '2008-04-08') and (_col3 = '11')) and (_col8 = '2008-04-08')) and (_col9 = '14'))
-                type: boolean
-            Select Operator
-              expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: string
-                    expr: _col2
-                    type: string
-                    expr: _col3
-                    type: string
-                    expr: _col6
-                    type: string
-                    expr: _col7
-                    type: string
-                    expr: _col8
-                    type: string
-                    expr: _col9
-                    type: string
-              outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
-              Limit
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  directory: file:/tmp/sdong/hive_2011-02-10_15-54-28_256_717236059530733661/-ext-10001
-                  NumFilesPerFileSink: 1
-                  Stats Publishing Key Prefix: file:/tmp/sdong/hive_2011-02-10_15-54-28_256_717236059530733661/-ext-10001/
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      properties:
-                        columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7
-                        columns.types string:string:string:string:string:string:string:string
-                        serialization.format 1
-                  TotalFiles: 1
-                  GatherStats: false
-                  MultiFileSpray: false
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: string
+                  expr: _col1
+                  type: string
+                  expr: _col2
+                  type: string
+                  expr: _col3
+                  type: string
+                  expr: _col6
+                  type: string
+                  expr: _col7
+                  type: string
+                  expr: _col8
+                  type: string
+                  expr: _col9
+                  type: string
+            outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
+            Limit
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                directory: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-17_09-04-29_865_6849719999466698028/-ext-10001
+                NumFilesPerFileSink: 1
+                Stats Publishing Key Prefix: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-17_09-04-29_865_6849719999466698028/-ext-10001/
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                    properties:
+                      columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7
+                      columns.types string:string:string:string:string:string:string:string
+                      serialization.format 1
+                TotalFiles: 1
+                GatherStats: false
+                MultiFileSpray: false
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/input24.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input24.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input24.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input24.q.out Wed Jul 13 16:49:22 2011
@@ -30,23 +30,19 @@ STAGE PLANS:
         x 
           TableScan
             alias: x
-            Filter Operator
-              predicate:
-                  expr: (d = '2009-01-01')
-                  type: boolean
-              Select Operator
-                Group By Operator
-                  aggregations:
-                        expr: count(1)
-                  bucketGroup: false
-                  mode: hash
-                  outputColumnNames: _col0
-                  Reduce Output Operator
-                    sort order: 
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: bigint
+            Select Operator
+              Group By Operator
+                aggregations:
+                      expr: count(1)
+                bucketGroup: false
+                mode: hash
+                outputColumnNames: _col0
+                Reduce Output Operator
+                  sort order: 
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:

Modified: hive/trunk/ql/src/test/results/clientpositive/input25.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input25.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input25.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input25.q.out Wed Jul 13 16:49:22 2011
@@ -47,30 +47,26 @@ STAGE PLANS:
         null-subquery1:subq-subquery1:x 
           TableScan
             alias: x
-            Filter Operator
-              predicate:
-                  expr: (d = '2009-01-01')
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: a
-                      type: int
-                      expr: b
-                      type: int
-                      expr: d
-                      type: string
-                outputColumnNames: _col0, _col1, _col2
-                Limit
-                  Reduce Output Operator
-                    sort order: 
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: int
-                          expr: _col1
-                          type: int
-                          expr: _col2
-                          type: string
+            Select Operator
+              expressions:
+                    expr: a
+                    type: int
+                    expr: b
+                    type: int
+                    expr: d
+                    type: string
+              outputColumnNames: _col0, _col1, _col2
+              Limit
+                Reduce Output Operator
+                  sort order: 
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: int
+                        expr: _col1
+                        type: int
+                        expr: _col2
+                        type: string
       Reduce Operator Tree:
         Extract
           Limit
@@ -125,30 +121,26 @@ STAGE PLANS:
         null-subquery2:subq-subquery2:x 
           TableScan
             alias: x
-            Filter Operator
-              predicate:
-                  expr: (d = '2009-02-02')
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: a
-                      type: int
-                      expr: b
-                      type: int
-                      expr: d
-                      type: string
-                outputColumnNames: _col0, _col1, _col2
-                Limit
-                  Reduce Output Operator
-                    sort order: 
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: int
-                          expr: _col1
-                          type: int
-                          expr: _col2
-                          type: string
+            Select Operator
+              expressions:
+                    expr: a
+                    type: int
+                    expr: b
+                    type: int
+                    expr: d
+                    type: string
+              outputColumnNames: _col0, _col1, _col2
+              Limit
+                Reduce Output Operator
+                  sort order: 
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: int
+                        expr: _col1
+                        type: int
+                        expr: _col2
+                        type: string
       Reduce Operator Tree:
         Extract
           Limit

Modified: hive/trunk/ql/src/test/results/clientpositive/input26.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input26.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input26.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input26.q.out Wed Jul 13 16:49:22 2011
@@ -28,36 +28,32 @@ STAGE PLANS:
         null-subquery1:subq-subquery1:a 
           TableScan
             alias: a
-            Filter Operator
-              predicate:
-                  expr: ((ds = '2008-04-08') and (hr = '11'))
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
+            Select Operator
+              expressions:
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+                    expr: ds
+                    type: string
+                    expr: hr
+                    type: string
+              outputColumnNames: _col0, _col1, _col2, _col3
+              Reduce Output Operator
+                key expressions:
+                      expr: _col0
                       type: string
-                      expr: value
+                sort order: +
+                tag: -1
+                value expressions:
+                      expr: _col0
                       type: string
-                      expr: ds
+                      expr: _col1
                       type: string
-                      expr: hr
+                      expr: _col2
+                      type: string
+                      expr: _col3
                       type: string
-                outputColumnNames: _col0, _col1, _col2, _col3
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                        expr: _col2
-                        type: string
-                        expr: _col3
-                        type: string
       Reduce Operator Tree:
         Extract
           Limit
@@ -120,34 +116,30 @@ STAGE PLANS:
               predicate:
                   expr: ((ds = '2008-04-08') and (hr = '14'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((ds = '2008-04-08') and (hr = '14'))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                        expr: ds
-                        type: string
-                        expr: hr
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3
-                  Limit
-                    Reduce Output Operator
-                      sort order: 
-                      tag: -1
-                      value expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col1
-                            type: string
-                            expr: _col2
-                            type: string
-                            expr: _col3
-                            type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Limit
+                  Reduce Output Operator
+                    sort order: 
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
+                          expr: _col2
+                          type: string
+                          expr: _col3
+                          type: string
       Reduce Operator Tree:
         Extract
           Limit

Modified: hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out Wed Jul 13 16:49:22 2011
@@ -22,24 +22,20 @@ STAGE PLANS:
               predicate:
                   expr: (key < 300)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key < 300)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Limit
-                    File Output Operator
-                      compressed: false
-                      GlobalTableId: 0
-                      table:
-                          input format: org.apache.hadoop.mapred.TextInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Limit
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 0
+                    table:
+                        input format: org.apache.hadoop.mapred.TextInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/input31.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input31.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input31.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input31.q.out Wed Jul 13 16:49:22 2011
@@ -35,23 +35,19 @@ STAGE PLANS:
               predicate:
                   expr: (((hash(key) & 2147483647) % 2) = 0)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (((hash(key) & 2147483647) % 2) = 0)
-                    type: boolean
-                Select Operator
-                  Group By Operator
-                    aggregations:
-                          expr: count(1)
-                    bucketGroup: false
-                    mode: hash
-                    outputColumnNames: _col0
-                    Reduce Output Operator
-                      sort order: 
-                      tag: -1
-                      value expressions:
-                            expr: _col0
-                            type: bigint
+              Select Operator
+                Group By Operator
+                  aggregations:
+                        expr: count(1)
+                  bucketGroup: false
+                  mode: hash
+                  outputColumnNames: _col0
+                  Reduce Output Operator
+                    sort order: 
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:

Modified: hive/trunk/ql/src/test/results/clientpositive/input39.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input39.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input39.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input39.q.out Wed Jul 13 16:49:22 2011
@@ -121,23 +121,19 @@ STAGE PLANS:
             1 {VALUE._col2}
           handleSkewJoin: false
           outputColumnNames: _col2, _col7
-          Filter Operator
-            predicate:
-                expr: ((_col2 = '1') and (_col7 = '1'))
-                type: boolean
-            Select Operator
-              Group By Operator
-                aggregations:
-                      expr: count(1)
-                bucketGroup: false
-                mode: hash
-                outputColumnNames: _col0
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+          Select Operator
+            Group By Operator
+              aggregations:
+                    expr: count(1)
+              bucketGroup: false
+              mode: hash
+              outputColumnNames: _col0
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
 
   Stage: Stage-2
     Map Reduce

Modified: hive/trunk/ql/src/test/results/clientpositive/input42.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input42.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input42.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input42.q.out Wed Jul 13 16:49:22 2011
@@ -19,39 +19,34 @@ STAGE PLANS:
           TableScan
             alias: a
             GatherStats: false
-            Filter Operator
-              isSamplingPred: false
-              predicate:
-                  expr: (ds = '2008-04-08')
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
+            Select Operator
+              expressions:
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+                    expr: ds
+                    type: string
+                    expr: hr
+                    type: string
+              outputColumnNames: _col0, _col1, _col2, _col3
+              Reduce Output Operator
+                key expressions:
+                      expr: _col0
                       type: string
-                      expr: value
+                      expr: _col3
                       type: string
-                      expr: ds
+                sort order: ++
+                tag: -1
+                value expressions:
+                      expr: _col0
                       type: string
-                      expr: hr
+                      expr: _col1
+                      type: string
+                      expr: _col2
+                      type: string
+                      expr: _col3
                       type: string
-                outputColumnNames: _col0, _col1, _col2, _col3
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col3
-                        type: string
-                  sort order: ++
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                        expr: _col2
-                        type: string
-                        expr: _col3
-                        type: string
       Needs Tagging: false
       Path -> Alias:
         pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a]
@@ -1199,39 +1194,34 @@ STAGE PLANS:
               predicate:
                   expr: (key < 200)
                   type: boolean
-              Filter Operator
-                isSamplingPred: false
-                predicate:
-                    expr: ((ds = '2008-04-08') and (key < 200))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
                         type: string
-                        expr: value
+                        expr: _col3
                         type: string
-                        expr: ds
+                  sort order: ++
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
                         type: string
-                        expr: hr
+                        expr: _col2
+                        type: string
+                        expr: _col3
                         type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col3
-                          type: string
-                    sort order: ++
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
-                          expr: _col2
-                          type: string
-                          expr: _col3
-                          type: string
       Needs Tagging: false
       Path -> Alias:
         pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a]