You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2010/10/27 21:00:05 UTC

svn commit: r1028072 [6/7] - in /hive/trunk: ./ data/files/ ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/java/org/apache/hadoop/hive/ql/parse/ ql/src/java/org/apache/hadoop/hive/ql/plan/ ql/src/test/queries/clientnegative/ ql/src/test/queries/cli...

Modified: hive/trunk/ql/src/test/results/clientpositive/join35.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join35.q.out?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join35.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join35.q.out Wed Oct 27 19:00:02 2010
@@ -83,9 +83,9 @@ STAGE PLANS:
                             type: bigint
       Needs Tagging: false
       Path -> Alias:
-        pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/src [null-subquery1:subq1-subquery1:x]
+        pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/src [null-subquery1:subq1-subquery1:x]
       Path -> Partition:
-        pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/src 
+        pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/src 
           Partition
             base file name: src
             input format: org.apache.hadoop.mapred.TextInputFormat
@@ -96,12 +96,12 @@ STAGE PLANS:
               columns.types string:string
               file.inputformat org.apache.hadoop.mapred.TextInputFormat
               file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-              location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/src
+              location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/src
               name src
               serialization.ddl struct src { string key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              transient_lastDdlTime 1287175215
+              transient_lastDdlTime 1288205427
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
               input format: org.apache.hadoop.mapred.TextInputFormat
@@ -112,12 +112,12 @@ STAGE PLANS:
                 columns.types string:string
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/src
+                location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/src
                 name src
                 serialization.ddl struct src { string key, string value}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                transient_lastDdlTime 1287175215
+                transient_lastDdlTime 1288205427
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: src
             name: src
@@ -141,7 +141,7 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               GlobalTableId: 0
-              directory: file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10002
+              directory: file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10002
               NumFilesPerFileSink: 1
               table:
                   input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -165,9 +165,7 @@ STAGE PLANS:
           TableScan
             alias: x
             GatherStats: false
-            Common Join Operator
-              condition map:
-                   Inner Join 0 to 1
+            JDBM Sink Operator
               condition expressions:
                 0 {_col1}
                 1 {key} {value}
@@ -175,15 +173,14 @@ STAGE PLANS:
               keys:
                 0 [Column[_col0]]
                 1 [Column[key]]
-              outputColumnNames: _col1, _col2, _col3
               Position of Big Table: 0
 
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10002 
+        file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10002 
           Union
-            Common Join Operator
+            Map Join Operator
               condition map:
                    Inner Join 0 to 1
               condition expressions:
@@ -225,9 +222,9 @@ STAGE PLANS:
                     File Output Operator
                       compressed: false
                       GlobalTableId: 1
-                      directory: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10003
+                      directory: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10003
                       NumFilesPerFileSink: 1
-                      Stats Publishing Key Prefix: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10000/
+                      Stats Publishing Key Prefix: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10000/
                       table:
                           input format: org.apache.hadoop.mapred.TextInputFormat
                           output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -237,20 +234,20 @@ STAGE PLANS:
                             columns.types string:string:int
                             file.inputformat org.apache.hadoop.mapred.TextInputFormat
                             file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                            location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/dest_j1
+                            location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/dest_j1
                             name dest_j1
                             serialization.ddl struct dest_j1 { string key, string value, i32 val2}
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                            transient_lastDdlTime 1287178436
+                            transient_lastDdlTime 1288205754
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           name: dest_j1
                       TotalFiles: 1
                       GatherStats: true
                       MultiFileSpray: false
-        file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10004 
+        file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10004 
           Union
-            Common Join Operator
+            Map Join Operator
               condition map:
                    Inner Join 0 to 1
               condition expressions:
@@ -292,9 +289,9 @@ STAGE PLANS:
                     File Output Operator
                       compressed: false
                       GlobalTableId: 1
-                      directory: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10003
+                      directory: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10003
                       NumFilesPerFileSink: 1
-                      Stats Publishing Key Prefix: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10000/
+                      Stats Publishing Key Prefix: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10000/
                       table:
                           input format: org.apache.hadoop.mapred.TextInputFormat
                           output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -304,12 +301,12 @@ STAGE PLANS:
                             columns.types string:string:int
                             file.inputformat org.apache.hadoop.mapred.TextInputFormat
                             file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                            location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/dest_j1
+                            location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/dest_j1
                             name dest_j1
                             serialization.ddl struct dest_j1 { string key, string value, i32 val2}
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                            transient_lastDdlTime 1287178436
+                            transient_lastDdlTime 1288205754
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           name: dest_j1
                       TotalFiles: 1
@@ -319,10 +316,10 @@ STAGE PLANS:
         Map Reduce Local Work
       Needs Tagging: false
       Path -> Alias:
-        file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10002 [file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10002]
-        file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10004 [file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10004]
+        file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10002 [file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10002]
+        file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10004 [file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10004]
       Path -> Partition:
-        file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10002 
+        file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10002 
           Partition
             base file name: -mr-10002
             input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -338,7 +335,7 @@ STAGE PLANS:
                 columns _col0,_col1
                 columns.types string,bigint
                 escape.delim \
-        file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10004 
+        file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10004 
           Partition
             base file name: -mr-10004
             input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -362,14 +359,14 @@ STAGE PLANS:
     Move Operator
       files:
           hdfs directory: true
-          source: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10003
-          destination: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10000
+          source: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10003
+          destination: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10000
 
   Stage: Stage-0
     Move Operator
       tables:
           replace: true
-          source: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10000
+          source: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10000
           table:
               input format: org.apache.hadoop.mapred.TextInputFormat
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -379,28 +376,28 @@ STAGE PLANS:
                 columns.types string:string:int
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/dest_j1
+                location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/dest_j1
                 name dest_j1
                 serialization.ddl struct dest_j1 { string key, string value, i32 val2}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                transient_lastDdlTime 1287178436
+                transient_lastDdlTime 1288205754
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: dest_j1
-          tmp directory: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10001
+          tmp directory: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10001
 
   Stage: Stage-3
     Stats-Aggr Operator
-      Stats Aggregation Key Prefix: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10000/
+      Stats Aggregation Key Prefix: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10000/
 
   Stage: Stage-4
     Map Reduce
       Alias -> Map Operator Tree:
-        pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10003 
+        pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10003 
             File Output Operator
               compressed: false
               GlobalTableId: 0
-              directory: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10000
+              directory: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10000
               NumFilesPerFileSink: 1
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
@@ -411,12 +408,12 @@ STAGE PLANS:
                     columns.types string:string:int
                     file.inputformat org.apache.hadoop.mapred.TextInputFormat
                     file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/dest_j1
+                    location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/dest_j1
                     name dest_j1
                     serialization.ddl struct dest_j1 { string key, string value, i32 val2}
                     serialization.format 1
                     serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                    transient_lastDdlTime 1287178436
+                    transient_lastDdlTime 1288205754
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: dest_j1
               TotalFiles: 1
@@ -424,9 +421,9 @@ STAGE PLANS:
               MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
-        pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10003 [pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10003]
+        pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10003 [pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10003]
       Path -> Partition:
-        pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-33-56_901_5834690759021421387/-ext-10003 
+        pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-55-54_179_6477900064401201039/-ext-10003 
           Partition
             base file name: -ext-10003
             input format: org.apache.hadoop.mapred.TextInputFormat
@@ -437,12 +434,12 @@ STAGE PLANS:
               columns.types string:string:int
               file.inputformat org.apache.hadoop.mapred.TextInputFormat
               file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-              location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/dest_j1
+              location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/dest_j1
               name dest_j1
               serialization.ddl struct dest_j1 { string key, string value, i32 val2}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              transient_lastDdlTime 1287178436
+              transient_lastDdlTime 1288205754
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
               input format: org.apache.hadoop.mapred.TextInputFormat
@@ -453,12 +450,12 @@ STAGE PLANS:
                 columns.types string:string:int
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/dest_j1
+                location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/dest_j1
                 name dest_j1
                 serialization.ddl struct dest_j1 { string key, string value, i32 val2}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                transient_lastDdlTime 1287178436
+                transient_lastDdlTime 1288205754
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: dest_j1
             name: dest_j1
@@ -508,9 +505,9 @@ STAGE PLANS:
                             type: bigint
       Needs Tagging: false
       Path -> Alias:
-        pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/src [null-subquery2:subq1-subquery2:x1]
+        pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/src [null-subquery2:subq1-subquery2:x1]
       Path -> Partition:
-        pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/src 
+        pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/src 
           Partition
             base file name: src
             input format: org.apache.hadoop.mapred.TextInputFormat
@@ -521,12 +518,12 @@ STAGE PLANS:
               columns.types string:string
               file.inputformat org.apache.hadoop.mapred.TextInputFormat
               file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-              location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/src
+              location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/src
               name src
               serialization.ddl struct src { string key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              transient_lastDdlTime 1287175215
+              transient_lastDdlTime 1288205427
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
               input format: org.apache.hadoop.mapred.TextInputFormat
@@ -537,12 +534,12 @@ STAGE PLANS:
                 columns.types string:string
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location pfile:/data/users/liyintang/trunk_os/build/ql/test/data/warehouse/src
+                location pfile:/data/users/njain/hive-commit1/build/ql/test/data/warehouse/src
                 name src
                 serialization.ddl struct src { string key, string value}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                transient_lastDdlTime 1287175215
+                transient_lastDdlTime 1288205427
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: src
             name: src
@@ -566,7 +563,7 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               GlobalTableId: 0
-              directory: file:/tmp/liyintang/hive_2010-10-15_14-33-56_901_5834690759021421387/-mr-10004
+              directory: file:/tmp/njain/hive_2010-10-27_11-55-54_179_6477900064401201039/-mr-10004
               NumFilesPerFileSink: 1
               table:
                   input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -610,11 +607,11 @@ POSTHOOK: Lineage: dest_j1.value SIMPLE 
 PREHOOK: query: select * from dest_j1 x order by x.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_j1
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-34-15_245_607185286374488826/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-56-06_687_1264215794989002476/-mr-10000
 POSTHOOK: query: select * from dest_j1 x order by x.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_j1
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-34-15_245_607185286374488826/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-56-06_687_1264215794989002476/-mr-10000
 POSTHOOK: Lineage: dest_j1.key SIMPLE [(src1)x.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_j1.val2 EXPRESSION [(src)x.null, (src)x1.null, ]
 POSTHOOK: Lineage: dest_j1.value SIMPLE [(src1)x.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/join36.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join36.q.out?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join36.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join36.q.out Wed Oct 27 19:00:02 2010
@@ -76,9 +76,7 @@ STAGE PLANS:
         x 
           TableScan
             alias: x
-            Common Join Operator
-              condition map:
-                   Inner Join 0 to 1
+            JDBM Sink Operator
               condition expressions:
                 0 {key} {cnt}
                 1 {cnt}
@@ -86,7 +84,6 @@ STAGE PLANS:
               keys:
                 0 [Column[key]]
                 1 [Column[key]]
-              outputColumnNames: _col0, _col1, _col5
               Position of Big Table: 1
 
   Stage: Stage-1
@@ -95,7 +92,7 @@ STAGE PLANS:
         y 
           TableScan
             alias: y
-            Common Join Operator
+            Map Join Operator
               condition map:
                    Inner Join 0 to 1
               condition expressions:
@@ -143,7 +140,7 @@ STAGE PLANS:
     Move Operator
       files:
           hdfs directory: true
-          destination: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-34-33_684_5611117980279032391/-ext-10000
+          destination: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-56-20_127_6380703738706956749/-ext-10000
 
   Stage: Stage-0
     Move Operator
@@ -161,7 +158,7 @@ STAGE PLANS:
   Stage: Stage-3
     Map Reduce
       Alias -> Map Operator Tree:
-        pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-34-33_684_5611117980279032391/-ext-10002 
+        pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-56-20_127_6380703738706956749/-ext-10002 
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -196,11 +193,11 @@ POSTHOOK: Lineage: tmp2.key EXPRESSION [
 PREHOOK: query: select * from dest_j1 x order by x.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_j1
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-34-41_401_2982529179982198007/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-56-26_754_2259038051216019843/-mr-10000
 POSTHOOK: query: select * from dest_j1 x order by x.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_j1
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-34-41_401_2982529179982198007/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-56-26_754_2259038051216019843/-mr-10000
 POSTHOOK: Lineage: dest_j1.key SIMPLE [(tmp1)x.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: dest_j1.val2 SIMPLE [(tmp2)y.FieldSchema(name:cnt, type:int, comment:null), ]
 POSTHOOK: Lineage: dest_j1.value SIMPLE [(tmp1)x.FieldSchema(name:cnt, type:int, comment:null), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/join37.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join37.q.out?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join37.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join37.q.out Wed Oct 27 19:00:02 2010
@@ -36,9 +36,7 @@ STAGE PLANS:
         x 
           TableScan
             alias: x
-            Common Join Operator
-              condition map:
-                   Inner Join 0 to 1
+            JDBM Sink Operator
               condition expressions:
                 0 {key} {value}
                 1 {value}
@@ -46,7 +44,6 @@ STAGE PLANS:
               keys:
                 0 [Column[key]]
                 1 [Column[key]]
-              outputColumnNames: _col0, _col1, _col5
               Position of Big Table: 1
 
   Stage: Stage-1
@@ -55,7 +52,7 @@ STAGE PLANS:
         y 
           TableScan
             alias: y
-            Common Join Operator
+            Map Join Operator
               condition map:
                    Inner Join 0 to 1
               condition expressions:
@@ -112,7 +109,7 @@ STAGE PLANS:
     Move Operator
       files:
           hdfs directory: true
-          destination: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-34-45_814_1606970852322632805/-ext-10000
+          destination: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-56-29_885_2306134457319021637/-ext-10000
 
   Stage: Stage-0
     Move Operator
@@ -130,7 +127,7 @@ STAGE PLANS:
   Stage: Stage-3
     Map Reduce
       Alias -> Map Operator Tree:
-        pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-34-45_814_1606970852322632805/-ext-10002 
+        pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-56-29_885_2306134457319021637/-ext-10002 
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -161,11 +158,11 @@ POSTHOOK: Lineage: dest_j1.value SIMPLE 
 PREHOOK: query: select * from dest_j1 x order by x.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_j1
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-34-53_374_832161609076546752/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-56-34_279_5727082010829048557/-mr-10000
 POSTHOOK: query: select * from dest_j1 x order by x.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_j1
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-34-53_374_832161609076546752/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-56-34_279_5727082010829048557/-mr-10000
 POSTHOOK: Lineage: dest_j1.key EXPRESSION [(src1)x.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_j1.val2 SIMPLE [(src)y.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_j1.value SIMPLE [(src1)x.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/join38.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join38.q.out?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join38.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join38.q.out Wed Oct 27 19:00:02 2010
@@ -26,11 +26,11 @@ POSTHOOK: Lineage: tmp.col9 EXPRESSION [
 PREHOOK: query: select * from tmp
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tmp
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-35-03_529_8041528917330220501/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-04_133_1536500479311783598/-mr-10000
 POSTHOOK: query: select * from tmp
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tmp
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-35-03_529_8041528917330220501/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-04_133_1536500479311783598/-mr-10000
 POSTHOOK: Lineage: tmp.col0 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tmp.col1 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tmp.col10 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
@@ -89,9 +89,7 @@ STAGE PLANS:
         a 
           TableScan
             alias: a
-            Common Join Operator
-              condition map:
-                   Inner Join 0 to 1
+            JDBM Sink Operator
               condition expressions:
                 0 {value}
                 1 {col5} {col11}
@@ -99,7 +97,6 @@ STAGE PLANS:
               keys:
                 0 [Column[key]]
                 1 [Column[col11]]
-              outputColumnNames: _col1, _col9, _col15
               Position of Big Table: 1
 
   Stage: Stage-1
@@ -112,7 +109,7 @@ STAGE PLANS:
               predicate:
                   expr: (col11 = 111)
                   type: boolean
-              Common Join Operator
+              Map Join Operator
                 condition map:
                      Inner Join 0 to 1
                 condition expressions:
@@ -136,7 +133,7 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/tmp/liyintang/hive_2010-10-15_14-35-03_891_2596651658573027267/-mr-10002 
+        file:/tmp/njain/hive_2010-10-27_11-58-04_322_8814213860188537568/-mr-10002 
           Select Operator
             expressions:
                   expr: _col1
@@ -224,7 +221,7 @@ group by a.value, b.col5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Input: default@tmp
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-35-04_026_4932987435433548006/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-04_499_6020968433330491483/-mr-10000
 POSTHOOK: query: FROM src a JOIN tmp b ON (a.key = b.col11)
 SELECT /*+ MAPJOIN(a) */ a.value, b.col5, count(1) as count
 where b.col11 = 111
@@ -232,7 +229,7 @@ group by a.value, b.col5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@tmp
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-35-04_026_4932987435433548006/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-04_499_6020968433330491483/-mr-10000
 POSTHOOK: Lineage: tmp.col0 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tmp.col1 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tmp.col10 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/join39.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join39.q.out?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join39.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join39.q.out Wed Oct 27 19:00:02 2010
@@ -51,9 +51,7 @@ STAGE PLANS:
                         expr: value
                         type: string
                   outputColumnNames: _col0, _col1
-                  Common Join Operator
-                    condition map:
-                         Left Outer Join0 to 1
+                  JDBM Sink Operator
                     condition expressions:
                       0 {key} {value}
                       1 {_col0} {_col1}
@@ -61,7 +59,6 @@ STAGE PLANS:
                     keys:
                       0 [Column[key]]
                       1 [Column[_col0]]
-                    outputColumnNames: _col0, _col1, _col4, _col5
                     Position of Big Table: 0
 
   Stage: Stage-1
@@ -70,7 +67,7 @@ STAGE PLANS:
         x 
           TableScan
             alias: x
-            Common Join Operator
+            Map Join Operator
               condition map:
                    Left Outer Join0 to 1
               condition expressions:
@@ -122,7 +119,7 @@ STAGE PLANS:
     Move Operator
       files:
           hdfs directory: true
-          destination: pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-35-12_770_665160760349140672/-ext-10000
+          destination: pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-58-12_180_546438697212415855/-ext-10000
 
   Stage: Stage-0
     Move Operator
@@ -140,7 +137,7 @@ STAGE PLANS:
   Stage: Stage-3
     Map Reduce
       Alias -> Map Operator Tree:
-        pfile:/data/users/liyintang/trunk_os/build/ql/scratchdir/hive_2010-10-15_14-35-12_770_665160760349140672/-ext-10002 
+        pfile:/data/users/njain/hive-commit1/build/ql/scratchdir/hive_2010-10-27_11-58-12_180_546438697212415855/-ext-10002 
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -170,11 +167,11 @@ POSTHOOK: Lineage: dest_j1.value SIMPLE 
 PREHOOK: query: select * from dest_j1 x order by x.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_j1
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-35-20_561_5505086574145624502/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-17_368_425948306842908675/-mr-10000
 POSTHOOK: query: select * from dest_j1 x order by x.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_j1
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-15_14-35-20_561_5505086574145624502/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-17_368_425948306842908675/-mr-10000
 POSTHOOK: Lineage: dest_j1.key SIMPLE [(src)x.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_j1.key1 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_j1.val2 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/join40.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join40.q.out?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join40.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join40.q.out Wed Oct 27 19:00:02 2010
@@ -100,12 +100,12 @@ PREHOOK: query: SELECT x.key, x.value, y
 FROM src x left outer JOIN (select * from src where key <= 100) y ON (x.key = y.key)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-02-31_124_6927903071980513683/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-27_869_8594307870019576114/-mr-10000
 POSTHOOK: query: SELECT x.key, x.value, y.key, y.value
 FROM src x left outer JOIN (select * from src where key <= 100) y ON (x.key = y.key)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-02-31_124_6927903071980513683/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-27_869_8594307870019576114/-mr-10000
 0	val_0	0	val_0
 0	val_0	0	val_0
 0	val_0	0	val_0
@@ -751,12 +751,12 @@ PREHOOK: query: select src1.key, src2.va
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-02-37_946_7958640688746987562/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-32_224_2628641681553791073/-mr-10000
 POSTHOOK: query: select src1.key, src2.value 
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-02-37_946_7958640688746987562/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-32_224_2628641681553791073/-mr-10000
 0	val_0
 0	val_0
 0	val_0
@@ -1904,7 +1904,7 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/tmp/liyintang/hive_2010-10-16_20-02-47_615_5874602744426579650/-mr-10002 
+        file:/tmp/njain/hive_2010-10-27_11-58-37_240_1047427345351102102/-mr-10002 
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1952,12 +1952,12 @@ PREHOOK: query: SELECT * FROM src src1 J
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-02-47_757_232126715240534957/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-37_348_2776356054970751573/-mr-10000
 POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-02-47_757_232126715240534957/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-37_348_2776356054970751573/-mr-10000
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	100	val_100
 NULL	NULL	NULL	NULL	100	val_100
@@ -2633,7 +2633,7 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/tmp/liyintang/hive_2010-10-16_20-03-00_961_3638553023871821513/-mr-10002 
+        file:/tmp/njain/hive_2010-10-27_11-58-44_576_3870847117030797031/-mr-10002 
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2681,12 +2681,12 @@ PREHOOK: query: SELECT * FROM src src1 J
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-03-01_106_5886120209091224363/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-44_694_461427396890734084/-mr-10000
 POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key < 15) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-03-01_106_5886120209091224363/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-44_694_461427396890734084/-mr-10000
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	100	val_100
 NULL	NULL	NULL	NULL	100	val_100
@@ -3277,9 +3277,7 @@ STAGE PLANS:
                         expr: value
                         type: string
                   outputColumnNames: _col0, _col1
-                  Common Join Operator
-                    condition map:
-                         Left Outer Join0 to 1
+                  JDBM Sink Operator
                     condition expressions:
                       0 {key} {value}
                       1 {_col0} {_col1}
@@ -3287,7 +3285,6 @@ STAGE PLANS:
                     keys:
                       0 [Column[key]]
                       1 [Column[_col0]]
-                    outputColumnNames: _col0, _col1, _col4, _col5
                     Position of Big Table: 0
 
   Stage: Stage-1
@@ -3296,7 +3293,7 @@ STAGE PLANS:
         x 
           TableScan
             alias: x
-            Common Join Operator
+            Map Join Operator
               condition map:
                    Left Outer Join0 to 1
               condition expressions:
@@ -3343,16 +3340,17 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
+
 PREHOOK: query: SELECT /*+ MAPJOIN(y) */ x.key, x.value, y.key, y.value
 FROM src x left outer JOIN (select * from src where key <= 100) y ON (x.key = y.key)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-03-11_195_45527429920277744/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-51_016_2800726535361834663/-mr-10000
 POSTHOOK: query: SELECT /*+ MAPJOIN(y) */ x.key, x.value, y.key, y.value
 FROM src x left outer JOIN (select * from src where key <= 100) y ON (x.key = y.key)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-03-11_195_45527429920277744/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-51_016_2800726535361834663/-mr-10000
 238	val_238	NULL	NULL
 86	val_86	86	val_86
 311	val_311	NULL	NULL
@@ -3986,7 +3984,7 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/tmp/liyintang/hive_2010-10-16_20-03-16_243_8188098789715192859/-mr-10002 
+        file:/tmp/njain/hive_2010-10-27_11-58-54_107_7492093354536600513/-mr-10002 
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -4020,9 +4018,9 @@ STAGE PLANS:
 PREHOOK: query: SELECT COUNT(1) FROM SRC A JOIN SRC B ON (A.KEY=B.KEY)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-03-16_359_4312483358519343610/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-54_187_249714887699251169/-mr-10000
 POSTHOOK: query: SELECT COUNT(1) FROM SRC A JOIN SRC B ON (A.KEY=B.KEY)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/liyintang/hive_2010-10-16_20-03-16_359_4312483358519343610/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-10-27_11-58-54_187_249714887699251169/-mr-10000
 1028

Modified: hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out Wed Oct 27 19:00:02 2010
@@ -60,7 +60,7 @@ STAGE PLANS:
         Group By Operator
           aggregations:
                 expr: count(VALUE._col0)
-                expr: count(DISTINCT KEY._col0)
+                expr: count(DISTINCT KEY._col0:0._col0)
           bucketGroup: false
           mode: partials
           outputColumnNames: _col0, _col1
@@ -177,7 +177,7 @@ STAGE PLANS:
         Group By Operator
           aggregations:
                 expr: count(VALUE._col0)
-                expr: count(DISTINCT KEY._col0)
+                expr: count(DISTINCT KEY._col0:0._col0)
           bucketGroup: false
           mode: mergepartial
           outputColumnNames: _col0, _col1
@@ -259,7 +259,7 @@ STAGE PLANS:
         Group By Operator
           aggregations:
                 expr: count(VALUE._col0)
-                expr: count(DISTINCT KEY._col0)
+                expr: count(DISTINCT KEY._col0:0._col0)
           bucketGroup: false
           mode: partial1
           outputColumnNames: _col0, _col1
@@ -364,7 +364,7 @@ STAGE PLANS:
         Group By Operator
           aggregations:
                 expr: count(VALUE._col0)
-                expr: count(DISTINCT KEY._col0)
+                expr: count(DISTINCT KEY._col0:0._col0)
           bucketGroup: false
           mode: complete
           outputColumnNames: _col0, _col1

Added: hive/trunk/ql/src/test/results/clientpositive/nullgroup4_multi_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/nullgroup4_multi_distinct.q.out?rev=1028072&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/nullgroup4_multi_distinct.q.out (added)
+++ hive/trunk/ql/src/test/results/clientpositive/nullgroup4_multi_distinct.q.out Wed Oct 27 19:00:02 2010
@@ -0,0 +1,183 @@
+PREHOOK: query: explain
+select count(1), count(distinct x.value), count(distinct substr(x.value, 5)) from src x where x.key = 9999
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select count(1), count(distinct x.value), count(distinct substr(x.value, 5)) from src x where x.key = 9999
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  (TOK_QUERY (TOK_FROM (TOK_TABREF src x)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION count 1)) (TOK_SELEXPR (TOK_FUNCTIONDI count (. (TOK_TABLE_OR_COL x) value))) (TOK_SELEXPR (TOK_FUNCTIONDI count (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL x) value) 5)))) (TOK_WHERE (= (. (TOK_TABLE_OR_COL x) key) 9999))))
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        x 
+          TableScan
+            alias: x
+            Filter Operator
+              predicate:
+                  expr: (key = 9999)
+                  type: boolean
+              Filter Operator
+                predicate:
+                    expr: (key = 9999)
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: value
+                        type: string
+                  outputColumnNames: value
+                  Group By Operator
+                    aggregations:
+                          expr: count(1)
+                          expr: count(DISTINCT value)
+                          expr: count(DISTINCT substr(value, 5))
+                    bucketGroup: false
+                    keys:
+                          expr: value
+                          type: string
+                          expr: substr(value, 5)
+                          type: string
+                    mode: hash
+                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                    Reduce Output Operator
+                      key expressions:
+                            expr: _col0
+                            type: string
+                            expr: _col1
+                            type: string
+                      sort order: ++
+                      tag: -1
+                      value expressions:
+                            expr: _col2
+                            type: bigint
+                            expr: _col3
+                            type: bigint
+                            expr: _col4
+                            type: bigint
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations:
+                expr: count(VALUE._col0)
+                expr: count(DISTINCT KEY._col0:0._col0)
+                expr: count(DISTINCT KEY._col0:1._col0)
+          bucketGroup: false
+          mode: mergepartial
+          outputColumnNames: _col0, _col1, _col2
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: bigint
+                  expr: _col1
+                  type: bigint
+                  expr: _col2
+                  type: bigint
+            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
+      limit: -1
+
+
+PREHOOK: query: select count(1), count(distinct x.value), count(distinct substr(x.value, 5)) from src x where x.key = 9999
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/tmp/amarsri/hive_2010-10-26_00-39-13_413_5076187437569125571/-mr-10000
+POSTHOOK: query: select count(1), count(distinct x.value), count(distinct substr(x.value, 5)) from src x where x.key = 9999
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/tmp/amarsri/hive_2010-10-26_00-39-13_413_5076187437569125571/-mr-10000
+0	0	0
+PREHOOK: query: explain
+select count(1), count(distinct x.value), count(distinct substr(x.value, 5)) from src x where x.key = 9999
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select count(1), count(distinct x.value), count(distinct substr(x.value, 5)) from src x where x.key = 9999
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  (TOK_QUERY (TOK_FROM (TOK_TABREF src x)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION count 1)) (TOK_SELEXPR (TOK_FUNCTIONDI count (. (TOK_TABLE_OR_COL x) value))) (TOK_SELEXPR (TOK_FUNCTIONDI count (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL x) value) 5)))) (TOK_WHERE (= (. (TOK_TABLE_OR_COL x) key) 9999))))
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        x 
+          TableScan
+            alias: x
+            Filter Operator
+              predicate:
+                  expr: (key = 9999)
+                  type: boolean
+              Filter Operator
+                predicate:
+                    expr: (key = 9999)
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: value
+                        type: string
+                  outputColumnNames: value
+                  Reduce Output Operator
+                    key expressions:
+                          expr: value
+                          type: string
+                          expr: substr(value, 5)
+                          type: string
+                    sort order: ++
+                    tag: -1
+                    value expressions:
+                          expr: 1
+                          type: int
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations:
+                expr: count(VALUE._col0)
+                expr: count(DISTINCT KEY._col0:0._col0)
+                expr: count(DISTINCT KEY._col0:1._col0)
+          bucketGroup: false
+          mode: complete
+          outputColumnNames: _col0, _col1, _col2
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: bigint
+                  expr: _col1
+                  type: bigint
+                  expr: _col2
+                  type: bigint
+            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
+      limit: -1
+
+
+PREHOOK: query: select count(1), count(distinct x.value), count(distinct substr(x.value, 5)) from src x where x.key = 9999
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/tmp/amarsri/hive_2010-10-26_00-39-16_129_3006310959633214362/-mr-10000
+POSTHOOK: query: select count(1), count(distinct x.value), count(distinct substr(x.value, 5)) from src x where x.key = 9999
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/tmp/amarsri/hive_2010-10-26_00-39-16_129_3006310959633214362/-mr-10000
+0	0	0

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_count.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_count.q.out?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_count.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_count.q.out Wed Oct 27 19:00:02 2010
@@ -124,7 +124,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col0)
+                expr: count(DISTINCT KEY._col0:0._col0)
           bucketGroup: false
           mode: mergepartial
           outputColumnNames: _col0
@@ -204,7 +204,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col0, KEY._col1)
+                expr: count(DISTINCT KEY._col0:0._col0, KEY._col0:0._col1)
           bucketGroup: false
           mode: mergepartial
           outputColumnNames: _col0

Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml Wed Oct 27 19:00:02 2010
@@ -270,6 +270,9 @@
                     </void> 
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                      <void property="distinctColumnIndices"> 
+                       <object class="java.util.ArrayList"/> 
+                      </void> 
                       <void property="keyCols"> 
                        <object id="ArrayList0" class="java.util.ArrayList"> 
                         <void method="add"> 
@@ -306,6 +309,9 @@
                         </void> 
                        </object> 
                       </void> 
+                      <void property="numDistributionKeys"> 
+                       <int>1</int> 
+                      </void> 
                       <void property="numReducers"> 
                        <int>-1</int> 
                       </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml Wed Oct 27 19:00:02 2010
@@ -132,31 +132,38 @@
                         </void> 
                        </object> 
                       </void> 
-                      <void method="put"> 
-                       <string>KEY._col1</string> 
-                       <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
-                        <void property="column"> 
-                         <string>_col1</string> 
-                        </void> 
-                        <void property="tabAlias"> 
-                         <string></string> 
-                        </void> 
-                        <void property="typeInfo"> 
-                         <object idref="PrimitiveTypeInfo0"/> 
-                        </void> 
-                       </object> 
-                      </void> 
                      </object> 
                     </void> 
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                      <void property="distinctColumnIndices"> 
+                       <object class="java.util.ArrayList"> 
+                        <void method="add"> 
+                         <object class="java.util.ArrayList"> 
+                          <void method="add"> 
+                           <int>1</int> 
+                          </void> 
+                         </object> 
+                        </void> 
+                       </object> 
+                      </void> 
                       <void property="keyCols"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
                          <object idref="ExprNodeColumnDesc0"/> 
                         </void> 
                         <void method="add"> 
-                         <object idref="ExprNodeColumnDesc1"/> 
+                         <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+                          <void property="column"> 
+                           <string>_col1</string> 
+                          </void> 
+                          <void property="tabAlias"> 
+                           <string></string> 
+                          </void> 
+                          <void property="typeInfo"> 
+                           <object idref="PrimitiveTypeInfo0"/> 
+                          </void> 
+                         </object> 
                         </void> 
                        </object> 
                       </void> 
@@ -183,12 +190,15 @@
                           </void> 
                           <void method="put"> 
                            <string>columns.types</string> 
-                           <string>string,string</string> 
+                           <string>string,uniontype&lt;struct&lt;_col0:string&gt;&gt;</string> 
                           </void> 
                          </object> 
                         </void> 
                        </object> 
                       </void> 
+                      <void property="numDistributionKeys"> 
+                       <int>1</int> 
+                      </void> 
                       <void property="numReducers"> 
                        <int>-1</int> 
                       </void> 
@@ -334,7 +344,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
                           <void property="internalName"> 
-                           <string>KEY._col1</string> 
+                           <string>KEY._col1:0._col0</string> 
                           </void> 
                           <void property="type"> 
                            <object idref="PrimitiveTypeInfo0"/> 
@@ -1190,7 +1200,7 @@
             </void> 
             <void method="put"> 
              <string>_col1</string> 
-             <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+             <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
               <void property="column"> 
                <string>_col1</string> 
               </void> 
@@ -1204,7 +1214,7 @@
             </void> 
             <void method="put"> 
              <string>_col0</string> 
-             <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+             <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
               <void property="column"> 
                <string>_col0</string> 
               </void> 
@@ -1223,10 +1233,10 @@
             <void property="colList"> 
              <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object idref="ExprNodeColumnDesc3"/> 
+               <object idref="ExprNodeColumnDesc2"/> 
               </void> 
               <void method="add"> 
-               <object idref="ExprNodeColumnDesc2"/> 
+               <object idref="ExprNodeColumnDesc1"/> 
               </void> 
               <void method="add"> 
                <object idref="ExprNodeGenericFuncDesc2"/> 
@@ -1329,7 +1339,7 @@
        <object class="java.util.HashMap"> 
         <void method="put"> 
          <string>_col0</string> 
-         <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+         <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
           <void property="column"> 
            <string>KEY._col0</string> 
           </void> 
@@ -1365,7 +1375,7 @@
               <void method="add"> 
                <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                 <void property="column"> 
-                 <string>KEY._col1</string> 
+                 <string>KEY._col1:0._col0</string> 
                 </void> 
                 <void property="typeInfo"> 
                  <object idref="PrimitiveTypeInfo0"/> 
@@ -1410,7 +1420,7 @@
         <void property="keys"> 
          <object class="java.util.ArrayList"> 
           <void method="add"> 
-           <object idref="ExprNodeColumnDesc4"/> 
+           <object idref="ExprNodeColumnDesc3"/> 
           </void> 
          </object> 
         </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml Wed Oct 27 19:00:02 2010
@@ -113,33 +113,39 @@
                   <void method="add"> 
                    <object id="ReduceSinkOperator0" class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator"> 
                     <void property="columnExprMap"> 
-                     <object class="java.util.HashMap"> 
-                      <void method="put"> 
-                       <string>KEY._col0</string> 
-                       <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
-                        <void property="column"> 
-                         <string>_col0</string> 
-                        </void> 
-                        <void property="tabAlias"> 
-                         <string></string> 
-                        </void> 
-                        <void property="typeInfo"> 
-                         <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                          <void property="typeName"> 
-                           <string>string</string> 
+                     <object class="java.util.HashMap"/> 
+                    </void> 
+                    <void property="conf"> 
+                     <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                      <void property="distinctColumnIndices"> 
+                       <object class="java.util.ArrayList"> 
+                        <void method="add"> 
+                         <object class="java.util.ArrayList"> 
+                          <void method="add"> 
+                           <int>0</int> 
                           </void> 
                          </object> 
                         </void> 
                        </object> 
                       </void> 
-                     </object> 
-                    </void> 
-                    <void property="conf"> 
-                     <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
                       <void property="keyCols"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <object idref="ExprNodeColumnDesc0"/> 
+                         <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+                          <void property="column"> 
+                           <string>_col0</string> 
+                          </void> 
+                          <void property="tabAlias"> 
+                           <string></string> 
+                          </void> 
+                          <void property="typeInfo"> 
+                           <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
+                            <void property="typeName"> 
+                             <string>string</string> 
+                            </void> 
+                           </object> 
+                          </void> 
+                         </object> 
                         </void> 
                        </object> 
                       </void> 
@@ -166,7 +172,7 @@
                           </void> 
                           <void method="put"> 
                            <string>columns.types</string> 
-                           <string>string</string> 
+                           <string>uniontype&lt;struct&lt;_col0:string&gt;&gt;</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -369,7 +375,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
                           <void property="internalName"> 
-                           <string>KEY._col0</string> 
+                           <string>KEY._col0:0._col0</string> 
                           </void> 
                           <void property="type"> 
                            <object idref="PrimitiveTypeInfo0"/> 
@@ -1356,7 +1362,7 @@
            <object class="java.util.HashMap"> 
             <void method="put"> 
              <string>_col4</string> 
-             <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+             <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
               <void property="column"> 
                <string>_col4</string> 
               </void> 
@@ -1370,7 +1376,7 @@
             </void> 
             <void method="put"> 
              <string>_col3</string> 
-             <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+             <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
               <void property="column"> 
                <string>_col3</string> 
               </void> 
@@ -1384,7 +1390,7 @@
             </void> 
             <void method="put"> 
              <string>_col2</string> 
-             <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+             <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
               <void property="column"> 
                <string>_col2</string> 
               </void> 
@@ -1398,7 +1404,7 @@
             </void> 
             <void method="put"> 
              <string>_col1</string> 
-             <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+             <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
               <void property="column"> 
                <string>_col1</string> 
               </void> 
@@ -1412,7 +1418,7 @@
             </void> 
             <void method="put"> 
              <string>_col0</string> 
-             <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+             <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
               <void property="column"> 
                <string>_col0</string> 
               </void> 
@@ -1431,9 +1437,6 @@
             <void property="colList"> 
              <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object idref="ExprNodeColumnDesc5"/> 
-              </void> 
-              <void method="add"> 
                <object idref="ExprNodeColumnDesc4"/> 
               </void> 
               <void method="add"> 
@@ -1445,6 +1448,9 @@
               <void method="add"> 
                <object idref="ExprNodeColumnDesc1"/> 
               </void> 
+              <void method="add"> 
+               <object idref="ExprNodeColumnDesc0"/> 
+              </void> 
              </object> 
             </void> 
             <void property="outputColumnNames"> 
@@ -1655,7 +1661,7 @@
               <void method="add"> 
                <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                 <void property="column"> 
-                 <string>KEY._col0</string> 
+                 <string>KEY._col0:0._col0</string> 
                 </void> 
                 <void property="typeInfo"> 
                  <object idref="PrimitiveTypeInfo0"/> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml Wed Oct 27 19:00:02 2010
@@ -136,6 +136,9 @@
                     </void> 
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                      <void property="distinctColumnIndices"> 
+                       <object class="java.util.ArrayList"/> 
+                      </void> 
                       <void property="keyCols"> 
                        <object id="ArrayList0" class="java.util.ArrayList"> 
                         <void method="add"> 
@@ -172,6 +175,9 @@
                         </void> 
                        </object> 
                       </void> 
+                      <void property="numDistributionKeys"> 
+                       <int>1</int> 
+                      </void> 
                       <void property="numReducers"> 
                        <int>-1</int> 
                       </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml Wed Oct 27 19:00:02 2010
@@ -136,6 +136,9 @@
                     </void> 
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                      <void property="distinctColumnIndices"> 
+                       <object class="java.util.ArrayList"/> 
+                      </void> 
                       <void property="keyCols"> 
                        <object id="ArrayList0" class="java.util.ArrayList"> 
                         <void method="add"> 
@@ -172,6 +175,9 @@
                         </void> 
                        </object> 
                       </void> 
+                      <void property="numDistributionKeys"> 
+                       <int>1</int> 
+                      </void> 
                       <void property="numReducers"> 
                        <int>-1</int> 
                       </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml Wed Oct 27 19:00:02 2010
@@ -136,6 +136,9 @@
                     </void> 
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                      <void property="distinctColumnIndices"> 
+                       <object class="java.util.ArrayList"/> 
+                      </void> 
                       <void property="keyCols"> 
                        <object id="ArrayList0" class="java.util.ArrayList"> 
                         <void method="add"> 
@@ -172,6 +175,9 @@
                         </void> 
                        </object> 
                       </void> 
+                      <void property="numDistributionKeys"> 
+                       <int>1</int> 
+                      </void> 
                       <void property="numReducers"> 
                        <int>-1</int> 
                       </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml Wed Oct 27 19:00:02 2010
@@ -144,6 +144,9 @@
                     </void> 
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                      <void property="distinctColumnIndices"> 
+                       <object class="java.util.ArrayList"/> 
+                      </void> 
                       <void property="keyCols"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
@@ -187,6 +190,9 @@
                         </void> 
                        </object> 
                       </void> 
+                      <void property="numDistributionKeys"> 
+                       <int>1</int> 
+                      </void> 
                       <void property="numReducers"> 
                        <int>-1</int> 
                       </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml Wed Oct 27 19:00:02 2010
@@ -278,6 +278,9 @@
                     </void> 
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                      <void property="distinctColumnIndices"> 
+                       <object class="java.util.ArrayList"/> 
+                      </void> 
                       <void property="keyCols"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
@@ -321,6 +324,9 @@
                         </void> 
                        </object> 
                       </void> 
+                      <void property="numDistributionKeys"> 
+                       <int>1</int> 
+                      </void> 
                       <void property="numReducers"> 
                        <int>-1</int> 
                       </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml Wed Oct 27 19:00:02 2010
@@ -282,6 +282,9 @@
                     </void> 
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                      <void property="distinctColumnIndices"> 
+                       <object class="java.util.ArrayList"/> 
+                      </void> 
                       <void property="keyCols"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
@@ -325,6 +328,9 @@
                         </void> 
                        </object> 
                       </void> 
+                      <void property="numDistributionKeys"> 
+                       <int>1</int> 
+                      </void> 
                       <void property="numReducers"> 
                        <int>-1</int> 
                       </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml Wed Oct 27 19:00:02 2010
@@ -349,6 +349,9 @@
             </void> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+              <void property="distinctColumnIndices"> 
+               <object class="java.util.ArrayList"/> 
+              </void> 
               <void property="keyCols"> 
                <object id="ArrayList0" class="java.util.ArrayList"> 
                 <void method="add"> 
@@ -395,6 +398,9 @@
                 </void> 
                </object> 
               </void> 
+              <void property="numDistributionKeys"> 
+               <int>1</int> 
+              </void> 
               <void property="numReducers"> 
                <int>-1</int> 
               </void> 
@@ -624,6 +630,9 @@
             </void> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+              <void property="distinctColumnIndices"> 
+               <object class="java.util.ArrayList"/> 
+              </void> 
               <void property="keyCols"> 
                <object id="ArrayList1" class="java.util.ArrayList"> 
                 <void method="add"> 
@@ -670,6 +679,9 @@
                 </void> 
                </object> 
               </void> 
+              <void property="numDistributionKeys"> 
+               <int>1</int> 
+              </void> 
               <void property="numReducers"> 
                <int>-1</int> 
               </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml Wed Oct 27 19:00:02 2010
@@ -273,6 +273,9 @@
                 </void> 
                 <void property="conf"> 
                  <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                  <void property="distinctColumnIndices"> 
+                   <object class="java.util.ArrayList"/> 
+                  </void> 
                   <void property="keyCols"> 
                    <object id="ArrayList0" class="java.util.ArrayList"> 
                     <void method="add"> 
@@ -360,6 +363,9 @@
                     </void> 
                    </object> 
                   </void> 
+                  <void property="numDistributionKeys"> 
+                   <int>1</int> 
+                  </void> 
                   <void property="numReducers"> 
                    <int>-1</int> 
                   </void> 
@@ -542,6 +548,9 @@
                 </void> 
                 <void property="conf"> 
                  <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                  <void property="distinctColumnIndices"> 
+                   <object class="java.util.ArrayList"/> 
+                  </void> 
                   <void property="keyCols"> 
                    <object id="ArrayList1" class="java.util.ArrayList"> 
                     <void method="add"> 
@@ -609,6 +618,9 @@
                     </void> 
                    </object> 
                   </void> 
+                  <void property="numDistributionKeys"> 
+                   <int>1</int> 
+                  </void> 
                   <void property="numReducers"> 
                    <int>-1</int> 
                   </void> 
@@ -1657,6 +1669,9 @@
             </void> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+              <void property="distinctColumnIndices"> 
+               <object class="java.util.ArrayList"/> 
+              </void> 
               <void property="keyCols"> 
                <object id="ArrayList2" class="java.util.ArrayList"> 
                 <void method="add"> 
@@ -1703,6 +1718,9 @@
                 </void> 
                </object> 
               </void> 
+              <void property="numDistributionKeys"> 
+               <int>1</int> 
+              </void> 
               <void property="numReducers"> 
                <int>-1</int> 
               </void> 
@@ -1925,6 +1943,9 @@
             </void> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+              <void property="distinctColumnIndices"> 
+               <object class="java.util.ArrayList"/> 
+              </void> 
               <void property="keyCols"> 
                <object id="ArrayList3" class="java.util.ArrayList"> 
                 <void method="add"> 
@@ -1971,6 +1992,9 @@
                 </void> 
                </object> 
               </void> 
+              <void property="numDistributionKeys"> 
+               <int>1</int> 
+              </void> 
               <void property="numReducers"> 
                <int>-1</int> 
               </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml Wed Oct 27 19:00:02 2010
@@ -417,6 +417,9 @@
             </void> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+              <void property="distinctColumnIndices"> 
+               <object class="java.util.ArrayList"/> 
+              </void> 
               <void property="keyCols"> 
                <object id="ArrayList0" class="java.util.ArrayList"> 
                 <void method="add"> 
@@ -467,6 +470,9 @@
                 </void> 
                </object> 
               </void> 
+              <void property="numDistributionKeys"> 
+               <int>1</int> 
+              </void> 
               <void property="numReducers"> 
                <int>-1</int> 
               </void> 
@@ -674,6 +680,9 @@
             </void> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+              <void property="distinctColumnIndices"> 
+               <object class="java.util.ArrayList"/> 
+              </void> 
               <void property="keyCols"> 
                <object id="ArrayList1" class="java.util.ArrayList"> 
                 <void method="add"> 
@@ -720,6 +729,9 @@
                 </void> 
                </object> 
               </void> 
+              <void property="numDistributionKeys"> 
+               <int>1</int> 
+              </void> 
               <void property="numReducers"> 
                <int>-1</int> 
               </void> 
@@ -945,6 +957,9 @@
             </void> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+              <void property="distinctColumnIndices"> 
+               <object class="java.util.ArrayList"/> 
+              </void> 
               <void property="keyCols"> 
                <object id="ArrayList2" class="java.util.ArrayList"> 
                 <void method="add"> 
@@ -991,6 +1006,9 @@
                 </void> 
                </object> 
               </void> 
+              <void property="numDistributionKeys"> 
+               <int>1</int> 
+              </void> 
               <void property="numReducers"> 
                <int>-1</int> 
               </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml?rev=1028072&r1=1028071&r2=1028072&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml Wed Oct 27 19:00:02 2010
@@ -235,6 +235,9 @@
                         </void> 
                         <void property="conf"> 
                          <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                          <void property="distinctColumnIndices"> 
+                           <object class="java.util.ArrayList"/> 
+                          </void> 
                           <void property="keyCols"> 
                            <object id="ArrayList0" class="java.util.ArrayList"> 
                             <void method="add"> 
@@ -278,6 +281,9 @@
                             </void> 
                            </object> 
                           </void> 
+                          <void property="numDistributionKeys"> 
+                           <int>1</int> 
+                          </void> 
                           <void property="numReducers"> 
                            <int>-1</int> 
                           </void> 
@@ -927,6 +933,9 @@
                         </void> 
                         <void property="conf"> 
                          <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
+                          <void property="distinctColumnIndices"> 
+                           <object class="java.util.ArrayList"/> 
+                          </void> 
                           <void property="keyCols"> 
                            <object id="ArrayList2" class="java.util.ArrayList"> 
                             <void method="add"> 
@@ -970,6 +979,9 @@
                             </void> 
                            </object> 
                           </void> 
+                          <void property="numDistributionKeys"> 
+                           <int>1</int> 
+                          </void> 
                           <void property="numReducers"> 
                            <int>-1</int> 
                           </void>