You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/03/02 23:38:08 UTC

svn commit: r1451954 [20/27] - in /hive/branches/ptf-windowing: ./ cli/src/java/org/apache/hadoop/hive/cli/ common/src/java/conf/ common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src/test/results/clientpositive/ data/conf/ data/files/ hbase-h...

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_gby2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_gby2.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_gby2.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_gby2.q.out Sat Mar  2 22:37:59 2013
@@ -31,38 +31,34 @@ STAGE PLANS:
               predicate:
                   expr: ((value > 'val_10') and (value > 'val_200'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (value > 'val_10')
-                    type: boolean
-                Select Operator
-                  expressions:
+              Select Operator
+                expressions:
+                      expr: value
+                      type: string
+                      expr: key
+                      type: string
+                outputColumnNames: value, key
+                Group By Operator
+                  aggregations:
+                        expr: count(key)
+                  bucketGroup: false
+                  keys:
                         expr: value
                         type: string
-                        expr: key
-                        type: string
-                  outputColumnNames: value, key
-                  Group By Operator
-                    aggregations:
-                          expr: count(key)
-                    bucketGroup: false
-                    keys:
-                          expr: value
+                  mode: hash
+                  outputColumnNames: _col0, _col1
+                  Reduce Output Operator
+                    key expressions:
+                          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: bigint
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col1
+                          type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -255,28 +251,21 @@ STAGE PLANS:
                     expr: _col1
                     type: bigint
               outputColumnNames: _col0, _col1
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: string
+              Group By Operator
+                aggregations:
+                      expr: max(_col0)
+                bucketGroup: false
+                keys:
                       expr: _col1
                       type: bigint
+                mode: hash
                 outputColumnNames: _col0, _col1
-                Group By Operator
-                  aggregations:
-                        expr: max(_col0)
-                  bucketGroup: false
-                  keys:
-                        expr: _col1
-                        type: bigint
-                  mode: hash
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                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/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_gby_join.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_gby_join.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_gby_join.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_gby_join.q.out Sat Mar  2 22:37:59 2013
@@ -37,35 +37,31 @@ STAGE PLANS:
               predicate:
                   expr: (((((key > '1') and (key < '400')) and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key <> '4'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > '1')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 < '400')
-                        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
-                            expr: _col1
-                            type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < '400')
+                      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
+                          expr: _col1
+                          type: string
         src2:src 
           TableScan
             alias: src
@@ -73,31 +69,27 @@ STAGE PLANS:
               predicate:
                   expr: ((((key > '2') and (key < '400')) and (key <> '4')) and (key > '20'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > '2')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                  outputColumnNames: _col0
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 < '400')
-                        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
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                outputColumnNames: _col0
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < '400')
+                      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
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join.q.out Sat Mar  2 22:37:59 2013
@@ -34,35 +34,31 @@ STAGE PLANS:
               predicate:
                   expr: (((((key > '1') and (key < '400')) and (key > '20')) and ((value < 'val_50') or (key > '2'))) and (key <> '4'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > '1')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 < '400')
-                        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
-                            expr: _col1
-                            type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < '400')
+                      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
+                          expr: _col1
+                          type: string
         src2:src 
           TableScan
             alias: src
@@ -70,35 +66,31 @@ STAGE PLANS:
               predicate:
                   expr: ((((key > '2') and (key < '400')) and (key <> '4')) and (key > '20'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > '2')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 < '400')
-                        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
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < '400')
+                      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:
         Join Operator
           condition map:

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join2.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join2.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join2.q.out Sat Mar  2 22:37:59 2013
@@ -41,35 +41,31 @@ STAGE PLANS:
               predicate:
                   expr: (((((key <> '302') and (key < '400')) and (key <> '311')) and ((value <> 'val_50') or (key > '1'))) and (key <> '14'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key <> '302')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 < '400')
-                        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
-                            expr: _col1
-                            type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < '400')
+                      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
+                          expr: _col1
+                          type: string
         src2:src 
           TableScan
             alias: src
@@ -77,35 +73,31 @@ STAGE PLANS:
               predicate:
                   expr: ((((key <> '305') and (key < '400')) and (key <> '14')) and (key <> '311'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key <> '305')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 < '400')
-                        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
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < '400')
+                      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:
         Join Operator
           condition map:
@@ -151,29 +143,25 @@ STAGE PLANS:
               predicate:
                   expr: ((key <> '306') and (sqrt(key) <> 13))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key <> '306')
-                    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: _col1
                         type: string
-                        expr: value
+                  sort order: +
+                  Map-reduce partition columns:
+                        expr: _col1
+                        type: string
+                  tag: 1
+                  value expressions:
+                        expr: _col0
                         type: string
-                  outputColumnNames: _col0, _col1
-                  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
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join3.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join3.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_join3.q.out Sat Mar  2 22:37:59 2013
@@ -40,35 +40,31 @@ STAGE PLANS:
               predicate:
                   expr: ((((((key <> '11') and (key < '400')) and (key > '0')) and ((value <> 'val_500') or (key > '1'))) and (key <> '4')) and (key <> '1'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key <> '11')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 < '400')
-                        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
-                            expr: _col1
-                            type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < '400')
+                      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
+                          expr: _col1
+                          type: string
         src2:src 
           TableScan
             alias: src
@@ -76,35 +72,31 @@ STAGE PLANS:
               predicate:
                   expr: (((((key <> '12') and (key < '400')) and (key <> '4')) and (key > '0')) and (key <> '1'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key <> '12')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 < '400')
-                        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
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < '400')
+                      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
         src3:src 
           TableScan
             alias: src
@@ -112,31 +104,27 @@ STAGE PLANS:
               predicate:
                   expr: (((((key <> '13') and (key < '400')) and (key <> '1')) and (key > '0')) and (key <> '4'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key <> '13')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                  outputColumnNames: _col0
-                  Filter Operator
-                    predicate:
-                        expr: (_col0 < '400')
-                        type: boolean
-                    Reduce Output Operator
-                      key expressions:
-                            expr: _col0
-                            type: string
-                      sort order: +
-                      Map-reduce partition columns:
-                            expr: _col0
-                            type: string
-                      tag: 2
-                      value expressions:
-                            expr: _col0
-                            type: string
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                outputColumnNames: _col0
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < '400')
+                      type: boolean
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: 2
+                    value expressions:
+                          expr: _col0
+                          type: string
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_multi_insert.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_multi_insert.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_multi_insert.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_multi_insert.q.out Sat Mar  2 22:37:59 2013
@@ -88,74 +88,55 @@ STAGE PLANS:
                 type: boolean
             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.mi1
+              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.mi1
           Filter Operator
             predicate:
                 expr: ((_col0 >= 100.0) and (_col0 < 200.0))
                 type: boolean
             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: 2
-                  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.mi2
+              File Output Operator
+                compressed: false
+                GlobalTableId: 2
+                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.mi2
           Filter Operator
             predicate:
                 expr: ((_col0 >= 200.0) and (_col0 < 300.0))
                 type: boolean
             Select Operator
               expressions:
-                    expr: _col0
-                    type: string
+                    expr: UDFToInteger(_col0)
+                    type: int
               outputColumnNames: _col0
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                outputColumnNames: _col0
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 3
-                  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.mi3
+              File Output Operator
+                compressed: false
+                GlobalTableId: 3
+                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.mi3
           Filter Operator
             predicate:
                 expr: (_col0 >= 300.0)
@@ -1395,74 +1376,55 @@ STAGE PLANS:
                 type: boolean
             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.mi1
+              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.mi1
           Filter Operator
             predicate:
                 expr: ((_col0 >= 100.0) and (_col0 < 200.0))
                 type: boolean
             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: 2
-                  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.mi2
+              File Output Operator
+                compressed: false
+                GlobalTableId: 2
+                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.mi2
           Filter Operator
             predicate:
                 expr: ((_col0 >= 200.0) and (_col0 < 300.0))
                 type: boolean
             Select Operator
               expressions:
-                    expr: _col0
-                    type: string
+                    expr: UDFToInteger(_col0)
+                    type: int
               outputColumnNames: _col0
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                outputColumnNames: _col0
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 3
-                  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.mi3
+              File Output Operator
+                compressed: false
+                GlobalTableId: 3
+                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.mi3
           Filter Operator
             predicate:
                 expr: (_col0 >= 300.0)

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_random.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_random.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_random.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_random.q.out Sat Mar  2 22:37:59 2013
@@ -54,29 +54,25 @@ STAGE PLANS:
               predicate:
                   expr: (key > '2')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > '2')
-                    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: +
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                    tag: 1
-                    value expressions:
-                          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: +
+                  Map-reduce partition columns:
+                        expr: _col0
+                        type: string
+                  tag: 1
+                  value expressions:
+                        expr: _col1
+                        type: string
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out Sat Mar  2 22:37:59 2013
@@ -188,21 +188,12 @@ STAGE PLANS:
                     expr: _col6
                     type: int
               outputColumnNames: _col0, _col1, _col2
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: int
-                      expr: _col1
-                      type: int
-                      expr: _col2
-                      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
+              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
@@ -290,21 +281,12 @@ STAGE PLANS:
                   expr: _col1
                   type: int
             outputColumnNames: _col0, _col1, _col2
-            Select Operator
-              expressions:
-                    expr: _col0
-                    type: int
-                    expr: _col1
-                    type: int
-                    expr: _col2
-                    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
+            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/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_udf_col.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_udf_col.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_udf_col.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_udf_col.q.out Sat Mar  2 22:37:59 2013
@@ -26,34 +26,30 @@ STAGE PLANS:
               predicate:
                   expr: (key = 100.0)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 100.0)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: rand()
-                        type: double
-                  outputColumnNames: _col0, _col2
-                  Filter Operator
-                    predicate:
-                        expr: (_col2 <= 0.1)
-                        type: boolean
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col2
-                            type: double
-                      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: rand()
+                      type: double
+                outputColumnNames: _col0, _col2
+                Filter Operator
+                  predicate:
+                      expr: (_col2 <= 0.1)
+                      type: boolean
+                  Select Operator
+                    expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col2
+                          type: double
+                    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
@@ -92,46 +88,42 @@ STAGE PLANS:
               predicate:
                   expr: (key = 100.0)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 100.0)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: rand()
-                        type: double
-                  outputColumnNames: _col0, _col2
-                  Filter Operator
-                    predicate:
-                        expr: (_col2 <= 0.1)
-                        type: boolean
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col2
-                            type: double
-                      outputColumnNames: _col0, _col1
-                      Filter Operator
-                        predicate:
-                            expr: (_col1 > 0.1)
-                            type: boolean
-                        Select Operator
-                          expressions:
-                                expr: _col0
-                                type: string
-                                expr: _col1
-                                type: double
-                          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: rand()
+                      type: double
+                outputColumnNames: _col0, _col2
+                Filter Operator
+                  predicate:
+                      expr: (_col2 <= 0.1)
+                      type: boolean
+                  Select Operator
+                    expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col2
+                          type: double
+                    outputColumnNames: _col0, _col1
+                    Filter Operator
+                      predicate:
+                          expr: (_col1 > 0.1)
+                          type: boolean
+                      Select Operator
+                        expressions:
+                              expr: _col0
+                              type: string
+                              expr: _col1
+                              type: double
+                        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
@@ -166,38 +158,34 @@ STAGE PLANS:
               predicate:
                   expr: (key = 100.0)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 100.0)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: rand()
-                        type: double
-                        expr: hex(4)
-                        type: string
-                  outputColumnNames: _col0, _col2, _col3
-                  Filter Operator
-                    predicate:
-                        expr: (_col3 <= 3.0)
-                        type: boolean
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col2
-                            type: double
-                            expr: _col3
-                            type: string
-                      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: key
+                      type: string
+                      expr: rand()
+                      type: double
+                      expr: hex(4)
+                      type: string
+                outputColumnNames: _col0, _col2, _col3
+                Filter Operator
+                  predicate:
+                      expr: (_col3 <= 3.0)
+                      type: boolean
+                  Select Operator
+                    expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col2
+                          type: double
+                          expr: _col3
+                          type: string
+                    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
@@ -232,38 +220,34 @@ STAGE PLANS:
               predicate:
                   expr: (key = 100.0)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 100.0)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: rand()
-                        type: double
-                        expr: (value * 10)
-                        type: double
-                  outputColumnNames: _col0, _col2, _col3
-                  Filter Operator
-                    predicate:
-                        expr: (_col3 <= 200.0)
-                        type: boolean
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col2
-                            type: double
-                            expr: _col3
-                            type: double
-                      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: key
+                      type: string
+                      expr: rand()
+                      type: double
+                      expr: (value * 10)
+                      type: double
+                outputColumnNames: _col0, _col2, _col3
+                Filter Operator
+                  predicate:
+                      expr: (_col3 <= 200.0)
+                      type: boolean
+                  Select Operator
+                    expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col2
+                          type: double
+                          expr: _col3
+                          type: double
+                    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
@@ -378,20 +362,13 @@ STAGE PLANS:
                           expr: _col2
                           type: double
                     outputColumnNames: _col0, _col1
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col1
-                            type: double
-                      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
+                    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/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_union.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_union.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_union.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_union.q.out Sat Mar  2 22:37:59 2013
@@ -34,35 +34,31 @@ STAGE PLANS:
               predicate:
                   expr: (((key < '100') and (key > '4')) and (value > 'val_4'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key < '100')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Union
-                    Filter Operator
-                      predicate:
-                          expr: ((_col0 > '4') and (_col1 > 'val_4'))
-                          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: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Union
+                  Filter Operator
+                    predicate:
+                        expr: ((_col0 > '4') and (_col1 > 'val_4'))
+                        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
         null-subquery2:unioned_query-subquery2:src 
           TableScan
             alias: src
@@ -70,35 +66,31 @@ STAGE PLANS:
               predicate:
                   expr: (((key > '150') and (key > '4')) and (value > 'val_4'))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key > '150')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Union
-                    Filter Operator
-                      predicate:
-                          expr: ((_col0 > '4') and (_col1 > 'val_4'))
-                          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: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Union
+                  Filter Operator
+                    predicate:
+                        expr: ((_col0 > '4') and (_col1 > 'val_4'))
+                        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
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_union_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_union_view.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_union_view.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ppd_union_view.q.out Sat Mar  2 22:37:59 2013
@@ -389,32 +389,23 @@ STAGE PLANS:
                       expr: _col2
                       type: string
                 outputColumnNames: _col0, _col1, _col2
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                        expr: _col2
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-#### A masked pattern was here ####
-                    NumFilesPerFileSink: 1
-#### A masked pattern was here ####
-                    table:
-                        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
-                          escape.delim \
-                          serialization.format 1
-                    TotalFiles: 1
-                    GatherStats: false
-                    MultiFileSpray: false
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+#### A masked pattern was here ####
+                  NumFilesPerFileSink: 1
+#### A masked pattern was here ####
+                  table:
+                      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
+                        escape.delim \
+                        serialization.format 1
+                  TotalFiles: 1
+                  GatherStats: false
+                  MultiFileSpray: false
         t1-subquery1:subq-subquery1:t1_new 
           TableScan
             alias: t1_new
@@ -443,32 +434,23 @@ STAGE PLANS:
                           expr: _col2
                           type: string
                     outputColumnNames: _col0, _col1, _col2
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col1
-                            type: string
-                            expr: _col2
-                            type: string
-                      outputColumnNames: _col0, _col1, _col2
-                      File Output Operator
-                        compressed: false
-                        GlobalTableId: 0
-#### A masked pattern was here ####
-                        NumFilesPerFileSink: 1
-#### A masked pattern was here ####
-                        table:
-                            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
-                              escape.delim \
-                              serialization.format 1
-                        TotalFiles: 1
-                        GatherStats: false
-                        MultiFileSpray: false
+                    File Output Operator
+                      compressed: false
+                      GlobalTableId: 0
+#### A masked pattern was here ####
+                      NumFilesPerFileSink: 1
+#### A masked pattern was here ####
+                      table:
+                          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
+                            escape.delim \
+                            serialization.format 1
+                      TotalFiles: 1
+                      GatherStats: false
+                      MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -692,6 +674,37 @@ STAGE PLANS:
                       expr: _col2
                       type: string
                 outputColumnNames: _col0, _col1, _col2
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+#### A masked pattern was here ####
+                  NumFilesPerFileSink: 1
+#### A masked pattern was here ####
+                  table:
+                      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
+                        escape.delim \
+                        serialization.format 1
+                  TotalFiles: 1
+                  GatherStats: false
+                  MultiFileSpray: false
+        t1-subquery1:subq-subquery1:t1_new 
+          TableScan
+            alias: t1_new
+            GatherStats: false
+            Select Operator
+              expressions:
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+                    expr: ds
+                    type: string
+              outputColumnNames: _col0, _col1, _col2
+              Union
                 Select Operator
                   expressions:
                         expr: _col0
@@ -718,55 +731,6 @@ STAGE PLANS:
                     TotalFiles: 1
                     GatherStats: false
                     MultiFileSpray: false
-        t1-subquery1:subq-subquery1:t1_new 
-          TableScan
-            alias: t1_new
-            GatherStats: false
-            Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
-                    expr: ds
-                    type: string
-              outputColumnNames: _col0, _col1, _col2
-              Union
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                        expr: _col2
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
-                          expr: _col2
-                          type: string
-                    outputColumnNames: _col0, _col1, _col2
-                    File Output Operator
-                      compressed: false
-                      GlobalTableId: 0
-#### A masked pattern was here ####
-                      NumFilesPerFileSink: 1
-#### A masked pattern was here ####
-                      table:
-                          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
-                            escape.delim \
-                            serialization.format 1
-                      TotalFiles: 1
-                      GatherStats: false
-                      MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out Sat Mar  2 22:37:59 2013
@@ -1204,30 +1204,23 @@ STAGE PLANS:
               expressions:
                     expr: l_shipdate
                     type: string
-                    expr: l_orderkey
-                    type: int
+                    expr: UDFToLong(l_orderkey)
+                    type: bigint
               outputColumnNames: _col0, _col1
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: string
-                      expr: UDFToLong(_col1)
-                      type: bigint
-                outputColumnNames: _col0, _col1
-                Union
-                  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
+              Union
+                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
@@ -2938,19 +2931,12 @@ STAGE PLANS:
                   expr: _col1
                   type: int
             outputColumnNames: _col0, _col1
-            Select Operator
-              expressions:
-                    expr: _col0
-                    type: int
-                    expr: _col1
-                    type: int
-              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
+            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/branches/ptf-windowing/ql/src/test/results/clientpositive/quote1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/quote1.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/quote1.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/quote1.q.out Sat Mar  2 22:37:59 2013
@@ -37,26 +37,19 @@ STAGE PLANS:
                   type: boolean
               Select Operator
                 expressions:
-                      expr: key
-                      type: string
+                      expr: UDFToInteger(key)
+                      type: int
                       expr: value
                       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-7
     Conditional Operator

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_merge1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_merge1.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_merge1.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_merge1.q.out Sat Mar  2 22:37:59 2013
@@ -54,30 +54,21 @@ STAGE PLANS:
             alias: src
             Select Operator
               expressions:
-                    expr: key
-                    type: string
+                    expr: UDFToInteger(key)
+                    type: int
                     expr: value
                     type: string
                     expr: pmod(hash(key), 100)
                     type: int
               outputColumnNames: _col0, _col1, _col2
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                      expr: _col1
-                      type: string
-                      expr: _col2
-                      type: int
-                outputColumnNames: _col0, _col1, _col2
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-                      name: default.rcfile_merge1
+              File Output Operator
+                compressed: false
+                GlobalTableId: 1
+                table:
+                    input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+                    name: default.rcfile_merge1
 
   Stage: Stage-7
     Conditional Operator
@@ -675,30 +666,21 @@ STAGE PLANS:
             alias: src
             Select Operator
               expressions:
-                    expr: key
-                    type: string
+                    expr: UDFToInteger(key)
+                    type: int
                     expr: value
                     type: string
                     expr: pmod(hash(key), 100)
                     type: int
               outputColumnNames: _col0, _col1, _col2
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                      expr: _col1
-                      type: string
-                      expr: _col2
-                      type: int
-                outputColumnNames: _col0, _col1, _col2
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-                      name: default.rcfile_merge1b
+              File Output Operator
+                compressed: false
+                GlobalTableId: 1
+                table:
+                    input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+                    name: default.rcfile_merge1b
 
   Stage: Stage-7
     Conditional Operator

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_merge2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_merge2.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_merge2.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_merge2.q.out Sat Mar  2 22:37:59 2013
@@ -43,8 +43,8 @@ STAGE PLANS:
             alias: src
             Select Operator
               expressions:
-                    expr: key
-                    type: string
+                    expr: UDFToInteger(key)
+                    type: int
                     expr: value
                     type: string
                     expr: pmod(hash(key), 10)
@@ -52,25 +52,14 @@ STAGE PLANS:
                     expr: pmod(hash(value), 10)
                     type: int
               outputColumnNames: _col0, _col1, _col2, _col3
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                      expr: _col1
-                      type: string
-                      expr: _col2
-                      type: int
-                      expr: _col3
-                      type: int
-                outputColumnNames: _col0, _col1, _col2, _col3
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-                      name: default.rcfile_merge2a
+              File Output Operator
+                compressed: false
+                GlobalTableId: 1
+                table:
+                    input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+                    name: default.rcfile_merge2a
 
   Stage: Stage-7
     Conditional Operator

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_null_value.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_null_value.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_null_value.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/rcfile_null_value.q.out Sat Mar  2 22:37:59 2013
@@ -166,45 +166,23 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Select Operator
             expressions:
-                  expr: _col0
-                  type: string
+                  expr: UDFToInteger(_col0)
+                  type: int
                   expr: _col1
                   type: string
-                  expr: _col2
-                  type: string
+                  expr: UDFToInteger(_col2)
+                  type: int
                   expr: _col3
                   type: string
             outputColumnNames: _col0, _col1, _col2, _col3
-            Select Operator
-              expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: string
-                    expr: _col2
-                    type: string
-                    expr: _col3
-                    type: string
-              outputColumnNames: _col0, _col1, _col2, _col3
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                      expr: _col1
-                      type: string
-                      expr: UDFToInteger(_col2)
-                      type: int
-                      expr: _col3
-                      type: string
-                outputColumnNames: _col0, _col1, _col2, _col3
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
-                      name: default.dest1_rc
+            File Output Operator
+              compressed: false
+              GlobalTableId: 1
+              table:
+                  input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
+                  name: default.dest1_rc
 
   Stage: Stage-0
     Move Operator

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/repair.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/repair.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/repair.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/repair.q.out Sat Mar  2 22:37:59 2013
@@ -3,33 +3,9 @@ PREHOOK: type: CREATETABLE
 POSTHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@repairtable
-PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.23)
--- When you invoke the mkdir command using versions of Hadoop up to and including 0.23,
--- they behave as if you had specified the -p option,
--- *but* they don't actually support the -p option.
-
--- Support for the -p option first appeared in 1.0 and 2.0,
--- but they maintain backward compatibility with older versions,
--- so they let you include -p, but if you don't they still act like you did.
-
--- HADOOP-8551 breaks backward compatibility with 0.23 and older versions by
--- requiring you to explicitly specify -p if you require that behavior.
-
-MSCK TABLE repairtable
+PREHOOK: query: MSCK TABLE repairtable
 PREHOOK: type: MSCK
-POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.23)
--- When you invoke the mkdir command using versions of Hadoop up to and including 0.23,
--- they behave as if you had specified the -p option,
--- *but* they don't actually support the -p option.
-
--- Support for the -p option first appeared in 1.0 and 2.0,
--- but they maintain backward compatibility with older versions,
--- so they let you include -p, but if you don't they still act like you did.
-
--- HADOOP-8551 breaks backward compatibility with 0.23 and older versions by
--- requiring you to explicitly specify -p if you require that behavior.
-
-MSCK TABLE repairtable
+POSTHOOK: query: MSCK TABLE repairtable
 POSTHOOK: type: MSCK
 PREHOOK: query: MSCK TABLE repairtable
 PREHOOK: type: MSCK