hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zs...@apache.org
Subject svn commit: r796133 [2/2] - in /hadoop/hive/trunk: ./ data/files/ ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ ql/src/java/org/apache/hadoop/hive/ql/parse/ ql/src/java/org/apache/hadoop/hive/ql/plan/ ql/s...
Date Tue, 21 Jul 2009 03:02:53 GMT
Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_map.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_map.q.out?rev=796133&r1=796132&r2=796133&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_map.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_map.q.out Tue Jul 21 03:02:52
2009
@@ -9,73 +9,81 @@
 
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
-  Stage-0 depends on stages: Stage-2
   Stage-3 depends on stages: Stage-2
-  Stage-1 depends on stages: Stage-3
+  Stage-0 depends on stages: Stage-3
+  Stage-4 depends on stages: Stage-2
+  Stage-1 depends on stages: Stage-4
 
 STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
         src 
-            Select Operator
-              expressions:
-                    expr: key
+            Reduce Output Operator
+              key expressions:
+                    expr: substr(value, 5)
                     type: string
-                    expr: value
+              sort order: +
+              Map-reduce partition columns:
+                    expr: substr(value, 5)
                     type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(value, 5))
-                keys:
-                      expr: key
-                      type: string
-                      expr: substr(value, 5)
-                      type: string
-                mode: hash
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                  sort order: ++
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col2
-                        type: bigint
-            Select Operator
-              expressions:
+              tag: -1
+              value expressions:
                     expr: key
                     type: string
-                    expr: value
+      Reduce Operator Tree:
+        Forward
+          Group By Operator
+            aggregations:
+                  expr: count(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+            mode: hash
+            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(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+            mode: hash
+            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-3
+    Map Reduce
+      Alias -> Map Operator Tree:
+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_1/build/ql/tmp/1595587809/10004

+            Reduce Output Operator
+              key expressions:
+                    expr: _col0
                     type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(value, 5))
-                keys:
-                      expr: key
-                      type: string
-                      expr: substr(value, 5)
-                      type: string
-                mode: hash
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+              sort order: +
+              Map-reduce partition columns:
+                    expr: _col0
+                    type: string
+              tag: -1
+              value expressions:
+                    expr: _col1
+                    type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col1)
+                expr: count(VALUE._col0)
           keys:
                 expr: KEY._col0
                 type: string
-          mode: mergepartial
+          mode: final
           Select Operator
             expressions:
                   expr: _col0
@@ -107,32 +115,30 @@
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: dest1
 
-  Stage: Stage-3
+  Stage: Stage-4
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/794989277/10004 
+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_1/build/ql/tmp/1595587809/10005

             Reduce Output Operator
               key expressions:
                     expr: _col0
                     type: string
-                    expr: _col1
-                    type: string
-              sort order: ++
+              sort order: +
               Map-reduce partition columns:
                     expr: _col0
                     type: string
               tag: -1
               value expressions:
-                    expr: _col2
+                    expr: _col1
                     type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col1)
+                expr: count(VALUE._col0)
           keys:
                 expr: KEY._col0
                 type: string
-          mode: mergepartial
+          mode: final
           Select Operator
             expressions:
                   expr: _col0
@@ -173,7 +179,7 @@
 Output: default/dest2
 query: SELECT DEST1.* FROM DEST1
 Input: default/dest1
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/464738216/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_1/build/ql/tmp/929246458/10000
 0	1
 10	1
 100	1
@@ -485,7 +491,7 @@
 98	1
 query: SELECT DEST2.* FROM DEST2
 Input: default/dest2
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/989476641/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_1/build/ql/tmp/1213240639/10000
 0	1
 10	1
 100	1

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_map_skew.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_map_skew.q.out?rev=796133&r1=796132&r2=796133&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_map_skew.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_map_skew.q.out Tue Jul 21
03:02:52 2009
@@ -11,86 +11,59 @@
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
   Stage-0 depends on stages: Stage-3
-  Stage-4 depends on stages: Stage-3
-  Stage-5 depends on stages: Stage-4
-  Stage-1 depends on stages: Stage-5
+  Stage-4 depends on stages: Stage-2
+  Stage-1 depends on stages: Stage-4
 
 STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
         src 
-            Select Operator
-              expressions:
-                    expr: key
+            Reduce Output Operator
+              key expressions:
+                    expr: substr(value, 5)
                     type: string
-                    expr: value
+              sort order: +
+              Map-reduce partition columns:
+                    expr: substr(value, 5)
                     type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(value, 5))
-                keys:
-                      expr: key
-                      type: string
-                      expr: substr(value, 5)
-                      type: string
-                mode: hash
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                  sort order: ++
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col2
-                        type: bigint
-            Select Operator
-              expressions:
+              tag: -1
+              value expressions:
                     expr: key
                     type: string
-                    expr: value
-                    type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(value, 5))
-                keys:
-                      expr: key
-                      type: string
-                      expr: substr(value, 5)
-                      type: string
-                mode: hash
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
       Reduce Operator Tree:
-        Group By Operator
-          aggregations:
-                expr: count(DISTINCT KEY._col1)
-          keys:
-                expr: KEY._col0
-                type: string
-          mode: partials
-          File Output Operator
-            compressed: false
-            GlobalTableId: 0
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+        Forward
+          Group By Operator
+            aggregations:
+                  expr: count(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+            mode: hash
+            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(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+            mode: hash
+            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-3
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1950398352/10004

+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/2105051611/10004

             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -145,42 +118,7 @@
   Stage: Stage-4
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1950398352/10005

-            Reduce Output Operator
-              key expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: string
-              sort order: ++
-              Map-reduce partition columns:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: string
-              tag: -1
-              value expressions:
-                    expr: _col2
-                    type: bigint
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations:
-                expr: count(DISTINCT KEY._col1)
-          keys:
-                expr: KEY._col0
-                type: string
-          mode: partials
-          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-5
-    Map Reduce
-      Alias -> Map Operator Tree:
-        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1950398352/10006

+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/2105051611/10005

             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -241,7 +179,7 @@
 Output: default/dest2
 query: SELECT DEST1.* FROM DEST1
 Input: default/dest1
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/53142172/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/1046151185/10000
 0	1
 10	1
 100	1
@@ -553,7 +491,7 @@
 98	1
 query: SELECT DEST2.* FROM DEST2
 Input: default/dest2
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1788932250/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/236348894/10000
 0	1
 10	1
 100	1

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_noskew.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_noskew.q.out?rev=796133&r1=796132&r2=796133&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_noskew.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby8_noskew.q.out Tue Jul 21
03:02:52 2009
@@ -9,52 +9,81 @@
 
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
-  Stage-0 depends on stages: Stage-2
   Stage-3 depends on stages: Stage-2
-  Stage-1 depends on stages: Stage-3
+  Stage-0 depends on stages: Stage-3
+  Stage-4 depends on stages: Stage-2
+  Stage-1 depends on stages: Stage-4
 
 STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
         src 
-            Select Operator
-              expressions:
-                    expr: key
+            Reduce Output Operator
+              key expressions:
+                    expr: substr(value, 5)
                     type: string
-                    expr: value
+              sort order: +
+              Map-reduce partition columns:
+                    expr: substr(value, 5)
                     type: string
-              Reduce Output Operator
-                key expressions:
-                      expr: key
-                      type: string
-                      expr: substr(value, 5)
-                      type: string
-                sort order: ++
-                Map-reduce partition columns:
-                      expr: key
-                      type: string
-                tag: -1
-            Select Operator
-              expressions:
+              tag: -1
+              value expressions:
                     expr: key
                     type: string
-                    expr: value
+      Reduce Operator Tree:
+        Forward
+          Group By Operator
+            aggregations:
+                  expr: count(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+            mode: hash
+            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(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+            mode: hash
+            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-3
+    Map Reduce
+      Alias -> Map Operator Tree:
+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_0/build/ql/tmp/1185580131/10004

+            Reduce Output Operator
+              key expressions:
+                    expr: _col0
                     type: string
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                table:
-                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+              sort order: +
+              Map-reduce partition columns:
+                    expr: _col0
+                    type: string
+              tag: -1
+              value expressions:
+                    expr: _col1
+                    type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col1)
+                expr: count(VALUE._col0)
           keys:
                 expr: KEY._col0
                 type: string
-          mode: complete
+          mode: final
           Select Operator
             expressions:
                   expr: _col0
@@ -86,29 +115,30 @@
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: dest1
 
-  Stage: Stage-3
+  Stage: Stage-4
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/511682888/10004 
+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_0/build/ql/tmp/1185580131/10005

             Reduce Output Operator
               key expressions:
-                    expr: key
-                    type: string
-                    expr: substr(value, 5)
+                    expr: _col0
                     type: string
-              sort order: ++
+              sort order: +
               Map-reduce partition columns:
-                    expr: key
+                    expr: _col0
                     type: string
               tag: -1
+              value expressions:
+                    expr: _col1
+                    type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col1)
+                expr: count(VALUE._col0)
           keys:
                 expr: KEY._col0
                 type: string
-          mode: complete
+          mode: final
           Select Operator
             expressions:
                   expr: _col0
@@ -149,7 +179,7 @@
 Output: default/dest2
 query: SELECT DEST1.* FROM DEST1
 Input: default/dest1
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2002182053/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_0/build/ql/tmp/1286370575/10000
 0	1
 10	1
 100	1
@@ -461,7 +491,7 @@
 98	1
 query: SELECT DEST2.* FROM DEST2
 Input: default/dest2
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/673356891/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_0/build/ql/tmp/1750991450/10000
 0	1
 10	1
 100	1

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby9.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby9.q.out?rev=796133&r1=796132&r2=796133&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby9.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby9.q.out Tue Jul 21 03:02:52
2009
@@ -11,75 +11,85 @@
 
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
-  Stage-0 depends on stages: Stage-2
   Stage-3 depends on stages: Stage-2
-  Stage-1 depends on stages: Stage-3
+  Stage-0 depends on stages: Stage-3
+  Stage-4 depends on stages: Stage-2
+  Stage-1 depends on stages: Stage-4
 
 STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
         src 
-            Select Operator
-              expressions:
-                    expr: key
+            Reduce Output Operator
+              key expressions:
+                    expr: substr(value, 5)
                     type: string
-                    expr: value
+              sort order: +
+              Map-reduce partition columns:
+                    expr: substr(value, 5)
                     type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(value, 5))
-                keys:
-                      expr: key
-                      type: string
-                      expr: substr(value, 5)
-                      type: string
-                mode: hash
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                  sort order: ++
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col2
-                        type: bigint
-            Select Operator
-              expressions:
+              tag: -1
+              value expressions:
                     expr: key
                     type: string
                     expr: value
                     type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(value, 5))
-                keys:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                      expr: substr(value, 5)
-                      type: string
-                mode: hash
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+      Reduce Operator Tree:
+        Forward
+          Group By Operator
+            aggregations:
+                  expr: count(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+            mode: hash
+            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(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+                  expr: VALUE._col1
+                  type: string
+            mode: hash
+            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-3
+    Map Reduce
+      Alias -> Map Operator Tree:
+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_2/build/ql/tmp/768622902/10004

+            Reduce Output Operator
+              key expressions:
+                    expr: _col0
+                    type: string
+              sort order: +
+              Map-reduce partition columns:
+                    expr: _col0
+                    type: string
+              tag: -1
+              value expressions:
+                    expr: _col1
+                    type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col1)
+                expr: count(VALUE._col0)
           keys:
                 expr: KEY._col0
                 type: string
-          mode: mergepartial
+          mode: final
           Select Operator
             expressions:
                   expr: _col0
@@ -111,19 +121,17 @@
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: dest1
 
-  Stage: Stage-3
+  Stage: Stage-4
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/620467689/10004 
+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_2/build/ql/tmp/768622902/10005

             Reduce Output Operator
               key expressions:
                     expr: _col0
                     type: string
                     expr: _col1
                     type: string
-                    expr: _col2
-                    type: string
-              sort order: +++
+              sort order: ++
               Map-reduce partition columns:
                     expr: _col0
                     type: string
@@ -131,18 +139,18 @@
                     type: string
               tag: -1
               value expressions:
-                    expr: _col3
+                    expr: _col2
                     type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col2)
+                expr: count(VALUE._col0)
           keys:
                 expr: KEY._col0
                 type: string
                 expr: KEY._col1
                 type: string
-          mode: mergepartial
+          mode: final
           Select Operator
             expressions:
                   expr: _col0
@@ -187,7 +195,7 @@
 Output: default/dest2
 query: SELECT DEST1.* FROM DEST1
 Input: default/dest1
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1918642131/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_2/build/ql/tmp/712785376/10000
 0	1
 10	1
 100	1
@@ -499,7 +507,7 @@
 98	1
 query: SELECT DEST2.* FROM DEST2
 Input: default/dest2
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/925610192/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_2/build/ql/tmp/55172954/10000
 0	val_0	1
 10	val_10	1
 100	val_100	1

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/union17.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/union17.q.out?rev=796133&r1=796132&r2=796133&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/union17.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/union17.q.out Tue Jul 21 03:02:52
2009
@@ -15,15 +15,17 @@
 
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
-  Stage-3 depends on stages: Stage-2, Stage-5
-  Stage-0 depends on stages: Stage-3
+  Stage-3 depends on stages: Stage-2, Stage-6
   Stage-4 depends on stages: Stage-3
-  Stage-1 depends on stages: Stage-4
-  Stage-5 is a root stage
-  Stage-3 depends on stages: Stage-2, Stage-5
-  Stage-0 depends on stages: Stage-3
+  Stage-0 depends on stages: Stage-4
+  Stage-5 depends on stages: Stage-3
+  Stage-1 depends on stages: Stage-5
+  Stage-6 is a root stage
+  Stage-3 depends on stages: Stage-2, Stage-6
   Stage-4 depends on stages: Stage-3
-  Stage-1 depends on stages: Stage-4
+  Stage-0 depends on stages: Stage-4
+  Stage-5 depends on stages: Stage-3
+  Stage-1 depends on stages: Stage-5
 
 STAGE PLANS:
   Stage: Stage-2
@@ -62,122 +64,93 @@
   Stage: Stage-3
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2115299971/10004

+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/575000555/10004

           Union
-            Select Operator
-              expressions:
-                    expr: _col0
+            Reduce Output Operator
+              key expressions:
+                    expr: substr(_col1, 5)
                     type: string
-                    expr: _col1
+              sort order: +
+              Map-reduce partition columns:
+                    expr: substr(_col1, 5)
                     type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(_col1, 5))
-                keys:
-                      expr: _col0
-                      type: string
-                      expr: substr(_col1, 5)
-                      type: string
-                mode: hash
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                  sort order: ++
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col2
-                        type: bigint
-            Select Operator
-              expressions:
+              tag: -1
+              value expressions:
                     expr: _col0
                     type: string
                     expr: _col1
                     type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(_col1, 5))
-                keys:
-                      expr: _col0
-                      type: string
-                      expr: _col1
-                      type: string
-                      expr: substr(_col1, 5)
-                      type: string
-                mode: hash
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2115299971/10006

+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/575000555/10007

           Union
-            Select Operator
-              expressions:
+            Reduce Output Operator
+              key expressions:
+                    expr: substr(_col1, 5)
+                    type: string
+              sort order: +
+              Map-reduce partition columns:
+                    expr: substr(_col1, 5)
+                    type: string
+              tag: -1
+              value expressions:
                     expr: _col0
                     type: string
                     expr: _col1
                     type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(_col1, 5))
-                keys:
-                      expr: _col0
-                      type: string
-                      expr: substr(_col1, 5)
-                      type: string
-                mode: hash
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-                  sort order: ++
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col2
-                        type: bigint
-            Select Operator
-              expressions:
+      Reduce Operator Tree:
+        Forward
+          Group By Operator
+            aggregations:
+                  expr: count(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+            mode: hash
+            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(DISTINCT KEY._col0)
+            keys:
+                  expr: VALUE._col0
+                  type: string
+                  expr: VALUE._col1
+                  type: string
+            mode: hash
+            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-4
+    Map Reduce
+      Alias -> Map Operator Tree:
+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/575000555/10005

+            Reduce Output Operator
+              key expressions:
                     expr: _col0
                     type: string
-                    expr: _col1
+              sort order: +
+              Map-reduce partition columns:
+                    expr: _col0
                     type: string
-              Group By Operator
-                aggregations:
-                      expr: count(DISTINCT substr(_col1, 5))
-                keys:
-                      expr: _col0
-                      type: string
-                      expr: _col1
-                      type: string
-                      expr: substr(_col1, 5)
-                      type: string
-                mode: hash
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+              tag: -1
+              value expressions:
+                    expr: _col1
+                    type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col1)
+                expr: count(VALUE._col0)
           keys:
                 expr: KEY._col0
                 type: string
-          mode: mergepartial
+          mode: final
           Select Operator
             expressions:
                   expr: _col0
@@ -203,19 +176,17 @@
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: dest1
 
-  Stage: Stage-4
+  Stage: Stage-5
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2115299971/10005

+        file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/575000555/10006

             Reduce Output Operator
               key expressions:
                     expr: _col0
                     type: string
                     expr: _col1
                     type: string
-                    expr: _col2
-                    type: string
-              sort order: +++
+              sort order: ++
               Map-reduce partition columns:
                     expr: _col0
                     type: string
@@ -223,18 +194,18 @@
                     type: string
               tag: -1
               value expressions:
-                    expr: _col3
+                    expr: _col2
                     type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
-                expr: count(DISTINCT KEY._col2)
+                expr: count(VALUE._col0)
           keys:
                 expr: KEY._col0
                 type: string
                 expr: KEY._col1
                 type: string
-          mode: mergepartial
+          mode: final
           Select Operator
             expressions:
                   expr: _col0
@@ -262,7 +233,7 @@
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: dest2
 
-  Stage: Stage-5
+  Stage: Stage-6
     Map Reduce
       Alias -> Map Operator Tree:
         null-subquery2:unionsrc-subquery2:s2 
@@ -290,7 +261,7 @@
 Output: default/dest2
 query: SELECT DEST1.* FROM DEST1
 Input: default/dest1
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1781230787/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/401548488/10000
 0	1
 10	1
 100	1
@@ -603,7 +574,7 @@
 tst1	1
 query: SELECT DEST2.* FROM DEST2
 Input: default/dest2
-Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/891535145/10000
+Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/1820185235/10000
 0	val_0	1
 10	val_10	1
 100	val_100	1

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfo.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfo.java?rev=796133&r1=796132&r2=796133&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfo.java
(original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfo.java
Tue Jul 21 03:02:52 2009
@@ -51,4 +51,14 @@
     return getTypeName();
   }
 
+  public boolean equals(Object o) {
+   if (!(o instanceof TypeInfo))
+     return false;
+   TypeInfo dest = (TypeInfo)o;
+   if (getCategory() != dest.getCategory())
+     return false;
+   if (getTypeName() != dest.getTypeName())
+     return false;
+   return true;
+  }
 }



Mime
View raw message