You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dh...@apache.org on 2008/10/21 20:11:18 UTC

svn commit: r706704 [11/23] - in /hadoop/core/trunk: ./ src/contrib/hive/ src/contrib/hive/bin/ src/contrib/hive/cli/src/java/org/apache/hadoop/hive/cli/ src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/ src/contrib/hive/conf/ src/contrib/h...

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby2.q.xml Tue Oct 21 11:11:05 2008
@@ -35,7 +35,7 @@
                  <boolean>true</boolean> 
                 </void> 
                 <void property="sourceDir"> 
-                 <string>/tmp/hive-zshao/708847402.10000.insclause-0</string> 
+                 <string>/tmp/hive-zshao/62629504/152527911.10000.insclause-0</string> 
                 </void> 
                 <void property="table"> 
                  <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -55,8 +55,8 @@
                      <string>dest1</string> 
                     </void> 
                     <void method="put"> 
-                     <string>bucket_field_name</string> 
-                     <string></string> 
+                     <string>serialization.ddl</string> 
+                     <string>struct dest1 { string key, string value}</string> 
                     </void> 
                     <void method="put"> 
                      <string>serialization.format</string> 
@@ -67,16 +67,12 @@
                      <string>key,value</string> 
                     </void> 
                     <void method="put"> 
-                     <string>field_to_dimension</string> 
-                     <string></string> 
-                    </void> 
-                    <void method="put"> 
                      <string>bucket_count</string> 
                      <string>-1</string> 
                     </void> 
                     <void method="put"> 
                      <string>serialization.lib</string> 
-                     <string>simple_meta</string> 
+                     <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                     </void> 
                     <void method="put"> 
                      <string>file.inputformat</string> 
@@ -88,12 +84,12 @@
                     </void> 
                     <void method="put"> 
                      <string>location</string> 
-                     <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                     <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                     </void> 
                    </object> 
                   </void> 
                   <void property="serdeClassName"> 
-                   <string>simple_meta</string> 
+                   <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                   </void> 
                  </object> 
                 </void> 
@@ -122,10 +118,13 @@
         <void property="aliasToWork"> 
          <object class="java.util.HashMap"> 
           <void method="put"> 
-           <string>/tmp/hive-zshao/708847402.10001</string> 
+           <string>/tmp/hive-zshao/62629504/152527911.10001</string> 
            <object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator"> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc"> 
+              <void property="inferNumReducers"> 
+               <boolean>true</boolean> 
+              </void> 
               <void property="keyCols"> 
                <object class="java.util.ArrayList"> 
                 <void method="add"> 
@@ -172,6 +171,9 @@
               <void property="numPartitionFields"> 
                <int>1</int> 
               </void> 
+              <void property="numReducers"> 
+               <int>-1</int> 
+              </void> 
               <void property="tag"> 
                <int>-1</int> 
               </void> 
@@ -268,13 +270,16 @@
           </void> 
          </object> 
         </void> 
+        <void property="inferNumReducers"> 
+         <boolean>true</boolean> 
+        </void> 
         <void property="pathToAliases"> 
          <object class="java.util.LinkedHashMap"> 
           <void method="put"> 
-           <string>/tmp/hive-zshao/708847402.10001</string> 
+           <string>/tmp/hive-zshao/62629504/152527911.10001</string> 
            <object class="java.util.ArrayList"> 
             <void method="add"> 
-             <string>/tmp/hive-zshao/708847402.10001</string> 
+             <string>/tmp/hive-zshao/62629504/152527911.10001</string> 
             </void> 
            </object> 
           </void> 
@@ -283,7 +288,7 @@
         <void property="pathToPartitionInfo"> 
          <object class="java.util.LinkedHashMap"> 
           <void method="put"> 
-           <string>/tmp/hive-zshao/708847402.10001</string> 
+           <string>/tmp/hive-zshao/62629504/152527911.10001</string> 
            <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
             <void property="tableDesc"> 
              <object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -327,7 +332,7 @@
                   <void property="conf"> 
                    <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                     <void property="dirName"> 
-                     <string>/tmp/hive-zshao/708847402.10000.insclause-0</string> 
+                     <string>/tmp/hive-zshao/62629504/152527911.10000.insclause-0</string> 
                     </void> 
                     <void property="tableInfo"> 
                      <object idref="tableDesc0"/> 
@@ -603,13 +608,16 @@
                   <void property="UDFMethod"> 
                    <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
                     <string>evaluate</string> 
-                    <array class="java.lang.Class" length="2"> 
+                    <array class="java.lang.Class" length="3"> 
                      <void index="0"> 
                       <class>java.lang.String</class> 
                      </void> 
                      <void index="1"> 
                       <class>int</class> 
                      </void> 
+                     <void index="2"> 
+                      <class>int</class> 
+                     </void> 
                     </array> 
                    </object> 
                   </void> 
@@ -618,7 +626,7 @@
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
                       <void property="column"> 
-                       <string>value</string> 
+                       <string>key</string> 
                       </void> 
                       <void property="typeInfo"> 
                        <object idref="PrimitiveTypeInfo0"/> 
@@ -635,7 +643,17 @@
                        </object> 
                       </void> 
                       <void property="value"> 
-                       <int>4</int> 
+                       <int>0</int> 
+                      </void> 
+                     </object> 
+                    </void> 
+                    <void method="add"> 
+                     <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                      <void property="typeInfo"> 
+                       <object idref="PrimitiveTypeInfo1"/> 
+                      </void> 
+                      <void property="value"> 
+                       <int>1</int> 
                       </void> 
                      </object> 
                     </void> 
@@ -646,61 +664,6 @@
                   </void> 
                  </object> 
                 </void> 
-               </object> 
-              </void> 
-              <void property="keySerializeInfo"> 
-               <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
-                <void property="deserializerClass"> 
-                 <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
-                </void> 
-                <void property="inputFileFormatClass"> 
-                 <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                </void> 
-                <void property="outputFileFormatClass"> 
-                 <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
-                </void> 
-                <void property="properties"> 
-                 <object class="java.util.Properties"> 
-                  <void method="put"> 
-                   <string>columns</string> 
-                   <string>0</string> 
-                  </void> 
-                  <void method="put"> 
-                   <string>serialization.format</string> 
-                   <string>1</string> 
-                  </void> 
-                 </object> 
-                </void> 
-               </object> 
-              </void> 
-              <void property="numPartitionFields"> 
-               <int>1</int> 
-              </void> 
-              <void property="tag"> 
-               <int>-1</int> 
-              </void> 
-              <void property="valueCols"> 
-               <object class="java.util.ArrayList"> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                  <void property="column"> 
-                   <string>key</string> 
-                  </void> 
-                  <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                  <void property="column"> 
-                   <string>value</string> 
-                  </void> 
-                  <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
                 <void method="add"> 
                  <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
                   <void property="UDFClass"> 
@@ -709,16 +672,13 @@
                   <void property="UDFMethod"> 
                    <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
                     <string>evaluate</string> 
-                    <array class="java.lang.Class" length="3"> 
+                    <array class="java.lang.Class" length="2"> 
                      <void index="0"> 
                       <class>java.lang.String</class> 
                      </void> 
                      <void index="1"> 
                       <class>int</class> 
                      </void> 
-                     <void index="2"> 
-                      <class>int</class> 
-                     </void> 
                     </array> 
                    </object> 
                   </void> 
@@ -727,7 +687,7 @@
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
                       <void property="column"> 
-                       <string>key</string> 
+                       <string>value</string> 
                       </void> 
                       <void property="typeInfo"> 
                        <object idref="PrimitiveTypeInfo0"/> 
@@ -740,17 +700,7 @@
                        <object idref="PrimitiveTypeInfo1"/> 
                       </void> 
                       <void property="value"> 
-                       <int>0</int> 
-                      </void> 
-                     </object> 
-                    </void> 
-                    <void method="add"> 
-                     <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
-                      <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
-                      </void> 
-                      <void property="value"> 
-                       <int>1</int> 
+                       <int>4</int> 
                       </void> 
                      </object> 
                     </void> 
@@ -763,6 +713,43 @@
                 </void> 
                </object> 
               </void> 
+              <void property="keySerializeInfo"> 
+               <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                <void property="deserializerClass"> 
+                 <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                </void> 
+                <void property="inputFileFormatClass"> 
+                 <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                </void> 
+                <void property="outputFileFormatClass"> 
+                 <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                </void> 
+                <void property="properties"> 
+                 <object class="java.util.Properties"> 
+                  <void method="put"> 
+                   <string>columns</string> 
+                   <string>0,1</string> 
+                  </void> 
+                  <void method="put"> 
+                   <string>serialization.format</string> 
+                   <string>1</string> 
+                  </void> 
+                 </object> 
+                </void> 
+               </object> 
+              </void> 
+              <void property="numPartitionFields"> 
+               <int>2147483647</int> 
+              </void> 
+              <void property="numReducers"> 
+               <int>-1</int> 
+              </void> 
+              <void property="tag"> 
+               <int>-1</int> 
+              </void> 
+              <void property="valueCols"> 
+               <object class="java.util.ArrayList"/> 
+              </void> 
               <void property="valueSerializeInfo"> 
                <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
                 <void property="deserializerClass"> 
@@ -778,7 +765,7 @@
                  <object class="java.util.Properties"> 
                   <void method="put"> 
                    <string>columns</string> 
-                   <string>0,1,2</string> 
+                   <string></string> 
                   </void> 
                   <void method="put"> 
                    <string>serialization.format</string> 
@@ -793,7 +780,7 @@
             <void property="schema"> 
              <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
               <void property="signature"> 
-               <object id="Vector1" class="java.util.Vector"> 
+               <object class="java.util.Vector"> 
                 <void method="add"> 
                  <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
                   <void property="internalName"> 
@@ -807,27 +794,7 @@
                 <void method="add"> 
                  <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
                   <void property="internalName"> 
-                   <string>VALUE.0</string> 
-                  </void> 
-                  <void property="type"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                  <void property="internalName"> 
-                   <string>VALUE.1</string> 
-                  </void> 
-                  <void property="type"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                  <void property="internalName"> 
-                   <string>VALUE.2</string> 
+                   <string>KEY.1</string> 
                   </void> 
                   <void property="type"> 
                    <object idref="PrimitiveTypeInfo0"/> 
@@ -877,7 +844,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -889,7 +856,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -912,8 +879,8 @@
              <string>src</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -924,16 +891,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>-1</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -945,12 +908,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 
@@ -959,124 +922,102 @@
      </object> 
     </void> 
     <void property="reducer"> 
-     <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator"> 
+     <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator"> 
       <void property="childOperators"> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
-         <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator"> 
-          <void property="childOperators"> 
-           <object class="java.util.ArrayList"> 
-            <void method="add"> 
-             <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
-              <void property="conf"> 
-               <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
-                <void property="dirName"> 
-                 <string>/tmp/hive-zshao/708847402.10001</string> 
+         <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
+          <void property="conf"> 
+           <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+            <void property="dirName"> 
+             <string>/tmp/hive-zshao/62629504/152527911.10001</string> 
+            </void> 
+            <void property="tableInfo"> 
+             <object idref="tableDesc1"/> 
+            </void> 
+           </object> 
+          </void> 
+          <void property="schema"> 
+           <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
+            <void property="signature"> 
+             <object class="java.util.Vector"> 
+              <void method="add"> 
+               <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                <void property="internalName"> 
+                 <string>0</string> 
                 </void> 
-                <void property="tableInfo"> 
-                 <object idref="tableDesc1"/> 
+                <void property="type"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
-              <void property="schema"> 
-               <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
-                <void property="signature"> 
-                 <object class="java.util.Vector"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                    <void property="internalName"> 
-                     <string>0</string> 
-                    </void> 
-                    <void property="type"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                    <void property="internalName"> 
-                     <string>1</string> 
-                    </void> 
-                    <void property="type"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                    <void property="internalName"> 
-                     <string>2</string> 
-                    </void> 
-                    <void property="type"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+              <void method="add"> 
+               <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                <void property="internalName"> 
+                 <string>1</string> 
+                </void> 
+                <void property="type"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
-             </object> 
-            </void> 
-           </object> 
-          </void> 
-          <void property="conf"> 
-           <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-            <void property="aggregators"> 
-             <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                <void property="aggregationClass"> 
-                 <class>org.apache.hadoop.hive.ql.udf.UDAFCount</class> 
-                </void> 
-                <void property="distinct"> 
-                 <boolean>true</boolean> 
+               <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                <void property="internalName"> 
+                 <string>2</string> 
                 </void> 
-                <void property="parameters"> 
-                 <object class="java.util.ArrayList"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                    <void property="column"> 
-                     <string>KEY.0</string> 
-                    </void> 
-                    <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+                <void property="type"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
+             </object> 
+            </void> 
+           </object> 
+          </void> 
+         </object> 
+        </void> 
+       </object> 
+      </void> 
+      <void property="conf"> 
+       <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
+        <void property="aggregators"> 
+         <object class="java.util.ArrayList"> 
+          <void method="add"> 
+           <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
+            <void property="aggregationClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.UDAFCount</class> 
+            </void> 
+            <void property="distinct"> 
+             <boolean>true</boolean> 
+            </void> 
+            <void property="parameters"> 
+             <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                <void property="aggregationClass"> 
-                 <class>org.apache.hadoop.hive.ql.udf.UDAFSum</class> 
+               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                <void property="column"> 
+                 <string>KEY.1</string> 
                 </void> 
-                <void property="parameters"> 
-                 <object class="java.util.ArrayList"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                    <void property="column"> 
-                     <string>KEY.0</string> 
-                    </void> 
-                    <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+                <void property="typeInfo"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
              </object> 
             </void> 
-            <void property="keys"> 
+           </object> 
+          </void> 
+          <void method="add"> 
+           <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
+            <void property="aggregationClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.UDAFSum</class> 
+            </void> 
+            <void property="parameters"> 
              <object class="java.util.ArrayList"> 
               <void method="add"> 
                <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
                 <void property="column"> 
-                 <string>VALUE.2</string> 
+                 <string>KEY.1</string> 
                 </void> 
                 <void property="typeInfo"> 
                  <object idref="PrimitiveTypeInfo0"/> 
@@ -1085,26 +1026,33 @@
               </void> 
              </object> 
             </void> 
-            <void property="mode"> 
-             <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf"> 
-              <string>PARTIAL1</string> 
-             </object> 
-            </void> 
            </object> 
           </void> 
-          <void property="schema"> 
-           <object idref="RowSchema0"/> 
+         </object> 
+        </void> 
+        <void property="keys"> 
+         <object class="java.util.ArrayList"> 
+          <void method="add"> 
+           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+            <void property="column"> 
+             <string>KEY.0</string> 
+            </void> 
+            <void property="typeInfo"> 
+             <object idref="PrimitiveTypeInfo0"/> 
+            </void> 
+           </object> 
           </void> 
          </object> 
         </void> 
+        <void property="mode"> 
+         <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf"> 
+          <string>PARTIAL1</string> 
+         </object> 
+        </void> 
        </object> 
       </void> 
       <void property="schema"> 
-       <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
-        <void property="signature"> 
-         <object idref="Vector1"/> 
-        </void> 
-       </object> 
+       <object idref="RowSchema0"/> 
       </void> 
      </object> 
     </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby3.q.xml Tue Oct 21 11:11:05 2008
@@ -35,7 +35,7 @@
                  <boolean>true</boolean> 
                 </void> 
                 <void property="sourceDir"> 
-                 <string>/tmp/hive-zshao/399409523.10000.insclause-0</string> 
+                 <string>/tmp/hive-zshao/168733871/318815163.10000.insclause-0</string> 
                 </void> 
                 <void property="table"> 
                  <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -55,8 +55,8 @@
                      <string>dest1</string> 
                     </void> 
                     <void method="put"> 
-                     <string>bucket_field_name</string> 
-                     <string></string> 
+                     <string>serialization.ddl</string> 
+                     <string>struct dest1 { string key, string value}</string> 
                     </void> 
                     <void method="put"> 
                      <string>serialization.format</string> 
@@ -67,16 +67,12 @@
                      <string>key,value</string> 
                     </void> 
                     <void method="put"> 
-                     <string>field_to_dimension</string> 
-                     <string></string> 
-                    </void> 
-                    <void method="put"> 
                      <string>bucket_count</string> 
                      <string>-1</string> 
                     </void> 
                     <void method="put"> 
                      <string>serialization.lib</string> 
-                     <string>simple_meta</string> 
+                     <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                     </void> 
                     <void method="put"> 
                      <string>file.inputformat</string> 
@@ -88,12 +84,12 @@
                     </void> 
                     <void method="put"> 
                      <string>location</string> 
-                     <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                     <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                     </void> 
                    </object> 
                   </void> 
                   <void property="serdeClassName"> 
-                   <string>simple_meta</string> 
+                   <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                   </void> 
                  </object> 
                 </void> 
@@ -122,10 +118,13 @@
         <void property="aliasToWork"> 
          <object class="java.util.HashMap"> 
           <void method="put"> 
-           <string>/tmp/hive-zshao/399409523.10001</string> 
+           <string>/tmp/hive-zshao/168733871/318815163.10001</string> 
            <object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator"> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc"> 
+              <void property="inferNumReducers"> 
+               <boolean>true</boolean> 
+              </void> 
               <void property="keyCols"> 
                <object class="java.util.ArrayList"/> 
               </void> 
@@ -154,6 +153,9 @@
                 </void> 
                </object> 
               </void> 
+              <void property="numReducers"> 
+               <int>-1</int> 
+              </void> 
               <void property="tag"> 
                <int>-1</int> 
               </void> 
@@ -304,13 +306,16 @@
           </void> 
          </object> 
         </void> 
+        <void property="inferNumReducers"> 
+         <boolean>true</boolean> 
+        </void> 
         <void property="pathToAliases"> 
          <object class="java.util.LinkedHashMap"> 
           <void method="put"> 
-           <string>/tmp/hive-zshao/399409523.10001</string> 
+           <string>/tmp/hive-zshao/168733871/318815163.10001</string> 
            <object class="java.util.ArrayList"> 
             <void method="add"> 
-             <string>/tmp/hive-zshao/399409523.10001</string> 
+             <string>/tmp/hive-zshao/168733871/318815163.10001</string> 
             </void> 
            </object> 
           </void> 
@@ -319,7 +324,7 @@
         <void property="pathToPartitionInfo"> 
          <object class="java.util.LinkedHashMap"> 
           <void method="put"> 
-           <string>/tmp/hive-zshao/399409523.10001</string> 
+           <string>/tmp/hive-zshao/168733871/318815163.10001</string> 
            <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
             <void property="tableDesc"> 
              <object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -363,7 +368,7 @@
                   <void property="conf"> 
                    <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                     <void property="dirName"> 
-                     <string>/tmp/hive-zshao/399409523.10000.insclause-0</string> 
+                     <string>/tmp/hive-zshao/168733871/318815163.10000.insclause-0</string> 
                     </void> 
                     <void property="tableInfo"> 
                      <object idref="tableDesc0"/> 
@@ -785,34 +790,16 @@
                </object> 
               </void> 
               <void property="numPartitionFields"> 
-               <int>1</int> 
+               <int>2147483647</int> 
+              </void> 
+              <void property="numReducers"> 
+               <int>-1</int> 
               </void> 
               <void property="tag"> 
                <int>-1</int> 
               </void> 
               <void property="valueCols"> 
-               <object class="java.util.ArrayList"> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                  <void property="column"> 
-                   <string>key</string> 
-                  </void> 
-                  <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                  <void property="column"> 
-                   <string>value</string> 
-                  </void> 
-                  <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-               </object> 
+               <object class="java.util.ArrayList"/> 
               </void> 
               <void property="valueSerializeInfo"> 
                <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -829,7 +816,7 @@
                  <object class="java.util.Properties"> 
                   <void method="put"> 
                    <string>columns</string> 
-                   <string>0,1</string> 
+                   <string></string> 
                   </void> 
                   <void method="put"> 
                    <string>serialization.format</string> 
@@ -844,7 +831,7 @@
             <void property="schema"> 
              <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
               <void property="signature"> 
-               <object id="Vector1" class="java.util.Vector"> 
+               <object class="java.util.Vector"> 
                 <void method="add"> 
                  <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
                   <void property="internalName"> 
@@ -855,26 +842,6 @@
                   </void> 
                  </object> 
                 </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                  <void property="internalName"> 
-                   <string>VALUE.0</string> 
-                  </void> 
-                  <void property="type"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                  <void property="internalName"> 
-                   <string>VALUE.1</string> 
-                  </void> 
-                  <void property="type"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
                </object> 
               </void> 
              </object> 
@@ -918,7 +885,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -930,7 +897,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -953,8 +920,8 @@
              <string>src</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -965,16 +932,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>-1</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -986,12 +949,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 
@@ -1000,224 +963,209 @@
      </object> 
     </void> 
     <void property="reducer"> 
-     <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator"> 
+     <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator"> 
       <void property="childOperators"> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
-         <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator"> 
-          <void property="childOperators"> 
-           <object class="java.util.ArrayList"> 
-            <void method="add"> 
-             <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
-              <void property="conf"> 
-               <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
-                <void property="dirName"> 
-                 <string>/tmp/hive-zshao/399409523.10001</string> 
+         <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
+          <void property="conf"> 
+           <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+            <void property="dirName"> 
+             <string>/tmp/hive-zshao/168733871/318815163.10001</string> 
+            </void> 
+            <void property="tableInfo"> 
+             <object idref="tableDesc1"/> 
+            </void> 
+           </object> 
+          </void> 
+          <void property="schema"> 
+           <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
+            <void property="signature"> 
+             <object class="java.util.Vector"> 
+              <void method="add"> 
+               <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                <void property="internalName"> 
+                 <string>0</string> 
                 </void> 
-                <void property="tableInfo"> 
-                 <object idref="tableDesc1"/> 
+                <void property="type"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
-              <void property="schema"> 
-               <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
-                <void property="signature"> 
-                 <object class="java.util.Vector"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                    <void property="internalName"> 
-                     <string>0</string> 
-                    </void> 
-                    <void property="type"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                    <void property="internalName"> 
-                     <string>1</string> 
-                    </void> 
-                    <void property="type"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                    <void property="internalName"> 
-                     <string>2</string> 
-                    </void> 
-                    <void property="type"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                    <void property="internalName"> 
-                     <string>3</string> 
-                    </void> 
-                    <void property="type"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                    <void property="internalName"> 
-                     <string>4</string> 
-                    </void> 
-                    <void property="type"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+              <void method="add"> 
+               <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                <void property="internalName"> 
+                 <string>1</string> 
+                </void> 
+                <void property="type"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
-             </object> 
-            </void> 
-           </object> 
-          </void> 
-          <void property="conf"> 
-           <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-            <void property="aggregators"> 
-             <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                <void property="aggregationClass"> 
-                 <class>org.apache.hadoop.hive.ql.udf.UDAFAvg</class> 
+               <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                <void property="internalName"> 
+                 <string>2</string> 
                 </void> 
-                <void property="distinct"> 
-                 <boolean>true</boolean> 
+                <void property="type"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
-                <void property="parameters"> 
-                 <object class="java.util.ArrayList"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                    <void property="column"> 
-                     <string>KEY.0</string> 
-                    </void> 
-                    <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+               </object> 
+              </void> 
+              <void method="add"> 
+               <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                <void property="internalName"> 
+                 <string>3</string> 
+                </void> 
+                <void property="type"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
               <void method="add"> 
-               <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                <void property="aggregationClass"> 
-                 <class>org.apache.hadoop.hive.ql.udf.UDAFSum</class> 
+               <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                <void property="internalName"> 
+                 <string>4</string> 
                 </void> 
-                <void property="parameters"> 
-                 <object class="java.util.ArrayList"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                    <void property="column"> 
-                     <string>KEY.0</string> 
-                    </void> 
-                    <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+                <void property="type"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
+             </object> 
+            </void> 
+           </object> 
+          </void> 
+         </object> 
+        </void> 
+       </object> 
+      </void> 
+      <void property="conf"> 
+       <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
+        <void property="aggregators"> 
+         <object class="java.util.ArrayList"> 
+          <void method="add"> 
+           <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
+            <void property="aggregationClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.UDAFAvg</class> 
+            </void> 
+            <void property="distinct"> 
+             <boolean>true</boolean> 
+            </void> 
+            <void property="parameters"> 
+             <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                <void property="aggregationClass"> 
-                 <class>org.apache.hadoop.hive.ql.udf.UDAFAvg</class> 
+               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                <void property="column"> 
+                 <string>KEY.0</string> 
                 </void> 
-                <void property="parameters"> 
-                 <object class="java.util.ArrayList"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                    <void property="column"> 
-                     <string>KEY.0</string> 
-                    </void> 
-                    <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+                <void property="typeInfo"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
+             </object> 
+            </void> 
+           </object> 
+          </void> 
+          <void method="add"> 
+           <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
+            <void property="aggregationClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.UDAFSum</class> 
+            </void> 
+            <void property="parameters"> 
+             <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                <void property="aggregationClass"> 
-                 <class>org.apache.hadoop.hive.ql.udf.UDAFMin</class> 
+               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                <void property="column"> 
+                 <string>KEY.0</string> 
                 </void> 
-                <void property="parameters"> 
-                 <object class="java.util.ArrayList"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                    <void property="column"> 
-                     <string>KEY.0</string> 
-                    </void> 
-                    <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+                <void property="typeInfo"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
+             </object> 
+            </void> 
+           </object> 
+          </void> 
+          <void method="add"> 
+           <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
+            <void property="aggregationClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.UDAFAvg</class> 
+            </void> 
+            <void property="parameters"> 
+             <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                <void property="aggregationClass"> 
-                 <class>org.apache.hadoop.hive.ql.udf.UDAFMax</class> 
+               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                <void property="column"> 
+                 <string>KEY.0</string> 
                 </void> 
-                <void property="parameters"> 
-                 <object class="java.util.ArrayList"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                    <void property="column"> 
-                     <string>KEY.0</string> 
-                    </void> 
-                    <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+                <void property="typeInfo"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
              </object> 
             </void> 
-            <void property="keys"> 
-             <object class="java.util.ArrayList"/> 
+           </object> 
+          </void> 
+          <void method="add"> 
+           <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
+            <void property="aggregationClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.UDAFMin</class> 
             </void> 
-            <void property="mode"> 
-             <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf"> 
-              <string>PARTIAL1</string> 
+            <void property="parameters"> 
+             <object class="java.util.ArrayList"> 
+              <void method="add"> 
+               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                <void property="column"> 
+                 <string>KEY.0</string> 
+                </void> 
+                <void property="typeInfo"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
+                </void> 
+               </object> 
+              </void> 
              </object> 
             </void> 
            </object> 
           </void> 
-          <void property="schema"> 
-           <object idref="RowSchema0"/> 
+          <void method="add"> 
+           <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
+            <void property="aggregationClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.UDAFMax</class> 
+            </void> 
+            <void property="parameters"> 
+             <object class="java.util.ArrayList"> 
+              <void method="add"> 
+               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                <void property="column"> 
+                 <string>KEY.0</string> 
+                </void> 
+                <void property="typeInfo"> 
+                 <object idref="PrimitiveTypeInfo0"/> 
+                </void> 
+               </object> 
+              </void> 
+             </object> 
+            </void> 
+           </object> 
           </void> 
          </object> 
         </void> 
+        <void property="keys"> 
+         <object class="java.util.ArrayList"/> 
+        </void> 
+        <void property="mode"> 
+         <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf"> 
+          <string>PARTIAL1</string> 
+         </object> 
+        </void> 
        </object> 
       </void> 
       <void property="schema"> 
-       <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
-        <void property="signature"> 
-         <object idref="Vector1"/> 
-        </void> 
-       </object> 
+       <object idref="RowSchema0"/> 
       </void> 
      </object> 
     </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby4.q.xml Tue Oct 21 11:11:05 2008
@@ -35,7 +35,7 @@
                  <boolean>true</boolean> 
                 </void> 
                 <void property="sourceDir"> 
-                 <string>/tmp/hive-zshao/190015277.10000.insclause-0</string> 
+                 <string>/tmp/hive-zshao/843671827/38838214.10000.insclause-0</string> 
                 </void> 
                 <void property="table"> 
                  <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -55,8 +55,8 @@
                      <string>dest1</string> 
                     </void> 
                     <void method="put"> 
-                     <string>bucket_field_name</string> 
-                     <string></string> 
+                     <string>serialization.ddl</string> 
+                     <string>struct dest1 { string key, string value}</string> 
                     </void> 
                     <void method="put"> 
                      <string>serialization.format</string> 
@@ -67,16 +67,12 @@
                      <string>key,value</string> 
                     </void> 
                     <void method="put"> 
-                     <string>field_to_dimension</string> 
-                     <string></string> 
-                    </void> 
-                    <void method="put"> 
                      <string>bucket_count</string> 
                      <string>-1</string> 
                     </void> 
                     <void method="put"> 
                      <string>serialization.lib</string> 
-                     <string>simple_meta</string> 
+                     <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                     </void> 
                     <void method="put"> 
                      <string>file.inputformat</string> 
@@ -88,12 +84,12 @@
                     </void> 
                     <void method="put"> 
                      <string>location</string> 
-                     <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                     <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                     </void> 
                    </object> 
                   </void> 
                   <void property="serdeClassName"> 
-                   <string>simple_meta</string> 
+                   <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                   </void> 
                  </object> 
                 </void> 
@@ -122,10 +118,13 @@
         <void property="aliasToWork"> 
          <object class="java.util.HashMap"> 
           <void method="put"> 
-           <string>/tmp/hive-zshao/190015277.10001</string> 
+           <string>/tmp/hive-zshao/843671827/38838214.10001</string> 
            <object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator"> 
             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc"> 
+              <void property="inferNumReducers"> 
+               <boolean>true</boolean> 
+              </void> 
               <void property="keyCols"> 
                <object class="java.util.ArrayList"> 
                 <void method="add"> 
@@ -172,6 +171,9 @@
               <void property="numPartitionFields"> 
                <int>1</int> 
               </void> 
+              <void property="numReducers"> 
+               <int>-1</int> 
+              </void> 
               <void property="tag"> 
                <int>-1</int> 
               </void> 
@@ -227,13 +229,16 @@
           </void> 
          </object> 
         </void> 
+        <void property="inferNumReducers"> 
+         <boolean>true</boolean> 
+        </void> 
         <void property="pathToAliases"> 
          <object class="java.util.LinkedHashMap"> 
           <void method="put"> 
-           <string>/tmp/hive-zshao/190015277.10001</string> 
+           <string>/tmp/hive-zshao/843671827/38838214.10001</string> 
            <object class="java.util.ArrayList"> 
             <void method="add"> 
-             <string>/tmp/hive-zshao/190015277.10001</string> 
+             <string>/tmp/hive-zshao/843671827/38838214.10001</string> 
             </void> 
            </object> 
           </void> 
@@ -242,7 +247,7 @@
         <void property="pathToPartitionInfo"> 
          <object class="java.util.LinkedHashMap"> 
           <void method="put"> 
-           <string>/tmp/hive-zshao/190015277.10001</string> 
+           <string>/tmp/hive-zshao/843671827/38838214.10001</string> 
            <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
             <void property="tableDesc"> 
              <object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -286,7 +291,7 @@
                   <void property="conf"> 
                    <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                     <void property="dirName"> 
-                     <string>/tmp/hive-zshao/190015277.10000.insclause-0</string> 
+                     <string>/tmp/hive-zshao/843671827/38838214.10000.insclause-0</string> 
                     </void> 
                     <void property="tableInfo"> 
                      <object idref="tableDesc0"/> 
@@ -415,75 +420,6 @@
               <void property="keyCols"> 
                <object class="java.util.ArrayList"> 
                 <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
-                  <void property="typeInfo"> 
-                   <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
-                    <void property="primitiveClass"> 
-                     <class>java.lang.Integer</class> 
-                    </void> 
-                   </object> 
-                  </void> 
-                  <void property="value"> 
-                   <int>0</int> 
-                  </void> 
-                 </object> 
-                </void> 
-               </object> 
-              </void> 
-              <void property="keySerializeInfo"> 
-               <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
-                <void property="deserializerClass"> 
-                 <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
-                </void> 
-                <void property="inputFileFormatClass"> 
-                 <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                </void> 
-                <void property="outputFileFormatClass"> 
-                 <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
-                </void> 
-                <void property="properties"> 
-                 <object class="java.util.Properties"> 
-                  <void method="put"> 
-                   <string>columns</string> 
-                   <string>0</string> 
-                  </void> 
-                  <void method="put"> 
-                   <string>serialization.format</string> 
-                   <string>1</string> 
-                  </void> 
-                 </object> 
-                </void> 
-               </object> 
-              </void> 
-              <void property="numPartitionFields"> 
-               <int>-1</int> 
-              </void> 
-              <void property="tag"> 
-               <int>-1</int> 
-              </void> 
-              <void property="valueCols"> 
-               <object class="java.util.ArrayList"> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                  <void property="column"> 
-                   <string>key</string> 
-                  </void> 
-                  <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                  <void property="column"> 
-                   <string>value</string> 
-                  </void> 
-                  <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-                <void method="add"> 
                  <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
                   <void property="UDFClass"> 
                    <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
@@ -519,7 +455,11 @@
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                        <void property="primitiveClass"> 
+                         <class>java.lang.Integer</class> 
+                        </void> 
+                       </object> 
                       </void> 
                       <void property="value"> 
                        <int>0</int> 
@@ -545,6 +485,43 @@
                 </void> 
                </object> 
               </void> 
+              <void property="keySerializeInfo"> 
+               <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                <void property="deserializerClass"> 
+                 <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                </void> 
+                <void property="inputFileFormatClass"> 
+                 <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                </void> 
+                <void property="outputFileFormatClass"> 
+                 <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                </void> 
+                <void property="properties"> 
+                 <object class="java.util.Properties"> 
+                  <void method="put"> 
+                   <string>columns</string> 
+                   <string>0</string> 
+                  </void> 
+                  <void method="put"> 
+                   <string>serialization.format</string> 
+                   <string>1</string> 
+                  </void> 
+                 </object> 
+                </void> 
+               </object> 
+              </void> 
+              <void property="numPartitionFields"> 
+               <int>-1</int> 
+              </void> 
+              <void property="numReducers"> 
+               <int>-1</int> 
+              </void> 
+              <void property="tag"> 
+               <int>-1</int> 
+              </void> 
+              <void property="valueCols"> 
+               <object class="java.util.ArrayList"/> 
+              </void> 
               <void property="valueSerializeInfo"> 
                <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
                 <void property="deserializerClass"> 
@@ -560,7 +537,7 @@
                  <object class="java.util.Properties"> 
                   <void method="put"> 
                    <string>columns</string> 
-                   <string>0,1,2</string> 
+                   <string></string> 
                   </void> 
                   <void method="put"> 
                    <string>serialization.format</string> 
@@ -575,31 +552,11 @@
             <void property="schema"> 
              <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
               <void property="signature"> 
-               <object id="Vector1" class="java.util.Vector"> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                  <void property="internalName"> 
-                   <string>VALUE.0</string> 
-                  </void> 
-                  <void property="type"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                  <void property="internalName"> 
-                   <string>VALUE.1</string> 
-                  </void> 
-                  <void property="type"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
+               <object class="java.util.Vector"> 
                 <void method="add"> 
                  <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
                   <void property="internalName"> 
-                   <string>VALUE.2</string> 
+                   <string>KEY.0</string> 
                   </void> 
                   <void property="type"> 
                    <object idref="PrimitiveTypeInfo0"/> 
@@ -649,7 +606,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -661,7 +618,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -684,8 +641,8 @@
              <string>src</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -696,16 +653,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>-1</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -717,12 +670,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 
@@ -731,87 +684,72 @@
      </object> 
     </void> 
     <void property="reducer"> 
-     <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator"> 
+     <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator"> 
       <void property="childOperators"> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
-         <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator"> 
-          <void property="childOperators"> 
-           <object class="java.util.ArrayList"> 
-            <void method="add"> 
-             <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
-              <void property="conf"> 
-               <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
-                <void property="dirName"> 
-                 <string>/tmp/hive-zshao/190015277.10001</string> 
-                </void> 
-                <void property="tableInfo"> 
-                 <object idref="tableDesc1"/> 
-                </void> 
-               </object> 
-              </void> 
-              <void property="schema"> 
-               <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
-                <void property="signature"> 
-                 <object class="java.util.Vector"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                    <void property="internalName"> 
-                     <string>0</string> 
-                    </void> 
-                    <void property="type"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
-                </void> 
-               </object> 
-              </void> 
-             </object> 
+         <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
+          <void property="conf"> 
+           <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+            <void property="dirName"> 
+             <string>/tmp/hive-zshao/843671827/38838214.10001</string> 
+            </void> 
+            <void property="tableInfo"> 
+             <object idref="tableDesc1"/> 
             </void> 
            </object> 
           </void> 
-          <void property="conf"> 
-           <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-            <void property="aggregators"> 
-             <object class="java.util.ArrayList"/> 
-            </void> 
-            <void property="keys"> 
-             <object class="java.util.ArrayList"> 
+          <void property="schema"> 
+           <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
+            <void property="signature"> 
+             <object class="java.util.Vector"> 
               <void method="add"> 
-               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                <void property="column"> 
-                 <string>VALUE.2</string> 
+               <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                <void property="internalName"> 
+                 <string>0</string> 
                 </void> 
-                <void property="typeInfo"> 
+                <void property="type"> 
                  <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
              </object> 
             </void> 
-            <void property="mode"> 
-             <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf"> 
-              <string>PARTIAL1</string> 
-             </object> 
-            </void> 
            </object> 
           </void> 
-          <void property="schema"> 
-           <object idref="RowSchema0"/> 
-          </void> 
          </object> 
         </void> 
        </object> 
       </void> 
-      <void property="schema"> 
-       <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
-        <void property="signature"> 
-         <object idref="Vector1"/> 
+      <void property="conf"> 
+       <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
+        <void property="aggregators"> 
+         <object class="java.util.ArrayList"/> 
+        </void> 
+        <void property="keys"> 
+         <object class="java.util.ArrayList"> 
+          <void method="add"> 
+           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+            <void property="column"> 
+             <string>KEY.0</string> 
+            </void> 
+            <void property="typeInfo"> 
+             <object idref="PrimitiveTypeInfo0"/> 
+            </void> 
+           </object> 
+          </void> 
+         </object> 
+        </void> 
+        <void property="mode"> 
+         <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf"> 
+          <string>PARTIAL1</string> 
+         </object> 
         </void> 
        </object> 
       </void> 
+      <void property="schema"> 
+       <object idref="RowSchema0"/> 
+      </void> 
      </object> 
     </void> 
    </object>