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 [17/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/ ...

Modified: hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out Wed Jul 13 16:49:22 2011
@@ -517,33 +517,29 @@ STAGE PLANS:
               predicate:
                   expr: (key < '15')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key < '15')
-                    type: boolean
-                Select Operator
-                  expressions:
+              Select Operator
+                expressions:
+                      expr: key
+                      type: int
+                outputColumnNames: key
+                Group By Operator
+                  bucketGroup: false
+                  keys:
                         expr: key
                         type: int
-                  outputColumnNames: key
-                  Group By Operator
-                    bucketGroup: false
-                    keys:
-                          expr: key
+                        expr: key
+                        type: int
+                  mode: hash
+                  outputColumnNames: _col0, _col1
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col1
                           type: int
-                          expr: key
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col1
                           type: int
-                    mode: hash
-                    outputColumnNames: _col0, _col1
-                    Reduce Output Operator
-                      key expressions:
-                            expr: _col1
-                            type: int
-                      sort order: +
-                      Map-reduce partition columns:
-                            expr: _col1
-                            type: int
-                      tag: 1
+                    tag: 1
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -653,35 +649,31 @@ STAGE PLANS:
               predicate:
                   expr: (value < 'val_10')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (value < 'val_10')
-                    type: boolean
-                Select Operator
-                  expressions:
+              Select Operator
+                expressions:
+                      expr: key
+                      type: int
+                      expr: value
+                      type: string
+                outputColumnNames: key, value
+                Group By Operator
+                  bucketGroup: false
+                  keys:
                         expr: key
                         type: int
                         expr: value
                         type: string
-                  outputColumnNames: key, value
-                  Group By Operator
-                    bucketGroup: false
-                    keys:
-                          expr: key
+                  mode: hash
+                  outputColumnNames: _col0, _col1
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
                           type: int
-                          expr: value
-                          type: string
-                    mode: hash
-                    outputColumnNames: _col0, _col1
-                    Reduce Output Operator
-                      key expressions:
-                            expr: _col0
-                            type: int
-                      sort order: +
-                      Map-reduce partition columns:
-                            expr: _col0
-                            type: int
-                      tag: 1
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: int
+                    tag: 1
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -787,36 +779,32 @@ STAGE PLANS:
               predicate:
                   expr: (key > 5)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > 5)
-                    type: boolean
+              Select Operator
+                expressions:
+                      expr: key
+                      type: int
+                outputColumnNames: _col0
                 Select Operator
                   expressions:
-                        expr: key
+                        expr: _col0
                         type: int
                   outputColumnNames: _col0
-                  Select Operator
-                    expressions:
+                  Group By Operator
+                    bucketGroup: false
+                    keys:
                           expr: _col0
                           type: int
+                    mode: hash
                     outputColumnNames: _col0
-                    Group By Operator
-                      bucketGroup: false
-                      keys:
+                    Reduce Output Operator
+                      key expressions:
                             expr: _col0
                             type: int
-                      mode: hash
-                      outputColumnNames: _col0
-                      Reduce Output Operator
-                        key expressions:
-                              expr: _col0
-                              type: int
-                        sort order: +
-                        Map-reduce partition columns:
-                              expr: _col0
-                              type: int
-                        tag: 1
+                      sort order: +
+                      Map-reduce partition columns:
+                            expr: _col0
+                            type: int
+                      tag: 1
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -916,46 +904,38 @@ STAGE PLANS:
               predicate:
                   expr: ((key > 5) and (value <= 'val_20'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > 5)
-                    type: boolean
+              Select Operator
+                expressions:
+                      expr: key
+                      type: int
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
                 Select Operator
                   expressions:
-                        expr: key
+                        expr: _col0
                         type: int
-                        expr: value
+                        expr: _col1
                         type: string
                   outputColumnNames: _col0, _col1
-                  Filter Operator
-                    predicate:
-                        expr: (_col1 <= 'val_20')
-                        type: boolean
-                    Select Operator
-                      expressions:
+                  Group By Operator
+                    bucketGroup: false
+                    keys:
+                          expr: _col0
+                          type: int
+                          expr: _col1
+                          type: string
+                    mode: hash
+                    outputColumnNames: _col0, _col1
+                    Reduce Output Operator
+                      key expressions:
                             expr: _col0
                             type: int
-                            expr: _col1
-                            type: string
-                      outputColumnNames: _col0, _col1
-                      Group By Operator
-                        bucketGroup: false
-                        keys:
-                              expr: _col0
-                              type: int
-                              expr: _col1
-                              type: string
-                        mode: hash
-                        outputColumnNames: _col0, _col1
-                        Reduce Output Operator
-                          key expressions:
-                                expr: _col0
-                                type: int
-                          sort order: +
-                          Map-reduce partition columns:
-                                expr: _col0
-                                type: int
-                          tag: 1
+                      sort order: +
+                      Map-reduce partition columns:
+                            expr: _col0
+                            type: int
+                      tag: 1
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -1054,36 +1034,32 @@ STAGE PLANS:
               predicate:
                   expr: (key > 2)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > 2)
-                    type: boolean
+              Select Operator
+                expressions:
+                      expr: key
+                      type: int
+                outputColumnNames: _col0
                 Select Operator
                   expressions:
-                        expr: key
+                        expr: _col0
                         type: int
                   outputColumnNames: _col0
-                  Select Operator
-                    expressions:
+                  Group By Operator
+                    bucketGroup: false
+                    keys:
                           expr: _col0
                           type: int
+                    mode: hash
                     outputColumnNames: _col0
-                    Group By Operator
-                      bucketGroup: false
-                      keys:
+                    Reduce Output Operator
+                      key expressions:
+                            expr: _col0
+                            type: int
+                      sort order: +
+                      Map-reduce partition columns:
                             expr: _col0
                             type: int
-                      mode: hash
-                      outputColumnNames: _col0
-                      Reduce Output Operator
-                        key expressions:
-                              expr: _col0
-                              type: int
-                        sort order: +
-                        Map-reduce partition columns:
-                              expr: _col0
-                              type: int
-                        tag: 1
+                      tag: 1
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out Wed Jul 13 16:49:22 2011
@@ -25,23 +25,19 @@ STAGE PLANS:
               predicate:
                   expr: (key = 5)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 5)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        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: key
+                      type: string
+                      expr: value
+                      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/skewjoin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoin.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoin.q.out Wed Jul 13 16:49:22 2011
@@ -1198,22 +1198,18 @@ STAGE PLANS:
                       expr: key
                       type: string
                 outputColumnNames: _col0
-                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: 0
-                    value expressions:
-                          expr: _col0
-                          type: string
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  Map-reduce partition columns:
+                        expr: _col0
+                        type: string
+                  tag: 0
+                  value expressions:
+                        expr: _col0
+                        type: string
         src2:src 
           TableScan
             alias: src
@@ -1248,19 +1244,15 @@ STAGE PLANS:
                       expr: key
                       type: string
                 outputColumnNames: _col0
-                Filter Operator
-                  predicate:
-                      expr: (_col0 < 80)
-                      type: boolean
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                    tag: 2
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  Map-reduce partition columns:
+                        expr: _col0
+                        type: string
+                  tag: 2
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out Wed Jul 13 16:49:22 2011
@@ -88,27 +88,23 @@ STAGE PLANS:
                       expr: _col7
                       type: string
                 outputColumnNames: _col0, _col2, _col5, _col6, _col7
-                Filter Operator
-                  predicate:
-                      expr: (((_col2 = '2010-10-15') and (_col7 = '2010-10-15')) and _col5 is not null)
-                      type: boolean
-                  Select Operator
-                    expressions:
-                          expr: _col5
-                          type: int
-                          expr: _col6
-                          type: string
-                          expr: _col7
-                          type: string
-                          expr: _col0
-                          type: int
-                    outputColumnNames: _col0, _col1, _col2, _col3
-                    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: _col5
+                        type: int
+                        expr: _col6
+                        type: string
+                        expr: _col7
+                        type: string
+                        expr: _col0
+                        type: int
+                  outputColumnNames: _col0, _col1, _col2, _col3
+                  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-0
     Move Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out Wed Jul 13 16:49:22 2011
@@ -2634,29 +2634,25 @@ STAGE PLANS:
                       expr: _col5
                       type: string
                 outputColumnNames: _col0, _col1, _col4, _col5
-                Filter Operator
-                  predicate:
-                      expr: (_col0 > 1000)
-                      type: boolean
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: int
-                          expr: _col1
-                          type: string
-                          expr: _col4
-                          type: int
-                          expr: _col5
-                          type: string
-                    outputColumnNames: _col0, _col1, _col2, _col3
-                    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.smb_join_results
+                Select Operator
+                  expressions:
+                        expr: _col0
+                        type: int
+                        expr: _col1
+                        type: string
+                        expr: _col4
+                        type: int
+                        expr: _col5
+                        type: string
+                  outputColumnNames: _col0, _col1, _col2, _col3
+                  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.smb_join_results
 
   Stage: Stage-0
     Move Operator
@@ -2790,29 +2786,25 @@ STAGE PLANS:
                         expr: _col5
                         type: string
                   outputColumnNames: _col0, _col1, _col4, _col5
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 > 1000)
-                        type: boolean
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: int
-                            expr: _col1
-                            type: string
-                            expr: _col4
-                            type: int
-                            expr: _col5
-                            type: string
-                      outputColumnNames: _col0, _col1, _col2, _col3
-                      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.smb_join_results
+                  Select Operator
+                    expressions:
+                          expr: _col0
+                          type: int
+                          expr: _col1
+                          type: string
+                          expr: _col4
+                          type: int
+                          expr: _col5
+                          type: string
+                    outputColumnNames: _col0, _col1, _col2, _col3
+                    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.smb_join_results
 
   Stage: Stage-0
     Move Operator
@@ -2958,31 +2950,27 @@ STAGE PLANS:
                         expr: _col9
                         type: string
                   outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 > 1000)
-                        type: boolean
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: int
-                            expr: _col1
-                            type: string
-                            expr: _col4
-                            type: int
-                            expr: _col5
-                            type: string
-                            expr: _col8
-                            type: int
-                            expr: _col9
-                            type: string
-                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                      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: int
+                          expr: _col1
+                          type: string
+                          expr: _col4
+                          type: int
+                          expr: _col5
+                          type: string
+                          expr: _col8
+                          type: int
+                          expr: _col9
+                          type: string
+                    outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
+                    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/split_sample.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/split_sample.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/split_sample.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/split_sample.q.out Wed Jul 13 16:49:22 2011
@@ -4111,17 +4111,17 @@ STAGE PLANS:
             1 {VALUE._col0}
           handleSkewJoin: false
           outputColumnNames: _col0, _col4
-          Select Operator
-            expressions:
-                  expr: _col0
-                  type: int
-                  expr: _col4
-                  type: int
-            outputColumnNames: _col0, _col1
-            Filter Operator
-              predicate:
-                  expr: ((_col1) IN (199, 10199, 20199) or (_col0) IN (199, 10199, 20199))
-                  type: boolean
+          Filter Operator
+            predicate:
+                expr: ((_col4) IN (199, 10199, 20199) or (_col0) IN (199, 10199, 20199))
+                type: boolean
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: int
+                    expr: _col4
+                    type: int
+              outputColumnNames: _col0, _col1
               Select Operator
                 expressions:
                       expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/stats11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats11.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats11.q.out Wed Jul 13 16:49:22 2011
@@ -162,46 +162,41 @@ STAGE PLANS:
                       expr: _col6
                       type: string
                 outputColumnNames: _col0, _col1, _col5, _col6
-                Filter Operator
-                  isSamplingPred: false
-                  predicate:
-                      expr: (_col6 = '2008-04-08')
-                      type: boolean
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: int
-                          expr: _col1
-                          type: string
-                          expr: _col5
-                          type: string
-                    outputColumnNames: _col0, _col1, _col2
-                    File Output Operator
-                      compressed: false
-                      GlobalTableId: 1
-                      directory: pfile:/data/users/tomasz/apache-hive/build/ql/scratchdir/hive_2011-06-01_20-41-18_163_6560883492277571896/-ext-10002
-                      NumFilesPerFileSink: 1
-                      Stats Publishing Key Prefix: pfile:/data/users/tomasz/apache-hive/build/ql/scratchdir/hive_2011-06-01_20-41-18_163_6560883492277571896/-ext-10000/
-                      table:
-                          input format: org.apache.hadoop.mapred.TextInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                          properties:
-                            bucket_count -1
-                            columns key,value1,value2
-                            columns.types string:string:string
-                            file.inputformat org.apache.hadoop.mapred.TextInputFormat
-                            file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                            location pfile:/data/users/tomasz/apache-hive/build/ql/test/data/warehouse/bucketmapjoin_tmp_result
-                            name default.bucketmapjoin_tmp_result
-                            serialization.ddl struct bucketmapjoin_tmp_result { string key, string value1, string value2}
-                            serialization.format 1
-                            serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                            transient_lastDdlTime 1306986078
-                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                          name: default.bucketmapjoin_tmp_result
-                      TotalFiles: 1
-                      GatherStats: true
-                      MultiFileSpray: false
+                Select Operator
+                  expressions:
+                        expr: _col0
+                        type: int
+                        expr: _col1
+                        type: string
+                        expr: _col5
+                        type: string
+                  outputColumnNames: _col0, _col1, _col2
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 1
+                    directory: pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_03-10-59_585_1038860316679520823/-ext-10002
+                    NumFilesPerFileSink: 1
+                    Stats Publishing Key Prefix: pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_03-10-59_585_1038860316679520823/-ext-10000/
+                    table:
+                        input format: org.apache.hadoop.mapred.TextInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                        properties:
+                          bucket_count -1
+                          columns key,value1,value2
+                          columns.types string:string:string
+                          file.inputformat org.apache.hadoop.mapred.TextInputFormat
+                          file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                          location pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/bucketmapjoin_tmp_result
+                          name default.bucketmapjoin_tmp_result
+                          serialization.ddl struct bucketmapjoin_tmp_result { string key, string value1, string value2}
+                          serialization.format 1
+                          serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          transient_lastDdlTime 1310379059
+                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        name: default.bucketmapjoin_tmp_result
+                    TotalFiles: 1
+                    GatherStats: true
+                    MultiFileSpray: false
       Local Work:
         Map Reduce Local Work
       Needs Tagging: false
@@ -593,51 +588,46 @@ STAGE PLANS:
                       expr: _col6
                       type: string
                 outputColumnNames: _col0, _col1, _col5, _col6
-                Filter Operator
-                  isSamplingPred: false
-                  predicate:
-                      expr: (_col6 = '2008-04-08')
-                      type: boolean
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: int
-                          expr: _col1
-                          type: string
-                          expr: _col5
-                          type: string
-                    outputColumnNames: _col0, _col1, _col2
-                    File Output Operator
-                      compressed: false
-                      GlobalTableId: 1
-                      directory: pfile:/data/users/tomasz/apache-hive/build/ql/scratchdir/hive_2011-06-01_20-41-49_304_6102645690321346948/-ext-10002
-                      NumFilesPerFileSink: 1
-                      Stats Publishing Key Prefix: pfile:/data/users/tomasz/apache-hive/build/ql/scratchdir/hive_2011-06-01_20-41-49_304_6102645690321346948/-ext-10000/
-                      table:
-                          input format: org.apache.hadoop.mapred.TextInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                          properties:
-                            bucket_count -1
-                            columns key,value1,value2
-                            columns.types string:string:string
-                            file.inputformat org.apache.hadoop.mapred.TextInputFormat
-                            file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                            location pfile:/data/users/tomasz/apache-hive/build/ql/test/data/warehouse/bucketmapjoin_tmp_result
-                            name default.bucketmapjoin_tmp_result
-                            numFiles 1
-                            numPartitions 0
-                            numRows 464
-                            rawDataSize 8519
-                            serialization.ddl struct bucketmapjoin_tmp_result { string key, string value1, string value2}
-                            serialization.format 1
-                            serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                            totalSize 8983
-                            transient_lastDdlTime 1306986098
-                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                          name: default.bucketmapjoin_tmp_result
-                      TotalFiles: 1
-                      GatherStats: true
-                      MultiFileSpray: false
+                Select Operator
+                  expressions:
+                        expr: _col0
+                        type: int
+                        expr: _col1
+                        type: string
+                        expr: _col5
+                        type: string
+                  outputColumnNames: _col0, _col1, _col2
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 1
+                    directory: pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_03-11-25_827_1887525539038984243/-ext-10002
+                    NumFilesPerFileSink: 1
+                    Stats Publishing Key Prefix: pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_03-11-25_827_1887525539038984243/-ext-10000/
+                    table:
+                        input format: org.apache.hadoop.mapred.TextInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                        properties:
+                          bucket_count -1
+                          columns key,value1,value2
+                          columns.types string:string:string
+                          file.inputformat org.apache.hadoop.mapred.TextInputFormat
+                          file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                          location pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/bucketmapjoin_tmp_result
+                          name default.bucketmapjoin_tmp_result
+                          numFiles 1
+                          numPartitions 0
+                          numRows 464
+                          rawDataSize 8519
+                          serialization.ddl struct bucketmapjoin_tmp_result { string key, string value1, string value2}
+                          serialization.format 1
+                          serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          totalSize 8983
+                          transient_lastDdlTime 1310379076
+                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        name: default.bucketmapjoin_tmp_result
+                    TotalFiles: 1
+                    GatherStats: true
+                    MultiFileSpray: false
       Local Work:
         Map Reduce Local Work
       Needs Tagging: false

Modified: hive/trunk/ql/src/test/results/clientpositive/stats2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats2.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats2.q.out Wed Jul 13 16:49:22 2011
@@ -23,29 +23,25 @@ STAGE PLANS:
         srcpart 
           TableScan
             alias: srcpart
-            Filter Operator
-              predicate:
-                  expr: ds is not null
-                  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
-                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.analyze_t1
+            Select Operator
+              expressions:
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+                    expr: ds
+                    type: string
+                    expr: hr
+                    type: string
+              outputColumnNames: _col0, _col1, _col2, _col3
+              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.analyze_t1
 
   Stage: Stage-0
     Move Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/subq.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/subq.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/subq.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/subq.q.out Wed Jul 13 16:49:22 2011
@@ -31,30 +31,26 @@ 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
+                        expr: _col0
                         type: string
-                        expr: value
+                        expr: _col1
                         type: string
                   outputColumnNames: _col0, _col1
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: string
-                          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
+                  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-4
     Conditional Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/subq2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/subq2.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/subq2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/subq2.q.out Wed Jul 13 16:49:22 2011
@@ -69,23 +69,19 @@ STAGE PLANS:
                   expr: _col1
                   type: bigint
             outputColumnNames: _col0, _col1
-            Filter Operator
-              predicate:
-                  expr: (_col0 >= 90)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: string
-                      expr: _col1
-                      type: bigint
-                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: bigint
+              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/transform_ppr1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out Wed Jul 13 16:49:22 2011
@@ -50,22 +50,27 @@ STAGE PLANS:
                       columns.types string,string,string
                       field.delim 9
                       serialization.format 9
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col1
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col1
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                        expr: _col2
-                        type: string
+                Filter Operator
+                  isSamplingPred: false
+                  predicate:
+                      expr: ((_col1 < 100) and (_col0 = '2008-04-08'))
+                      type: boolean
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col1
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col1
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
+                          expr: _col2
+                          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 [tmap:src]
@@ -239,34 +244,29 @@ STAGE PLANS:
             name: default.srcpart
       Reduce Operator Tree:
         Extract
-          Filter Operator
-            isSamplingPred: false
-            predicate:
-                expr: ((_col1 < 100) and (_col0 = '2008-04-08'))
-                type: boolean
-            Select Operator
-              expressions:
-                    expr: _col1
-                    type: string
-                    expr: _col2
-                    type: string
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                directory: file:/tmp/sdong/hive_2011-02-10_17-24-54_583_8987862490121410836/-ext-10001
-                NumFilesPerFileSink: 1
-                Stats Publishing Key Prefix: file:/tmp/sdong/hive_2011-02-10_17-24-54_583_8987862490121410836/-ext-10001/
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    properties:
-                      columns _col0,_col1
-                      columns.types string:string
-                      serialization.format 1
-                TotalFiles: 1
-                GatherStats: false
-                MultiFileSpray: false
+          Select Operator
+            expressions:
+                  expr: _col1
+                  type: string
+                  expr: _col2
+                  type: string
+            outputColumnNames: _col0, _col1
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              directory: file:/tmp/amarsri/hive_2011-03-19_01-46-48_559_8291501891794719709/-ext-10001
+              NumFilesPerFileSink: 1
+              Stats Publishing Key Prefix: file:/tmp/amarsri/hive_2011-03-19_01-46-48_559_8291501891794719709/-ext-10001/
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  properties:
+                    columns _col0,_col1
+                    columns.types string:string
+                    serialization.format 1
+              TotalFiles: 1
+              GatherStats: false
+              MultiFileSpray: false
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out Wed Jul 13 16:49:22 2011
@@ -33,30 +33,30 @@ STAGE PLANS:
           TableScan
             alias: src
             GatherStats: false
-            Filter Operator
-              isSamplingPred: false
-              predicate:
-                  expr: (ds = '2008-04-08')
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: ds
-                      type: string
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1, _col2
-                Transform Operator
-                  command: /bin/cat
-                  output info:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      properties:
-                        columns _col0,_col1,_col2
-                        columns.types string,string,string
-                        field.delim 9
-                        serialization.format 9
+            Select Operator
+              expressions:
+                    expr: ds
+                    type: string
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+              outputColumnNames: _col0, _col1, _col2
+              Transform Operator
+                command: /bin/cat
+                output info:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                    properties:
+                      columns _col0,_col1,_col2
+                      columns.types string,string,string
+                      field.delim 9
+                      serialization.format 9
+                Filter Operator
+                  isSamplingPred: false
+                  predicate:
+                      expr: (_col1 < 100)
+                      type: boolean
                   Reduce Output Operator
                     key expressions:
                           expr: _col1
@@ -162,34 +162,29 @@ STAGE PLANS:
             name: default.srcpart
       Reduce Operator Tree:
         Extract
-          Filter Operator
-            isSamplingPred: false
-            predicate:
-                expr: (_col1 < 100)
-                type: boolean
-            Select Operator
-              expressions:
-                    expr: _col1
-                    type: string
-                    expr: _col2
-                    type: string
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                directory: file:/tmp/sdong/hive_2011-02-10_17-24-59_315_262991000601799738/-ext-10001
-                NumFilesPerFileSink: 1
-                Stats Publishing Key Prefix: file:/tmp/sdong/hive_2011-02-10_17-24-59_315_262991000601799738/-ext-10001/
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    properties:
-                      columns _col0,_col1
-                      columns.types string:string
-                      serialization.format 1
-                TotalFiles: 1
-                GatherStats: false
-                MultiFileSpray: false
+          Select Operator
+            expressions:
+                  expr: _col1
+                  type: string
+                  expr: _col2
+                  type: string
+            outputColumnNames: _col0, _col1
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              directory: file:/tmp/amarsri/hive_2011-03-19_01-46-51_820_4418676794321891468/-ext-10001
+              NumFilesPerFileSink: 1
+              Stats Publishing Key Prefix: file:/tmp/amarsri/hive_2011-03-19_01-46-51_820_4418676794321891468/-ext-10001/
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  properties:
+                    columns _col0,_col1
+                    columns.types string:string
+                    serialization.format 1
+              TotalFiles: 1
+              GatherStats: false
+              MultiFileSpray: false
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/udf1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf1.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf1.q.out Wed Jul 13 16:49:22 2011
@@ -51,61 +51,57 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: ('a' like '%a%')
-                        type: boolean
-                        expr: ('b' like '%a%')
-                        type: boolean
-                        expr: ('ab' like '%a%')
-                        type: boolean
-                        expr: ('ab' like '%a_')
-                        type: boolean
-                        expr: ('%_' like '\%\_')
-                        type: boolean
-                        expr: ('ab' like '\%\_')
-                        type: boolean
-                        expr: ('ab' like '_a%')
-                        type: boolean
-                        expr: ('ab' like 'a')
-                        type: boolean
-                        expr: ('' rlike '.*')
-                        type: boolean
-                        expr: ('a' rlike '[ab]')
-                        type: boolean
-                        expr: ('' rlike '[ab]')
-                        type: boolean
-                        expr: ('hadoop' rlike '[a-z]*')
-                        type: boolean
-                        expr: ('hadoop' rlike 'o*')
-                        type: boolean
-                        expr: regexp_replace('abc', 'b', 'c')
-                        type: string
-                        expr: regexp_replace('abc', 'z', 'a')
-                        type: string
-                        expr: regexp_replace('abbbb', 'bb', 'b')
-                        type: string
-                        expr: regexp_replace('hadoop', '(.)[a-z]*', '$1ive')
-                        type: string
-                        expr: regexp_replace('hadoopAAA', 'A.*', '')
-                        type: string
-                        expr: regexp_replace('abc', '', 'A')
-                        type: string
-                        expr: ('abc' rlike '')
-                        type: boolean
-                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19
-                  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
+              Select Operator
+                expressions:
+                      expr: ('a' like '%a%')
+                      type: boolean
+                      expr: ('b' like '%a%')
+                      type: boolean
+                      expr: ('ab' like '%a%')
+                      type: boolean
+                      expr: ('ab' like '%a_')
+                      type: boolean
+                      expr: ('%_' like '\%\_')
+                      type: boolean
+                      expr: ('ab' like '\%\_')
+                      type: boolean
+                      expr: ('ab' like '_a%')
+                      type: boolean
+                      expr: ('ab' like 'a')
+                      type: boolean
+                      expr: ('' rlike '.*')
+                      type: boolean
+                      expr: ('a' rlike '[ab]')
+                      type: boolean
+                      expr: ('' rlike '[ab]')
+                      type: boolean
+                      expr: ('hadoop' rlike '[a-z]*')
+                      type: boolean
+                      expr: ('hadoop' rlike 'o*')
+                      type: boolean
+                      expr: regexp_replace('abc', 'b', 'c')
+                      type: string
+                      expr: regexp_replace('abc', 'z', 'a')
+                      type: string
+                      expr: regexp_replace('abbbb', 'bb', 'b')
+                      type: string
+                      expr: regexp_replace('hadoop', '(.)[a-z]*', '$1ive')
+                      type: string
+                      expr: regexp_replace('hadoopAAA', 'A.*', '')
+                      type: string
+                      expr: regexp_replace('abc', '', 'A')
+                      type: string
+                      expr: ('abc' rlike '')
+                      type: boolean
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19
+                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/udf9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf9.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf9.q.out Wed Jul 13 16:49:22 2011
@@ -38,51 +38,47 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: datediff('2008-12-31', '2009-01-01')
-                        type: int
-                        expr: datediff('2008-03-01', '2008-02-28')
-                        type: int
-                        expr: datediff('2007-03-01', '2007-01-28')
-                        type: int
-                        expr: datediff('2008-03-01 23:59:59', '2008-03-02 00:00:00')
-                        type: int
-                        expr: date_add('2008-12-31', 1)
-                        type: string
-                        expr: date_add('2008-12-31', 365)
-                        type: string
-                        expr: date_add('2008-02-28', 2)
-                        type: string
-                        expr: date_add('2009-02-28', 2)
-                        type: string
-                        expr: date_add('2007-02-28', 365)
-                        type: string
-                        expr: date_add('2007-02-28 23:59:59', 730)
-                        type: string
-                        expr: date_sub('2009-01-01', 1)
-                        type: string
-                        expr: date_sub('2009-01-01', 365)
-                        type: string
-                        expr: date_sub('2008-02-28', 2)
-                        type: string
-                        expr: date_sub('2009-02-28', 2)
-                        type: string
-                        expr: date_sub('2007-02-28', 365)
-                        type: string
-                        expr: date_sub('2007-02-28 01:12:34', 730)
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15
-                  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: datediff('2008-12-31', '2009-01-01')
+                      type: int
+                      expr: datediff('2008-03-01', '2008-02-28')
+                      type: int
+                      expr: datediff('2007-03-01', '2007-01-28')
+                      type: int
+                      expr: datediff('2008-03-01 23:59:59', '2008-03-02 00:00:00')
+                      type: int
+                      expr: date_add('2008-12-31', 1)
+                      type: string
+                      expr: date_add('2008-12-31', 365)
+                      type: string
+                      expr: date_add('2008-02-28', 2)
+                      type: string
+                      expr: date_add('2009-02-28', 2)
+                      type: string
+                      expr: date_add('2007-02-28', 365)
+                      type: string
+                      expr: date_add('2007-02-28 23:59:59', 730)
+                      type: string
+                      expr: date_sub('2009-01-01', 1)
+                      type: string
+                      expr: date_sub('2009-01-01', 365)
+                      type: string
+                      expr: date_sub('2008-02-28', 2)
+                      type: string
+                      expr: date_sub('2009-02-28', 2)
+                      type: string
+                      expr: date_sub('2007-02-28', 365)
+                      type: string
+                      expr: date_sub('2007-02-28 01:12:34', 730)
+                      type: string
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15
+                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/udf_10_trims.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out Wed Jul 13 16:49:22 2011
@@ -37,23 +37,19 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: trim(trim(trim(trim(trim(trim(trim(trim(trim(trim('  abc  '))))))))))
-                        type: string
-                  outputColumnNames: _col0
-                  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
+              Select Operator
+                expressions:
+                      expr: trim(trim(trim(trim(trim(trim(trim(trim(trim(trim('  abc  '))))))))))
+                      type: string
+                outputColumnNames: _col0
+                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/udf_hour.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_hour.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_hour.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_hour.q.out Wed Jul 13 16:49:22 2011
@@ -40,25 +40,21 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: hour('2009-08-07 13:14:15')
-                        type: int
-                        expr: hour('13:14:15')
-                        type: int
-                        expr: hour('2009-08-07')
-                        type: int
-                  outputColumnNames: _col0, _col1, _col2
-                  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: hour('2009-08-07 13:14:15')
+                      type: int
+                      expr: hour('13:14:15')
+                      type: int
+                      expr: hour('2009-08-07')
+                      type: int
+                outputColumnNames: _col0, _col1, _col2
+                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/udf_isnull_isnotnull.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out Wed Jul 13 16:49:22 2011
@@ -50,26 +50,22 @@ STAGE PLANS:
               predicate:
                   expr: true is not null
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: true is not null
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: null is null
-                        type: boolean
-                        expr: 1 is not null
-                        type: boolean
-                        expr: 'my string' is not null
-                        type: boolean
-                  outputColumnNames: _col0, _col1, _col2
-                  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: null is null
+                      type: boolean
+                      expr: 1 is not null
+                      type: boolean
+                      expr: 'my string' is not null
+                      type: boolean
+                outputColumnNames: _col0, _col1, _col2
+                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
@@ -127,26 +123,22 @@ STAGE PLANS:
               predicate:
                   expr: (lint is not null and (not mstringstring is null))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (lint is not null and (not mstringstring is null))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: lint is not null
-                        type: boolean
-                        expr: lintstring is not null
-                        type: boolean
-                        expr: mstringstring is not null
-                        type: boolean
-                  outputColumnNames: _col0, _col1, _col2
-                  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: lint is not null
+                      type: boolean
+                      expr: lintstring is not null
+                      type: boolean
+                      expr: mstringstring is not null
+                      type: boolean
+                outputColumnNames: _col0, _col1, _col2
+                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/udf_like.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_like.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_like.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_like.q.out Wed Jul 13 16:49:22 2011
@@ -41,43 +41,39 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: ('_%_' like '%\_\%\_%')
-                        type: boolean
-                        expr: ('__' like '%\_\%\_%')
-                        type: boolean
-                        expr: ('%%_%_' like '%\_\%\_%')
-                        type: boolean
-                        expr: ('%_%_%' like '%\%\_\%')
-                        type: boolean
-                        expr: ('_%_' like '\%\_%')
-                        type: boolean
-                        expr: ('%__' like '__\%%')
-                        type: boolean
-                        expr: ('_%' like '\_\%\_\%%')
-                        type: boolean
-                        expr: ('_%' like '\_\%_%')
-                        type: boolean
-                        expr: ('%_' like '\%\_')
-                        type: boolean
-                        expr: ('ab' like '\%\_')
-                        type: boolean
-                        expr: ('ab' like '_a%')
-                        type: boolean
-                        expr: ('ab' like 'a')
-                        type: boolean
-                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11
-                  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: ('_%_' like '%\_\%\_%')
+                      type: boolean
+                      expr: ('__' like '%\_\%\_%')
+                      type: boolean
+                      expr: ('%%_%_' like '%\_\%\_%')
+                      type: boolean
+                      expr: ('%_%_%' like '%\%\_\%')
+                      type: boolean
+                      expr: ('_%_' like '\%\_%')
+                      type: boolean
+                      expr: ('%__' like '__\%%')
+                      type: boolean
+                      expr: ('_%' like '\_\%\_\%%')
+                      type: boolean
+                      expr: ('_%' like '\_\%_%')
+                      type: boolean
+                      expr: ('%_' like '\%\_')
+                      type: boolean
+                      expr: ('ab' like '\%\_')
+                      type: boolean
+                      expr: ('ab' like '_a%')
+                      type: boolean
+                      expr: ('ab' like 'a')
+                      type: boolean
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11
+                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/udf_lower.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_lower.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_lower.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_lower.q.out Wed Jul 13 16:49:22 2011
@@ -36,23 +36,19 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: lower('AbC 123')
-                        type: string
-                        expr: upper('AbC 123')
-                        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: lower('AbC 123')
+                      type: string
+                      expr: upper('AbC 123')
+                      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/udf_minute.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_minute.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_minute.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_minute.q.out Wed Jul 13 16:49:22 2011
@@ -40,25 +40,21 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: minute('2009-08-07 13:14:15')
-                        type: int
-                        expr: minute('13:14:15')
-                        type: int
-                        expr: minute('2009-08-07')
-                        type: int
-                  outputColumnNames: _col0, _col1, _col2
-                  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: minute('2009-08-07 13:14:15')
+                      type: int
+                      expr: minute('13:14:15')
+                      type: int
+                      expr: minute('2009-08-07')
+                      type: int
+                outputColumnNames: _col0, _col1, _col2
+                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/udf_notequal.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_notequal.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_notequal.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_notequal.q.out Wed Jul 13 16:49:22 2011
@@ -48,23 +48,19 @@ STAGE PLANS:
               predicate:
                   expr: (key <> '302')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key <> '302')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        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: key
+                      type: string
+                      expr: value
+                      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
@@ -610,23 +606,19 @@ STAGE PLANS:
               predicate:
                   expr: (key <> '302')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key <> '302')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        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: key
+                      type: string
+                      expr: value
+                      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/udf_parse_url.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_parse_url.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_parse_url.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_parse_url.q.out Wed Jul 13 16:49:22 2011
@@ -63,41 +63,37 @@ STAGE PLANS:
               predicate:
                   expr: (key = 86)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 86)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'HOST')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PATH')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'REF')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k2')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k1')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k3')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'FILE')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PROTOCOL')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'USERINFO')
-                        type: string
-                        expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'AUTHORITY')
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10
-                  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: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'HOST')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PATH')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'REF')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k2')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k1')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k3')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'FILE')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PROTOCOL')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'USERINFO')
+                      type: string
+                      expr: parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'AUTHORITY')
+                      type: string
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10
+                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