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 [21/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/sample1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample1.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample1.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample1.q.out Sat Mar  2 22:37:59 2013
@@ -43,8 +43,8 @@ STAGE PLANS:
                   type: boolean
               Select Operator
                 expressions:
-                      expr: key
-                      type: string
+                      expr: UDFToInteger(key)
+                      type: int
                       expr: value
                       type: string
                       expr: ds
@@ -52,41 +52,30 @@ STAGE PLANS:
                       expr: hr
                       type: string
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Select Operator
-                  expressions:
-                        expr: UDFToInteger(_col0)
-                        type: int
-                        expr: _col1
-                        type: string
-                        expr: _col2
-                        type: string
-                        expr: _col3
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-#### 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:
-                          bucket_count -1
-                          columns key,value,dt,hr
-                          columns.types int:string:string:string
-#### A masked pattern was here ####
-                          name default.dest1
-                          serialization.ddl struct dest1 { i32 key, string value, string dt, string hr}
-                          serialization.format 1
-                          serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-#### A masked pattern was here ####
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                        name: default.dest1
-                    TotalFiles: 1
-                    GatherStats: true
-                    MultiFileSpray: false
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+#### 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:
+                        bucket_count -1
+                        columns key,value,dt,hr
+                        columns.types int:string:string:string
+#### A masked pattern was here ####
+                        name default.dest1
+                        serialization.ddl struct dest1 { i32 key, string value, string dt, string hr}
+                        serialization.format 1
+                        serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+#### A masked pattern was here ####
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      name: default.dest1
+                  TotalFiles: 1
+                  GatherStats: true
+                  MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample7.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample7.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample7.q.out Sat Mar  2 22:37:59 2013
@@ -39,44 +39,39 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate:
-                  expr: (key > 100)
+                  expr: ((((hash(key) & 2147483647) % 4) = 0) and (key > 100))
                   type: boolean
-              Filter Operator
-                isSamplingPred: true
-                predicate:
-                    expr: (((hash(key) & 2147483647) % 4) = 0)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: int
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-#### 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:
-                          bucket_count -1
-                          columns key,value
-                          columns.types int:string
-#### A masked pattern was here ####
-                          name default.dest1
-                          serialization.ddl struct dest1 { i32 key, string value}
-                          serialization.format 1
-                          serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-#### A masked pattern was here ####
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                        name: default.dest1
-                    TotalFiles: 1
-                    GatherStats: true
-                    MultiFileSpray: false
+              Select Operator
+                expressions:
+                      expr: key
+                      type: int
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+#### 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:
+                        bucket_count -1
+                        columns key,value
+                        columns.types int:string
+#### A masked pattern was here ####
+                        name default.dest1
+                        serialization.ddl struct dest1 { i32 key, string value}
+                        serialization.format 1
+                        serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+#### A masked pattern was here ####
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      name: default.dest1
+                  TotalFiles: 1
+                  GatherStats: true
+                  MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample9.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample9.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/sample9.q.out Sat Mar  2 22:37:59 2013
@@ -33,30 +33,23 @@ STAGE PLANS:
                       expr: value
                       type: string
                 outputColumnNames: _col0, _col1
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: int
-                        expr: _col1
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
 #### A masked pattern was here ####
-                    NumFilesPerFileSink: 1
+                  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
-                          columns.types int:string
-                          escape.delim \
-                          serialization.format 1
-                    TotalFiles: 1
-                    GatherStats: false
-                    MultiFileSpray: false
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      properties:
+                        columns _col0,_col1
+                        columns.types int: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/select_as_omitted.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/select_as_omitted.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/select_as_omitted.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/select_as_omitted.q.out Sat Mar  2 22:37:59 2013
@@ -33,24 +33,17 @@ STAGE PLANS:
                     expr: value
                     type: string
               outputColumnNames: _col0, _col1
-              Select Operator
-                expressions:
+              Reduce Output Operator
+                key expressions:
+                      expr: _col0
+                      type: string
+                sort order: +
+                tag: -1
+                value expressions:
                       expr: _col0
                       type: string
                       expr: _col1
                       type: string
-                outputColumnNames: _col0, _col1
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
       Reduce Operator Tree:
         Extract
           Limit

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/select_transform_hint.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/select_transform_hint.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/select_transform_hint.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/select_transform_hint.q.out Sat Mar  2 22:37:59 2013
@@ -64,24 +64,17 @@ STAGE PLANS:
                       expr: _col1
                       type: string
                 outputColumnNames: _col0, _col1
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Transform Operator
-                    command: cat
-                    output info:
+                Transform Operator
+                  command: cat
+                  output info:
+                      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
-                    File Output Operator
-                      compressed: false
-                      GlobalTableId: 0
-                      table:
-                          input format: org.apache.hadoop.mapred.TextInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
       Local Work:
         Map Reduce Local Work
 

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/semijoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/semijoin.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/semijoin.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/semijoin.q.out Sat Mar  2 22:37:59 2013
@@ -784,27 +784,22 @@ STAGE PLANS:
                       expr: key
                       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:
@@ -911,31 +906,24 @@ STAGE PLANS:
                       expr: value
                       type: string
                 outputColumnNames: _col0, _col1
-                Select Operator
-                  expressions:
+                Group By Operator
+                  bucketGroup: false
+                  keys:
                         expr: _col0
                         type: int
                         expr: _col1
                         type: string
+                  mode: hash
                   outputColumnNames: _col0, _col1
-                  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
-                          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
+                    tag: 1
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -1039,27 +1027,22 @@ STAGE PLANS:
                       expr: key
                       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:
@@ -1197,20 +1180,15 @@ STAGE PLANS:
                       expr: _col0
                       type: int
                 outputColumnNames: _col0
-                Select Operator
-                  expressions:
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: int
+                  sort order: +
+                  tag: -1
+                  value expressions:
                         expr: _col0
                         type: int
-                  outputColumnNames: _col0
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: int
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: int
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:
@@ -1794,20 +1772,15 @@ STAGE PLANS:
                       expr: _col0
                       type: int
                 outputColumnNames: _col0
-                Select Operator
-                  expressions:
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: int
+                  sort order: +
+                  tag: -1
+                  value expressions:
                         expr: _col0
                         type: int
-                  outputColumnNames: _col0
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: int
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: int
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/show_functions.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/show_functions.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/show_functions.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/show_functions.q.out Sat Mar  2 22:37:59 2013
@@ -120,6 +120,7 @@ printf
 radians
 rand
 reflect
+reflect2
 regexp
 regexp_extract
 regexp_replace

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/skewjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/skewjoin.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/skewjoin.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/skewjoin.q.out Sat Mar  2 22:37:59 2013
@@ -111,26 +111,19 @@ STAGE PLANS:
           outputColumnNames: _col0, _col5
           Select Operator
             expressions:
-                  expr: _col0
-                  type: string
+                  expr: UDFToInteger(_col0)
+                  type: int
                   expr: _col5
                   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.dest_j1
+            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.dest_j1
 
   Stage: Stage-5
     Conditional Operator
@@ -171,26 +164,19 @@ STAGE PLANS:
               Position of Big Table: 0
               Select Operator
                 expressions:
-                      expr: _col0
-                      type: string
+                      expr: UDFToInteger(_col0)
+                      type: int
                       expr: _col5
                       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.dest_j1
+                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.dest_j1
       Local Work:
         Map Reduce Local Work
 
@@ -1191,7 +1177,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: ((key < 100.0) and (key < 80.0))
+                  expr: ((key < 80.0) and (key < 100.0))
                   type: boolean
               Select Operator
                 expressions:
@@ -1241,7 +1227,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: ((key < 80.0) and (key < 100.0))
+                  expr: ((key < 100.0) and (key < 80.0))
                   type: boolean
               Select Operator
                 expressions:
@@ -1574,28 +1560,21 @@ STAGE PLANS:
                       expr: _col5
                       type: string
                 outputColumnNames: _col0, _col5
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col5
-                        type: string
-                  outputColumnNames: _col0, _col5
-                  Group By Operator
-                    aggregations:
-                          expr: sum(hash(_col0))
-                          expr: sum(hash(_col5))
-                    bucketGroup: false
-                    mode: hash
-                    outputColumnNames: _col0, _col1
-                    Reduce Output Operator
-                      sort order: 
-                      tag: -1
-                      value expressions:
-                            expr: _col0
-                            type: bigint
-                            expr: _col1
-                            type: bigint
+                Group By Operator
+                  aggregations:
+                        expr: sum(hash(_col0))
+                        expr: sum(hash(_col5))
+                  bucketGroup: false
+                  mode: hash
+                  outputColumnNames: _col0, _col1
+                  Reduce Output Operator
+                    sort order: 
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: bigint
+                          expr: _col1
+                          type: bigint
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin9.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin9.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin9.q.out Sat Mar  2 22:37:59 2013
@@ -56,45 +56,32 @@ STAGE PLANS:
                 Position of Big Table: 0
                 Select Operator
                   expressions:
-                        expr: _col0
-                        type: int
-                        expr: _col2
-                        type: string
                         expr: _col5
                         type: int
                         expr: _col6
                         type: string
                         expr: _col7
                         type: string
-                  outputColumnNames: _col0, _col2, _col5, _col6, _col7
-                  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: 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,_col3
-                            columns.types int:string:string:int
-                            escape.delim \
-                            serialization.format 1
-                      TotalFiles: 1
-                      GatherStats: false
-                      MultiFileSpray: false
+                        expr: _col0
+                        type: int
+                  outputColumnNames: _col0, _col1, _col2, _col3
+                  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,_col3
+                          columns.types int:string:string:int
+                          escape.delim \
+                          serialization.format 1
+                    TotalFiles: 1
+                    GatherStats: false
+                    MultiFileSpray: false
       Needs Tagging: false
 
   Stage: Stage-0
@@ -164,45 +151,32 @@ STAGE PLANS:
                 Position of Big Table: 1
                 Select Operator
                   expressions:
-                        expr: _col0
-                        type: int
-                        expr: _col2
-                        type: string
                         expr: _col5
                         type: int
                         expr: _col6
                         type: string
                         expr: _col7
                         type: string
-                  outputColumnNames: _col0, _col2, _col5, _col6, _col7
-                  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: 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,_col3
-                            columns.types int:string:string:int
-                            escape.delim \
-                            serialization.format 1
-                      TotalFiles: 1
-                      GatherStats: false
-                      MultiFileSpray: false
+                        expr: _col0
+                        type: int
+                  outputColumnNames: _col0, _col1, _col2, _col3
+                  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,_col3
+                          columns.types int:string:string:int
+                          escape.delim \
+                          serialization.format 1
+                    TotalFiles: 1
+                    GatherStats: false
+                    MultiFileSpray: false
       Needs Tagging: false
 
   Stage: Stage-0
@@ -305,35 +279,22 @@ STAGE PLANS:
                 Position of Big Table: 0
                 Select Operator
                   expressions:
-                        expr: _col0
-                        type: int
-                        expr: _col2
-                        type: string
                         expr: _col5
                         type: int
                         expr: _col6
                         type: string
                         expr: _col7
                         type: string
-                  outputColumnNames: _col0, _col2, _col5, _col6, _col7
-                  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
-                          name: default.smb_mapjoin9_results
+                        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
+                        name: default.smb_mapjoin9_results
 
   Stage: Stage-7
     Conditional Operator

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out Sat Mar  2 22:37:59 2013
@@ -73,24 +73,13 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                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: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                outputColumnNames: _col0, _col1, _col2, _col3
+                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
@@ -149,24 +138,13 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                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: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                outputColumnNames: _col0, _col1, _col2, _col3
+                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
@@ -230,24 +208,13 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                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: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                outputColumnNames: _col0, _col1, _col2, _col3
+                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
@@ -310,24 +277,13 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                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: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                outputColumnNames: _col0, _col1, _col2, _col3
+                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
@@ -395,24 +351,13 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                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: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                outputColumnNames: _col0, _col1, _col2, _col3
+                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
@@ -471,24 +416,13 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                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: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                outputColumnNames: _col0, _col1, _col2, _col3
+                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
@@ -552,24 +486,13 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                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: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                outputColumnNames: _col0, _col1, _col2, _col3
+                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
@@ -632,24 +555,13 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                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: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                outputColumnNames: _col0, _col1, _col2, _col3
+                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/smb_mapjoin_10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out Sat Mar  2 22:37:59 2013
@@ -109,36 +109,13 @@ STAGE PLANS:
                       type: string
                       expr: _col11
                       type: string
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col7, _col8, _col9, _col10, _col11
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: int
-                        expr: _col1
-                        type: int
-                        expr: _col2
-                        type: int
-                        expr: _col3
-                        type: string
-                        expr: _col4
-                        type: string
-                        expr: _col7
-                        type: int
-                        expr: _col8
-                        type: int
-                        expr: _col9
-                        type: int
-                        expr: _col10
-                        type: string
-                        expr: _col11
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9
+                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/smb_mapjoin_11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out Sat Mar  2 22:37:59 2013
@@ -89,41 +89,34 @@ STAGE PLANS:
                       type: int
                       expr: _col6
                       type: string
-                outputColumnNames: _col0, _col6
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: int
-                        expr: _col6
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-#### A masked pattern was here ####
-                    NumFilesPerFileSink: 1
-                    Static Partition Specification: ds=1/
-#### A masked pattern was here ####
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                        properties:
-                          bucket_count 16
-                          bucket_field_name key
-                          columns key,value
-                          columns.types int:string
-#### A masked pattern was here ####
-                          name default.test_table3
-                          partition_columns ds
-                          serialization.ddl struct test_table3 { i32 key, string value}
-                          serialization.format 1
-                          serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-#### A masked pattern was here ####
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                        name: default.test_table3
-                    TotalFiles: 1
-                    GatherStats: true
-                    MultiFileSpray: false
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+#### A masked pattern was here ####
+                  NumFilesPerFileSink: 1
+                  Static Partition Specification: ds=1/
+#### A masked pattern was here ####
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      properties:
+                        bucket_count 16
+                        bucket_field_name key
+                        columns key,value
+                        columns.types int:string
+#### A masked pattern was here ####
+                        name default.test_table3
+                        partition_columns ds
+                        serialization.ddl struct test_table3 { i32 key, string value}
+                        serialization.format 1
+                        serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+#### A masked pattern was here ####
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      name: default.test_table3
+                  TotalFiles: 1
+                  GatherStats: true
+                  MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out Sat Mar  2 22:37:59 2013
@@ -109,42 +109,35 @@ STAGE PLANS:
                       type: int
                       expr: _col6
                       type: string
-                outputColumnNames: _col0, _col6
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: int
-                        expr: _col6
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-#### A masked pattern was here ####
-                    NumFilesPerFileSink: 1
-                    Static Partition Specification: ds=1/
-#### A masked pattern was here ####
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                        properties:
-                          SORTBUCKETCOLSPREFIX TRUE
-                          bucket_count 16
-                          bucket_field_name key
-                          columns key,value
-                          columns.types int:string
-#### A masked pattern was here ####
-                          name default.test_table3
-                          partition_columns ds
-                          serialization.ddl struct test_table3 { i32 key, string value}
-                          serialization.format 1
-                          serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-#### A masked pattern was here ####
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                        name: default.test_table3
-                    TotalFiles: 1
-                    GatherStats: true
-                    MultiFileSpray: false
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+#### A masked pattern was here ####
+                  NumFilesPerFileSink: 1
+                  Static Partition Specification: ds=1/
+#### A masked pattern was here ####
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      properties:
+                        SORTBUCKETCOLSPREFIX TRUE
+                        bucket_count 16
+                        bucket_field_name key
+                        columns key,value
+                        columns.types int:string
+#### A masked pattern was here ####
+                        name default.test_table3
+                        partition_columns ds
+                        serialization.ddl struct test_table3 { i32 key, string value}
+                        serialization.format 1
+                        serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+#### A masked pattern was here ####
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      name: default.test_table3
+                  TotalFiles: 1
+                  GatherStats: true
+                  MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -339,51 +332,42 @@ STAGE PLANS:
                 expressions:
                       expr: _col0
                       type: int
-                      expr: _col1
+                      expr: concat(_col1, _col6)
                       type: string
-                      expr: _col6
-                      type: string
-                outputColumnNames: _col0, _col1, _col6
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: int
-                        expr: concat(_col1, _col6)
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-#### A masked pattern was here ####
-                    NumFilesPerFileSink: 1
-                    Static Partition Specification: ds=2/
-#### A masked pattern was here ####
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                        properties:
-                          SORTBUCKETCOLSPREFIX TRUE
-                          bucket_count 16
-                          bucket_field_name key
-                          columns key,value
-                          columns.types int:string
-#### A masked pattern was here ####
-                          name default.test_table3
-                          numFiles 16
-                          numPartitions 1
-                          numRows 3084
-                          partition_columns ds
-                          rawDataSize 32904
-                          serialization.ddl struct test_table3 { i32 key, string value}
-                          serialization.format 1
-                          serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                          totalSize 35988
-#### A masked pattern was here ####
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                        name: default.test_table3
-                    TotalFiles: 1
-                    GatherStats: true
-                    MultiFileSpray: false
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+#### A masked pattern was here ####
+                  NumFilesPerFileSink: 1
+                  Static Partition Specification: ds=2/
+#### A masked pattern was here ####
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      properties:
+                        SORTBUCKETCOLSPREFIX TRUE
+                        bucket_count 16
+                        bucket_field_name key
+                        columns key,value
+                        columns.types int:string
+#### A masked pattern was here ####
+                        name default.test_table3
+                        numFiles 16
+                        numPartitions 1
+                        numRows 3084
+                        partition_columns ds
+                        rawDataSize 32904
+                        serialization.ddl struct test_table3 { i32 key, string value}
+                        serialization.format 1
+                        serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        totalSize 35988
+#### A masked pattern was here ####
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      name: default.test_table3
+                  TotalFiles: 1
+                  GatherStats: true
+                  MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out Sat Mar  2 22:37:59 2013
@@ -109,33 +109,22 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                Select Operator
-                  expressions:
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: int
+                  sort order: +
+                  tag: -1
+                  value expressions:
                         expr: _col0
                         type: int
                         expr: _col1
                         type: string
-                        expr: _col4
+                        expr: _col2
                         type: int
-                        expr: _col5
+                        expr: _col3
                         type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: int
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: int
-                          expr: _col1
-                          type: string
-                          expr: _col2
-                          type: int
-                          expr: _col3
-                          type: string
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -319,33 +308,22 @@ STAGE PLANS:
                       type: int
                       expr: _col5
                       type: string
-                outputColumnNames: _col0, _col1, _col4, _col5
-                Select Operator
-                  expressions:
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: int
+                  sort order: +
+                  tag: -1
+                  value expressions:
                         expr: _col0
                         type: int
                         expr: _col1
                         type: string
-                        expr: _col4
+                        expr: _col2
                         type: int
-                        expr: _col5
+                        expr: _col3
                         type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: int
-                    sort order: +
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: int
-                          expr: _col1
-                          type: string
-                          expr: _col2
-                          type: int
-                          expr: _col3
-                          type: string
       Local Work:
         Map Reduce Local Work
       Needs Tagging: false

Modified: hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out Sat Mar  2 22:37:59 2013
@@ -76,20 +76,18 @@ STAGE PLANS:
                 1 [Column[key]]
               Position of Big Table: 1
               Select Operator
-                Select Operator
-                  Select Operator
-                    Group By Operator
-                      aggregations:
-                            expr: count()
-                      bucketGroup: false
-                      mode: hash
-                      outputColumnNames: _col0
-                      Reduce Output Operator
-                        sort order: 
-                        tag: -1
-                        value expressions:
-                              expr: _col0
-                              type: bigint
+                Group By Operator
+                  aggregations:
+                        expr: count()
+                  bucketGroup: false
+                  mode: hash
+                  outputColumnNames: _col0
+                  Reduce Output Operator
+                    sort order: 
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -189,37 +187,27 @@ STAGE PLANS:
                       expr: _col0
                       type: int
                 outputColumnNames: _col0
-                Select Operator
-                  expressions:
+                Group By Operator
+                  aggregations:
+                        expr: count()
+                  bucketGroup: false
+                  keys:
                         expr: _col0
                         type: int
-                  outputColumnNames: _col0
-                  Select Operator
-                    expressions:
+                  mode: hash
+                  outputColumnNames: _col0, _col1
+                  Reduce Output Operator
+                    key expressions:
                           expr: _col0
                           type: int
-                    outputColumnNames: _col0
-                    Group By Operator
-                      aggregations:
-                            expr: count()
-                      bucketGroup: false
-                      keys:
-                            expr: _col0
-                            type: int
-                      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
-                        value expressions:
-                              expr: _col1
-                              type: bigint
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: int
+                    tag: -1
+                    value expressions:
+                          expr: _col1
+                          type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -361,37 +349,27 @@ STAGE PLANS:
                       expr: _col0
                       type: int
                 outputColumnNames: _col0
-                Select Operator
-                  expressions:
+                Group By Operator
+                  aggregations:
+                        expr: count()
+                  bucketGroup: false
+                  keys:
                         expr: _col0
                         type: int
-                  outputColumnNames: _col0
-                  Select Operator
-                    expressions:
+                  mode: hash
+                  outputColumnNames: _col0, _col1
+                  Reduce Output Operator
+                    key expressions:
                           expr: _col0
                           type: int
-                    outputColumnNames: _col0
-                    Group By Operator
-                      aggregations:
-                            expr: count()
-                      bucketGroup: false
-                      keys:
-                            expr: _col0
-                            type: int
-                      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
-                        value expressions:
-                              expr: _col1
-                              type: bigint
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: int
+                    tag: -1
+                    value expressions:
+                          expr: _col1
+                          type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -403,19 +381,18 @@ STAGE PLANS:
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Select Operator
-            Select Operator
-              Group By Operator
-                aggregations:
-                      expr: count()
-                bucketGroup: false
-                mode: hash
-                outputColumnNames: _col0
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+            Group By Operator
+              aggregations:
+                    expr: count()
+              bucketGroup: false
+              mode: hash
+              outputColumnNames: _col0
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
 
   Stage: Stage-2
     Map Reduce
@@ -537,19 +514,18 @@ STAGE PLANS:
                     1 [Column[_col0]]
                   Position of Big Table: 1
                   Select Operator
-                    Select Operator
-                      Group By Operator
-                        aggregations:
-                              expr: count()
-                        bucketGroup: false
-                        mode: hash
-                        outputColumnNames: _col0
-                        Reduce Output Operator
-                          sort order: 
-                          tag: -1
-                          value expressions:
-                                expr: _col0
-                                type: bigint
+                    Group By Operator
+                      aggregations:
+                            expr: count()
+                      bucketGroup: false
+                      mode: hash
+                      outputColumnNames: _col0
+                      Reduce Output Operator
+                        sort order: 
+                        tag: -1
+                        value expressions:
+                              expr: _col0
+                              type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -655,19 +631,18 @@ STAGE PLANS:
                 1 [Column[key]]
               Position of Big Table: 1
               Select Operator
-                Select Operator
-                  Group By Operator
-                    aggregations:
-                          expr: count()
-                    bucketGroup: false
-                    mode: hash
-                    outputColumnNames: _col0
-                    Reduce Output Operator
-                      sort order: 
-                      tag: -1
-                      value expressions:
-                            expr: _col0
-                            type: bigint
+                Group By Operator
+                  aggregations:
+                        expr: count()
+                  bucketGroup: false
+                  mode: hash
+                  outputColumnNames: _col0
+                  Reduce Output Operator
+                    sort order: 
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -794,36 +769,30 @@ STAGE PLANS:
                       expr: key
                       type: int
                 outputColumnNames: _col0
-                Select Operator
-                  expressions:
-                        expr: _col0
-                        type: int
-                  outputColumnNames: _col0
-                  Sorted Merge Bucket Map Join Operator
-                    condition map:
-                         Inner Join 0 to 1
-                    condition expressions:
-                      0 
-                      1 
-                    handleSkewJoin: false
-                    keys:
-                      0 [Column[_col0]]
-                      1 [Column[_col0]]
-                    Position of Big Table: 1
-                    Select Operator
-                      Select Operator
-                        Group By Operator
-                          aggregations:
-                                expr: count()
-                          bucketGroup: false
-                          mode: hash
-                          outputColumnNames: _col0
-                          Reduce Output Operator
-                            sort order: 
-                            tag: -1
-                            value expressions:
-                                  expr: _col0
-                                  type: bigint
+                Sorted Merge Bucket Map Join Operator
+                  condition map:
+                       Inner Join 0 to 1
+                  condition expressions:
+                    0 
+                    1 
+                  handleSkewJoin: false
+                  keys:
+                    0 [Column[_col0]]
+                    1 [Column[_col0]]
+                  Position of Big Table: 1
+                  Select Operator
+                    Group By Operator
+                      aggregations:
+                            expr: count()
+                      bucketGroup: false
+                      mode: hash
+                      outputColumnNames: _col0
+                      Reduce Output Operator
+                        sort order: 
+                        tag: -1
+                        value expressions:
+                              expr: _col0
+                              type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -952,19 +921,18 @@ STAGE PLANS:
                     1 [Column[_col0]]
                   Position of Big Table: 1
                   Select Operator
-                    Select Operator
-                      Group By Operator
-                        aggregations:
-                              expr: count()
-                        bucketGroup: false
-                        mode: hash
-                        outputColumnNames: _col0
-                        Reduce Output Operator
-                          sort order: 
-                          tag: -1
-                          value expressions:
-                                expr: _col0
-                                type: bigint
+                    Group By Operator
+                      aggregations:
+                            expr: count()
+                      bucketGroup: false
+                      mode: hash
+                      outputColumnNames: _col0
+                      Reduce Output Operator
+                        sort order: 
+                        tag: -1
+                        value expressions:
+                              expr: _col0
+                              type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -1091,19 +1059,18 @@ STAGE PLANS:
                   1 [Column[_col0]]
                 Position of Big Table: 1
                 Select Operator
-                  Select Operator
-                    Group By Operator
-                      aggregations:
-                            expr: count()
-                      bucketGroup: false
-                      mode: hash
-                      outputColumnNames: _col0
-                      Reduce Output Operator
-                        sort order: 
-                        tag: -1
-                        value expressions:
-                              expr: _col0
-                              type: bigint
+                  Group By Operator
+                    aggregations:
+                          expr: count()
+                    bucketGroup: false
+                    mode: hash
+                    outputColumnNames: _col0
+                    Reduce Output Operator
+                      sort order: 
+                      tag: -1
+                      value expressions:
+                            expr: _col0
+                            type: bigint
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:
@@ -1197,19 +1164,18 @@ STAGE PLANS:
                 1 [Column[key]]
               Position of Big Table: 1
               Select Operator
-                Select Operator
-                  Group By Operator
-                    aggregations:
-                          expr: count()
-                    bucketGroup: false
-                    mode: hash
-                    outputColumnNames: _col0
-                    Reduce Output Operator
-                      sort order: 
-                      tag: -1
-                      value expressions:
-                            expr: _col0
-                            type: bigint
+                Group By Operator
+                  aggregations:
+                        expr: count()
+                  bucketGroup: false
+                  mode: hash
+                  outputColumnNames: _col0
+                  Reduce Output Operator
+                    sort order: 
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -1306,19 +1272,18 @@ STAGE PLANS:
                     1 [Column[key]]
                   Position of Big Table: 0
                   Select Operator
-                    Select Operator
-                      Group By Operator
-                        aggregations:
-                              expr: count()
-                        bucketGroup: false
-                        mode: hash
-                        outputColumnNames: _col0
-                        Reduce Output Operator
-                          sort order: 
-                          tag: -1
-                          value expressions:
-                                expr: _col0
-                                type: bigint
+                    Group By Operator
+                      aggregations:
+                            expr: count()
+                      bucketGroup: false
+                      mode: hash
+                      outputColumnNames: _col0
+                      Reduce Output Operator
+                        sort order: 
+                        tag: -1
+                        value expressions:
+                              expr: _col0
+                              type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -1428,19 +1393,18 @@ STAGE PLANS:
                     2 [Column[_col0]]
                   Position of Big Table: 2
                   Select Operator
-                    Select Operator
-                      Group By Operator
-                        aggregations:
-                              expr: count()
-                        bucketGroup: false
-                        mode: hash
-                        outputColumnNames: _col0
-                        Reduce Output Operator
-                          sort order: 
-                          tag: -1
-                          value expressions:
-                                expr: _col0
-                                type: bigint
+                    Group By Operator
+                      aggregations:
+                            expr: count()
+                      bucketGroup: false
+                      mode: hash
+                      outputColumnNames: _col0
+                      Reduce Output Operator
+                        sort order: 
+                        tag: -1
+                        value expressions:
+                              expr: _col0
+                              type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -1554,20 +1518,18 @@ STAGE PLANS:
                 1 [Column[key]]
               Position of Big Table: 1
               Select Operator
-                Select Operator
-                  Select Operator
-                    Group By Operator
-                      aggregations:
-                            expr: count()
-                      bucketGroup: false
-                      mode: hash
-                      outputColumnNames: _col0
-                      Reduce Output Operator
-                        sort order: 
-                        tag: -1
-                        value expressions:
-                              expr: _col0
-                              type: bigint
+                Group By Operator
+                  aggregations:
+                        expr: count()
+                  bucketGroup: false
+                  mode: hash
+                  outputColumnNames: _col0
+                  Reduce Output Operator
+                    sort order: 
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations: