hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r794129 [5/8] - in /hadoop/hive/trunk: ./ 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/src/java/org/...
Date Wed, 15 Jul 2009 01:52:45 GMT
Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/union6.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/union6.q.out?rev=794129&r1=794128&r2=794129&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/union6.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/union6.q.out Wed Jul 15 01:52:41 2009
@@ -53,12 +53,11 @@
               table:
                   input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  name: binary_table
 
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/njain/hive4/hive4/build/ql/tmp/411854408/10002 
+        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/76493251/10002 
           Union
             Select Operator
               expressions:
@@ -74,7 +73,7 @@
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: tmptable
-        file:/data/users/njain/hive4/hive4/build/ql/tmp/411854408/10004 
+        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/76493251/10004 
           Union
             Select Operator
               expressions:
@@ -97,10 +96,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1482963287/10000
+                destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1900876768/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive4/hive4/build/ql/tmp/411854408/10003 
+              file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/76493251/10003 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -149,7 +148,6 @@
                 table:
                     input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                    name: binary_table
 
 
 query: insert overwrite table tmptable
@@ -161,7 +159,7 @@
 Output: default/tmptable
 query: select * from tmptable x sort by x.key, x.value
 Input: default/tmptable
-Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/779348526/10000
+Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1362569604/10000
 	
 	
 	

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/union7.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/union7.q.out?rev=794129&r1=794128&r2=794129&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/union7.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/union7.q.out Wed Jul 15 01:52:41 2009
@@ -47,12 +47,11 @@
               table:
                   input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  name: binary_table
 
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1624086332/10002 
+        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/694246953/10002 
           Union
             Select Operator
               expressions:
@@ -77,7 +76,7 @@
                   value expressions:
                         expr: _col1
                         type: bigint
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1624086332/10003 
+        file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/694246953/10003 
           Union
             Select Operator
               expressions:
@@ -139,7 +138,6 @@
                 table:
                     input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                    name: binary_table
 
   Stage: Stage-0
     Fetch Operator
@@ -151,7 +149,7 @@
                                     select s2.key as key, s2.value as value from src1 s2) unionsrc group by unionsrc.key
 Input: default/src
 Input: default/src1
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/128496063/10000
+Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/615776607/10000
 	10
 128	1
 146	1

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml?rev=794129&r1=794128&r2=794129&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml Wed Jul 15 01:52:41 2009
@@ -30,7 +30,7 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1072947222/10000</string> 
+               <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/555968808/10000</string> 
               </void> 
               <void property="table"> 
                <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -83,7 +83,7 @@
                   </void> 
                   <void method="put"> 
                    <string>location</string> 
-                   <string>file:/data/users/njain/hive5/hive5/build/ql/test/data/warehouse/dest1</string> 
+                   <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string> 
                   </void> 
                  </object> 
                 </void> 
@@ -93,7 +93,7 @@
                </object> 
               </void> 
               <void property="tmpDir"> 
-               <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1072947222/10001</string> 
+               <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/555968808/10001</string> 
               </void> 
              </object> 
             </void> 
@@ -121,10 +121,10 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1995185936/10002</string> 
+               <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/561779002/10002</string> 
               </void> 
               <void property="targetDir"> 
-               <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1072947222/10000</string> 
+               <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/555968808/10000</string> 
               </void> 
              </object> 
             </void> 
@@ -142,7 +142,7 @@
             <void property="aliasToWork"> 
              <object class="java.util.LinkedHashMap"> 
               <void method="put"> 
-               <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1995185936/10002</string> 
+               <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/561779002/10002</string> 
                <object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator"> 
                 <void property="childOperators"> 
                  <object class="java.util.ArrayList"> 
@@ -277,6 +277,10 @@
                            <string>columns.types</string> 
                            <string>string,string</string> 
                           </void> 
+                          <void method="put"> 
+                           <string>escape.delim</string> 
+                           <string>\</string> 
+                          </void> 
                          </object> 
                         </void> 
                        </object> 
@@ -338,10 +342,10 @@
             <void property="pathToAliases"> 
              <object class="java.util.LinkedHashMap"> 
               <void method="put"> 
-               <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1995185936/10002</string> 
+               <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/561779002/10002</string> 
                <object class="java.util.ArrayList"> 
                 <void method="add"> 
-                 <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1995185936/10002</string> 
+                 <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/561779002/10002</string> 
                 </void> 
                </object> 
               </void> 
@@ -350,7 +354,7 @@
             <void property="pathToPartitionInfo"> 
              <object class="java.util.LinkedHashMap"> 
               <void method="put"> 
-               <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1995185936/10002</string> 
+               <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/561779002/10002</string> 
                <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
                 <void property="tableDesc"> 
                  <object idref="tableDesc0"/> 
@@ -368,7 +372,7 @@
                   <void property="conf"> 
                    <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                     <void property="dirName"> 
-                     <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1072947222/10000</string> 
+                     <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/555968808/10000</string> 
                     </void> 
                     <void property="tableInfo"> 
                      <object idref="tableDesc0"/> 
@@ -463,7 +467,7 @@
       <void property="resolverCtx"> 
        <object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx"> 
         <void property="dir"> 
-         <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1995185936/10002</string> 
+         <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/561779002/10002</string> 
         </void> 
         <void property="listTasks"> 
          <object idref="ArrayList0"/> 
@@ -555,7 +559,7 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>file:/data/users/njain/hive5/hive5/build/ql/test/data/warehouse/src_thrift</string> 
+            <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src_thrift</string> 
            </void> 
           </object> 
          </void> 
@@ -594,7 +598,7 @@
                            <int>1</int> 
                           </void> 
                           <void property="dirName"> 
-                           <string>file:/data/users/njain/hive5/hive5/build/ql/tmp/1995185936/10002</string> 
+                           <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/561779002/10002</string> 
                           </void> 
                           <void property="tableInfo"> 
                            <object idref="tableDesc0"/> 
@@ -1049,7 +1053,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive5/hive5/build/ql/test/data/warehouse/src_thrift</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src_thrift</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src_thrift</string> 
@@ -1061,7 +1065,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive5/hive5/build/ql/test/data/warehouse/src_thrift</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src_thrift</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object idref="LinkedHashMap0"/> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=794129&r1=794128&r2=794129&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml Wed Jul 15 01:52:41 2009
@@ -26,7 +26,7 @@
            <boolean>true</boolean> 
           </void> 
           <void property="sourceDir"> 
-           <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/tmp/349963780/10000</string> 
+           <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/706639104/10000</string> 
           </void> 
           <void property="table"> 
            <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -79,7 +79,7 @@
               </void> 
               <void method="put"> 
                <string>location</string> 
-               <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string> 
+               <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string> 
               </void> 
              </object> 
             </void> 
@@ -89,7 +89,7 @@
            </object> 
           </void> 
           <void property="tmpDir"> 
-           <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/tmp/349963780/10001</string> 
+           <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/706639104/10001</string> 
           </void> 
          </object> 
         </void> 
@@ -162,7 +162,7 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+            <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
            </void> 
           </object> 
          </void> 
@@ -310,6 +310,10 @@
                            <string>columns.types</string> 
                            <string>double</string> 
                           </void> 
+                          <void method="put"> 
+                           <string>escape.delim</string> 
+                           <string>\</string> 
+                          </void> 
                          </object> 
                         </void> 
                        </object> 
@@ -372,94 +376,71 @@
                 </void> 
                 <void property="conf"> 
                  <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-                  <void property="aggMethods"> 
-                   <object class="java.util.ArrayList"> 
-                    <void method="add"> 
-                     <string>iterate</string> 
-                    </void> 
-                   </object> 
-                  </void> 
                   <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.UDAFSum$UDAFSumEvaluator</class> 
+                      <void property="genericUDAFEvaluatorClass"> 
+                       <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class> 
+                      </void> 
+                      <void property="genericUDAFName"> 
+                       <string>sum</string> 
+                      </void> 
+                      <void property="mode"> 
+                       <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator$Mode" method="valueOf"> 
+                        <string>PARTIAL1</string> 
+                       </object> 
                       </void> 
                       <void property="parameters"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
                           <void property="UDFClass"> 
-                           <class>org.apache.hadoop.hive.ql.udf.UDFToDouble</class> 
+                           <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
                           </void> 
                           <void property="UDFMethod"> 
-                           <object class="org.apache.hadoop.hive.ql.udf.UDFToDouble" method="getMethod"> 
+                           <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
                             <string>evaluate</string> 
-                            <array class="java.lang.Class" length="1"> 
+                            <array class="java.lang.Class" length="2"> 
                              <void index="0"> 
                               <class>org.apache.hadoop.io.Text</class> 
                              </void> 
+                             <void index="1"> 
+                              <class>org.apache.hadoop.io.IntWritable</class> 
+                             </void> 
                             </array> 
                            </object> 
                           </void> 
                           <void property="childExprs"> 
                            <object class="java.util.ArrayList"> 
                             <void method="add"> 
-                             <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
-                              <void property="UDFClass"> 
-                               <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
+                             <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                              <void property="column"> 
+                               <string>value</string> 
                               </void> 
-                              <void property="UDFMethod"> 
-                               <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
-                                <string>evaluate</string> 
-                                <array class="java.lang.Class" length="2"> 
-                                 <void index="0"> 
-                                  <class>org.apache.hadoop.io.Text</class> 
-                                 </void> 
-                                 <void index="1"> 
-                                  <class>org.apache.hadoop.io.IntWritable</class> 
-                                 </void> 
-                                </array> 
-                               </object> 
+                              <void property="typeInfo"> 
+                               <object idref="PrimitiveTypeInfo0"/> 
                               </void> 
-                              <void property="childExprs"> 
-                               <object class="java.util.ArrayList"> 
-                                <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.exprNodeConstantDesc"> 
-                                  <void property="typeInfo"> 
-                                   <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                                    <void property="typeName"> 
-                                     <string>int</string> 
-                                    </void> 
-                                   </object> 
-                                  </void> 
-                                  <void property="value"> 
-                                   <int>5</int> 
-                                  </void> 
-                                 </object> 
+                             </object> 
+                            </void> 
+                            <void method="add"> 
+                             <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                              <void property="typeInfo"> 
+                               <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
+                                <void property="typeName"> 
+                                 <string>int</string> 
                                 </void> 
                                </object> 
                               </void> 
-                              <void property="typeInfo"> 
-                               <object idref="PrimitiveTypeInfo0"/> 
+                              <void property="value"> 
+                               <int>5</int> 
                               </void> 
                              </object> 
                             </void> 
                            </object> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo1"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -469,13 +450,6 @@
                     </void> 
                    </object> 
                   </void> 
-                  <void property="evalMethods"> 
-                   <object class="java.util.ArrayList"> 
-                    <void method="add"> 
-                     <string>terminatePartial</string> 
-                    </void> 
-                   </object> 
-                  </void> 
                   <void property="keys"> 
                    <object class="java.util.ArrayList"> 
                     <void method="add"> 
@@ -649,7 +623,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -661,7 +635,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object idref="LinkedHashMap0"/> 
@@ -705,7 +679,7 @@
                  <int>1</int> 
                 </void> 
                 <void property="dirName"> 
-                 <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/tmp/349963780/10000</string> 
+                 <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/706639104/10000</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object idref="tableDesc0"/> 
@@ -857,19 +831,20 @@
       </void> 
       <void property="conf"> 
        <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-        <void property="aggMethods"> 
-         <object class="java.util.ArrayList"> 
-          <void method="add"> 
-           <string>merge</string> 
-          </void> 
-         </object> 
-        </void> 
         <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.UDAFSum$UDAFSumEvaluator</class> 
+            <void property="genericUDAFEvaluatorClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class> 
+            </void> 
+            <void property="genericUDAFName"> 
+             <string>sum</string> 
+            </void> 
+            <void property="mode"> 
+             <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator$Mode" method="valueOf"> 
+              <string>FINAL</string> 
+             </object> 
             </void> 
             <void property="parameters"> 
              <object class="java.util.ArrayList"> 
@@ -889,13 +864,6 @@
           </void> 
          </object> 
         </void> 
-        <void property="evalMethods"> 
-         <object class="java.util.ArrayList"> 
-          <void method="add"> 
-           <string>terminate</string> 
-          </void> 
-         </object> 
-        </void> 
         <void property="keys"> 
          <object class="java.util.ArrayList"> 
           <void method="add"> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=794129&r1=794128&r2=794129&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml Wed Jul 15 01:52:41 2009
@@ -64,7 +64,7 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+            <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
            </void> 
           </object> 
          </void> 
@@ -250,6 +250,10 @@
                            <string>columns.types</string> 
                            <string>bigint,double</string> 
                           </void> 
+                          <void method="put"> 
+                           <string>escape.delim</string> 
+                           <string>\</string> 
+                          </void> 
                          </object> 
                         </void> 
                        </object> 
@@ -434,26 +438,24 @@
                 </void> 
                 <void property="conf"> 
                  <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-                  <void property="aggMethods"> 
-                   <object class="java.util.ArrayList"> 
-                    <void method="add"> 
-                     <string>iterate</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>iterate</string> 
-                    </void> 
-                   </object> 
-                  </void> 
                   <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$UDAFCountEvaluator</class> 
-                      </void> 
                       <void property="distinct"> 
                        <boolean>true</boolean> 
                       </void> 
+                      <void property="genericUDAFEvaluatorClass"> 
+                       <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFCount$GenericUDAFCountEvaluator</class> 
+                      </void> 
+                      <void property="genericUDAFName"> 
+                       <string>count</string> 
+                      </void> 
+                      <void property="mode"> 
+                       <object id="GenericUDAFEvaluator$Mode0" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator$Mode" method="valueOf"> 
+                        <string>PARTIAL1</string> 
+                       </object> 
+                      </void> 
                       <void property="parameters"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
@@ -509,79 +511,61 @@
                     </void> 
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                      <void property="aggregationClass"> 
-                       <class>org.apache.hadoop.hive.ql.udf.UDAFSum$UDAFSumEvaluator</class> 
+                      <void property="genericUDAFEvaluatorClass"> 
+                       <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class> 
+                      </void> 
+                      <void property="genericUDAFName"> 
+                       <string>sum</string> 
+                      </void> 
+                      <void property="mode"> 
+                       <object idref="GenericUDAFEvaluator$Mode0"/> 
                       </void> 
                       <void property="parameters"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
                           <void property="UDFClass"> 
-                           <class>org.apache.hadoop.hive.ql.udf.UDFToDouble</class> 
+                           <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
                           </void> 
                           <void property="UDFMethod"> 
-                           <object class="org.apache.hadoop.hive.ql.udf.UDFToDouble" method="getMethod"> 
+                           <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
                             <string>evaluate</string> 
-                            <array class="java.lang.Class" length="1"> 
+                            <array class="java.lang.Class" length="2"> 
                              <void index="0"> 
                               <class>org.apache.hadoop.io.Text</class> 
                              </void> 
+                             <void index="1"> 
+                              <class>org.apache.hadoop.io.IntWritable</class> 
+                             </void> 
                             </array> 
                            </object> 
                           </void> 
                           <void property="childExprs"> 
                            <object class="java.util.ArrayList"> 
                             <void method="add"> 
-                             <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
-                              <void property="UDFClass"> 
-                               <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
-                              </void> 
-                              <void property="UDFMethod"> 
-                               <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
-                                <string>evaluate</string> 
-                                <array class="java.lang.Class" length="2"> 
-                                 <void index="0"> 
-                                  <class>org.apache.hadoop.io.Text</class> 
-                                 </void> 
-                                 <void index="1"> 
-                                  <class>org.apache.hadoop.io.IntWritable</class> 
-                                 </void> 
-                                </array> 
-                               </object> 
-                              </void> 
-                              <void property="childExprs"> 
-                               <object class="java.util.ArrayList"> 
-                                <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.exprNodeConstantDesc"> 
-                                  <void property="typeInfo"> 
-                                   <object idref="PrimitiveTypeInfo3"/> 
-                                  </void> 
-                                  <void property="value"> 
-                                   <int>5</int> 
-                                  </void> 
-                                 </object> 
-                                </void> 
-                               </object> 
+                             <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.exprNodeConstantDesc"> 
+                              <void property="typeInfo"> 
+                               <object idref="PrimitiveTypeInfo3"/> 
+                              </void> 
+                              <void property="value"> 
+                               <int>5</int> 
+                              </void> 
+                             </object> 
+                            </void> 
                            </object> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo2"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -591,16 +575,6 @@
                     </void> 
                    </object> 
                   </void> 
-                  <void property="evalMethods"> 
-                   <object class="java.util.ArrayList"> 
-                    <void method="add"> 
-                     <string>terminatePartial</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>terminatePartial</string> 
-                    </void> 
-                   </object> 
-                  </void> 
                   <void property="keys"> 
                    <object class="java.util.ArrayList"> 
                     <void method="add"> 
@@ -803,7 +777,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -815,7 +789,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object idref="LinkedHashMap0"/> 
@@ -856,7 +830,7 @@
               <void property="conf"> 
                <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                 <void property="dirName"> 
-                 <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/tmp/681513171/10001</string> 
+                 <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1682245307/10001</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -1132,26 +1106,24 @@
       </void> 
       <void property="conf"> 
        <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-        <void property="aggMethods"> 
-         <object class="java.util.ArrayList"> 
-          <void method="add"> 
-           <string>iterate</string> 
-          </void> 
-          <void method="add"> 
-           <string>merge</string> 
-          </void> 
-         </object> 
-        </void> 
         <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$UDAFCountEvaluator</class> 
-            </void> 
             <void property="distinct"> 
              <boolean>true</boolean> 
             </void> 
+            <void property="genericUDAFEvaluatorClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFCount$GenericUDAFCountEvaluator</class> 
+            </void> 
+            <void property="genericUDAFName"> 
+             <string>count</string> 
+            </void> 
+            <void property="mode"> 
+             <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator$Mode" method="valueOf"> 
+              <string>COMPLETE</string> 
+             </object> 
+            </void> 
             <void property="parameters"> 
              <object class="java.util.ArrayList"> 
               <void method="add"> 
@@ -1170,8 +1142,16 @@
           </void> 
           <void method="add"> 
            <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-            <void property="aggregationClass"> 
-             <class>org.apache.hadoop.hive.ql.udf.UDAFSum$UDAFSumEvaluator</class> 
+            <void property="genericUDAFEvaluatorClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class> 
+            </void> 
+            <void property="genericUDAFName"> 
+             <string>sum</string> 
+            </void> 
+            <void property="mode"> 
+             <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator$Mode" method="valueOf"> 
+              <string>FINAL</string> 
+             </object> 
             </void> 
             <void property="parameters"> 
              <object class="java.util.ArrayList"> 
@@ -1191,16 +1171,6 @@
           </void> 
          </object> 
         </void> 
-        <void property="evalMethods"> 
-         <object class="java.util.ArrayList"> 
-          <void method="add"> 
-           <string>terminate</string> 
-          </void> 
-          <void method="add"> 
-           <string>terminate</string> 
-          </void> 
-         </object> 
-        </void> 
         <void property="keys"> 
          <object class="java.util.ArrayList"> 
           <void method="add"> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=794129&r1=794128&r2=794129&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml Wed Jul 15 01:52:41 2009
@@ -64,7 +64,7 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+            <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
            </void> 
           </object> 
          </void> 
@@ -207,7 +207,7 @@
                            <string>_col2</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -217,7 +217,7 @@
                            <string>_col3</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="StructTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -262,7 +262,11 @@
                           </void> 
                           <void method="put"> 
                            <string>columns.types</string> 
-                           <string>double,string,string,string,string</string> 
+                           <string>double,struct&lt;count:bigint,sum:double&gt;,struct&lt;count:bigint,sum:double&gt;,string,string</string> 
+                          </void> 
+                          <void method="put"> 
+                           <string>escape.delim</string> 
+                           <string>\</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -307,7 +311,7 @@
                            <string>VALUE._col1</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="StructTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -317,7 +321,7 @@
                            <string>VALUE._col2</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="StructTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -407,102 +411,67 @@
                 </void> 
                 <void property="conf"> 
                  <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-                  <void property="aggMethods"> 
-                   <object class="java.util.ArrayList"> 
-                    <void method="add"> 
-                     <string>iterate</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>iterate</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>iterate</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>iterate</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>iterate</string> 
-                    </void> 
-                   </object> 
-                  </void> 
                   <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.UDAFSum$UDAFSumEvaluator</class> 
+                      <void property="genericUDAFEvaluatorClass"> 
+                       <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class> 
+                      </void> 
+                      <void property="genericUDAFName"> 
+                       <string>sum</string> 
+                      </void> 
+                      <void property="mode"> 
+                       <object id="GenericUDAFEvaluator$Mode0" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator$Mode" method="valueOf"> 
+                        <string>PARTIAL1</string> 
+                       </object> 
                       </void> 
                       <void property="parameters"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
                           <void property="UDFClass"> 
-                           <class>org.apache.hadoop.hive.ql.udf.UDFToDouble</class> 
+                           <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
                           </void> 
                           <void property="UDFMethod"> 
-                           <object class="org.apache.hadoop.hive.ql.udf.UDFToDouble" method="getMethod"> 
+                           <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
                             <string>evaluate</string> 
-                            <array class="java.lang.Class" length="1"> 
+                            <array class="java.lang.Class" length="2"> 
                              <void index="0"> 
                               <class>org.apache.hadoop.io.Text</class> 
                              </void> 
+                             <void index="1"> 
+                              <class>org.apache.hadoop.io.IntWritable</class> 
+                             </void> 
                             </array> 
                            </object> 
                           </void> 
                           <void property="childExprs"> 
                            <object class="java.util.ArrayList"> 
                             <void method="add"> 
-                             <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
-                              <void property="UDFClass"> 
-                               <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
-                              </void> 
-                              <void property="UDFMethod"> 
-                               <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
-                                <string>evaluate</string> 
-                                <array class="java.lang.Class" length="2"> 
-                                 <void index="0"> 
-                                  <class>org.apache.hadoop.io.Text</class> 
-                                 </void> 
-                                 <void index="1"> 
-                                  <class>org.apache.hadoop.io.IntWritable</class> 
-                                 </void> 
-                                </array> 
-                               </object> 
-                              </void> 
-                              <void property="childExprs"> 
-                               <object class="java.util.ArrayList"> 
-                                <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.exprNodeConstantDesc"> 
-                                  <void property="typeInfo"> 
-                                   <object idref="PrimitiveTypeInfo2"/> 
-                                  </void> 
-                                  <void property="value"> 
-                                   <int>5</int> 
-                                  </void> 
-                                 </object> 
-                                </void> 
-                               </object> 
+                             <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.exprNodeConstantDesc"> 
+                              <void property="typeInfo"> 
+                               <object idref="PrimitiveTypeInfo2"/> 
+                              </void> 
+                              <void property="value"> 
+                               <int>5</int> 
+                              </void> 
+                             </object> 
+                            </void> 
                            </object> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo1"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -512,79 +481,61 @@
                     </void> 
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                      <void property="aggregationClass"> 
-                       <class>org.apache.hadoop.hive.ql.udf.UDAFAvg$UDAFAvgEvaluator</class> 
+                      <void property="genericUDAFEvaluatorClass"> 
+                       <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator</class> 
+                      </void> 
+                      <void property="genericUDAFName"> 
+                       <string>avg</string> 
+                      </void> 
+                      <void property="mode"> 
+                       <object idref="GenericUDAFEvaluator$Mode0"/> 
                       </void> 
                       <void property="parameters"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
                           <void property="UDFClass"> 
-                           <class>org.apache.hadoop.hive.ql.udf.UDFToDouble</class> 
+                           <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
                           </void> 
                           <void property="UDFMethod"> 
-                           <object class="org.apache.hadoop.hive.ql.udf.UDFToDouble" method="getMethod"> 
+                           <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
                             <string>evaluate</string> 
-                            <array class="java.lang.Class" length="1"> 
+                            <array class="java.lang.Class" length="2"> 
                              <void index="0"> 
                               <class>org.apache.hadoop.io.Text</class> 
                              </void> 
+                             <void index="1"> 
+                              <class>org.apache.hadoop.io.IntWritable</class> 
+                             </void> 
                             </array> 
                            </object> 
                           </void> 
                           <void property="childExprs"> 
                            <object class="java.util.ArrayList"> 
                             <void method="add"> 
-                             <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
-                              <void property="UDFClass"> 
-                               <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
-                              </void> 
-                              <void property="UDFMethod"> 
-                               <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
-                                <string>evaluate</string> 
-                                <array class="java.lang.Class" length="2"> 
-                                 <void index="0"> 
-                                  <class>org.apache.hadoop.io.Text</class> 
-                                 </void> 
-                                 <void index="1"> 
-                                  <class>org.apache.hadoop.io.IntWritable</class> 
-                                 </void> 
-                                </array> 
-                               </object> 
-                              </void> 
-                              <void property="childExprs"> 
-                               <object class="java.util.ArrayList"> 
-                                <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.exprNodeConstantDesc"> 
-                                  <void property="typeInfo"> 
-                                   <object idref="PrimitiveTypeInfo2"/> 
-                                  </void> 
-                                  <void property="value"> 
-                                   <int>5</int> 
-                                  </void> 
-                                 </object> 
-                                </void> 
-                               </object> 
+                             <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.exprNodeConstantDesc"> 
+                              <void property="typeInfo"> 
+                               <object idref="PrimitiveTypeInfo2"/> 
+                              </void> 
+                              <void property="value"> 
+                               <int>5</int> 
+                              </void> 
+                             </object> 
+                            </void> 
                            </object> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo1"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -594,82 +545,64 @@
                     </void> 
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                      <void property="aggregationClass"> 
-                       <class>org.apache.hadoop.hive.ql.udf.UDAFAvg$UDAFAvgEvaluator</class> 
-                      </void> 
                       <void property="distinct"> 
                        <boolean>true</boolean> 
                       </void> 
+                      <void property="genericUDAFEvaluatorClass"> 
+                       <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator</class> 
+                      </void> 
+                      <void property="genericUDAFName"> 
+                       <string>avg</string> 
+                      </void> 
+                      <void property="mode"> 
+                       <object idref="GenericUDAFEvaluator$Mode0"/> 
+                      </void> 
                       <void property="parameters"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
                           <void property="UDFClass"> 
-                           <class>org.apache.hadoop.hive.ql.udf.UDFToDouble</class> 
+                           <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
                           </void> 
                           <void property="UDFMethod"> 
-                           <object class="org.apache.hadoop.hive.ql.udf.UDFToDouble" method="getMethod"> 
+                           <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
                             <string>evaluate</string> 
-                            <array class="java.lang.Class" length="1"> 
+                            <array class="java.lang.Class" length="2"> 
                              <void index="0"> 
                               <class>org.apache.hadoop.io.Text</class> 
                              </void> 
+                             <void index="1"> 
+                              <class>org.apache.hadoop.io.IntWritable</class> 
+                             </void> 
                             </array> 
                            </object> 
                           </void> 
                           <void property="childExprs"> 
                            <object class="java.util.ArrayList"> 
                             <void method="add"> 
-                             <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
-                              <void property="UDFClass"> 
-                               <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> 
-                              </void> 
-                              <void property="UDFMethod"> 
-                               <object class="org.apache.hadoop.hive.ql.udf.UDFSubstr" method="getMethod"> 
-                                <string>evaluate</string> 
-                                <array class="java.lang.Class" length="2"> 
-                                 <void index="0"> 
-                                  <class>org.apache.hadoop.io.Text</class> 
-                                 </void> 
-                                 <void index="1"> 
-                                  <class>org.apache.hadoop.io.IntWritable</class> 
-                                 </void> 
-                                </array> 
-                               </object> 
-                              </void> 
-                              <void property="childExprs"> 
-                               <object class="java.util.ArrayList"> 
-                                <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.exprNodeConstantDesc"> 
-                                  <void property="typeInfo"> 
-                                   <object idref="PrimitiveTypeInfo2"/> 
-                                  </void> 
-                                  <void property="value"> 
-                                   <int>5</int> 
-                                  </void> 
-                                 </object> 
-                                </void> 
-                               </object> 
+                             <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.exprNodeConstantDesc"> 
+                              <void property="typeInfo"> 
+                               <object idref="PrimitiveTypeInfo2"/> 
+                              </void> 
+                              <void property="value"> 
+                               <int>5</int> 
+                              </void> 
+                             </object> 
+                            </void> 
                            </object> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo1"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -679,8 +612,18 @@
                     </void> 
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                      <void property="aggregationClass"> 
-                       <class>org.apache.hadoop.hive.ql.udf.UDAFMax$MaxStringEvaluator</class> 
+                      <void property="genericUDAFEvaluator"> 
+                       <object id="GenericUDAFBridge$GenericUDAFBridgeEvaluator0" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFBridge$GenericUDAFBridgeEvaluator"> 
+                        <void property="udafEvaluator"> 
+                         <class>org.apache.hadoop.hive.ql.udf.UDAFMax$MaxStringEvaluator</class> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="genericUDAFName"> 
+                       <string>max</string> 
+                      </void> 
+                      <void property="mode"> 
+                       <object idref="GenericUDAFEvaluator$Mode0"/> 
                       </void> 
                       <void property="parameters"> 
                        <object class="java.util.ArrayList"> 
@@ -737,8 +680,18 @@
                     </void> 
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-                      <void property="aggregationClass"> 
-                       <class>org.apache.hadoop.hive.ql.udf.UDAFMin$MinStringEvaluator</class> 
+                      <void property="genericUDAFEvaluator"> 
+                       <object id="GenericUDAFBridge$GenericUDAFBridgeEvaluator1" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFBridge$GenericUDAFBridgeEvaluator"> 
+                        <void property="udafEvaluator"> 
+                         <class>org.apache.hadoop.hive.ql.udf.UDAFMin$MinStringEvaluator</class> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="genericUDAFName"> 
+                       <string>min</string> 
+                      </void> 
+                      <void property="mode"> 
+                       <object idref="GenericUDAFEvaluator$Mode0"/> 
                       </void> 
                       <void property="parameters"> 
                        <object class="java.util.ArrayList"> 
@@ -795,25 +748,6 @@
                     </void> 
                    </object> 
                   </void> 
-                  <void property="evalMethods"> 
-                   <object class="java.util.ArrayList"> 
-                    <void method="add"> 
-                     <string>terminatePartial</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>terminatePartial</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>terminatePartial</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>terminatePartial</string> 
-                    </void> 
-                    <void method="add"> 
-                     <string>terminatePartial</string> 
-                    </void> 
-                   </object> 
-                  </void> 
                   <void property="keys"> 
                    <object class="java.util.ArrayList"> 
                     <void method="add"> 
@@ -887,7 +821,7 @@
                        <string>_col2</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object idref="StructTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -897,7 +831,7 @@
                        <string>_col3</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object idref="StructTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -1027,7 +961,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -1039,7 +973,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object idref="LinkedHashMap0"/> 
@@ -1080,7 +1014,7 @@
               <void property="conf"> 
                <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                 <void property="dirName"> 
-                 <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/tmp/1492486534/10001</string> 
+                 <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1043603428/10001</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -1357,31 +1291,20 @@
       </void> 
       <void property="conf"> 
        <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-        <void property="aggMethods"> 
-         <object class="java.util.ArrayList"> 
-          <void method="add"> 
-           <string>merge</string> 
-          </void> 
-          <void method="add"> 
-           <string>merge</string> 
-          </void> 
-          <void method="add"> 
-           <string>iterate</string> 
-          </void> 
-          <void method="add"> 
-           <string>merge</string> 
-          </void> 
-          <void method="add"> 
-           <string>merge</string> 
-          </void> 
-         </object> 
-        </void> 
         <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.UDAFSum$UDAFSumEvaluator</class> 
+            <void property="genericUDAFEvaluatorClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class> 
+            </void> 
+            <void property="genericUDAFName"> 
+             <string>sum</string> 
+            </void> 
+            <void property="mode"> 
+             <object id="GenericUDAFEvaluator$Mode1" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator$Mode" method="valueOf"> 
+              <string>FINAL</string> 
+             </object> 
             </void> 
             <void property="parameters"> 
              <object class="java.util.ArrayList"> 
@@ -1401,8 +1324,14 @@
           </void> 
           <void method="add"> 
            <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-            <void property="aggregationClass"> 
-             <class>org.apache.hadoop.hive.ql.udf.UDAFAvg$UDAFAvgEvaluator</class> 
+            <void property="genericUDAFEvaluatorClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator</class> 
+            </void> 
+            <void property="genericUDAFName"> 
+             <string>avg</string> 
+            </void> 
+            <void property="mode"> 
+             <object idref="GenericUDAFEvaluator$Mode1"/> 
             </void> 
             <void property="parameters"> 
              <object class="java.util.ArrayList"> 
@@ -1412,7 +1341,7 @@
                  <string>VALUE._col1</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="PrimitiveTypeInfo0"/> 
+                 <object idref="StructTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1422,45 +1351,29 @@
           </void> 
           <void method="add"> 
            <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-            <void property="aggregationClass"> 
-             <class>org.apache.hadoop.hive.ql.udf.UDAFAvg$UDAFAvgEvaluator</class> 
-            </void> 
             <void property="distinct"> 
              <boolean>true</boolean> 
             </void> 
+            <void property="genericUDAFEvaluatorClass"> 
+             <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator</class> 
+            </void> 
+            <void property="genericUDAFName"> 
+             <string>avg</string> 
+            </void> 
+            <void property="mode"> 
+             <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator$Mode" method="valueOf"> 
+              <string>COMPLETE</string> 
+             </object> 
+            </void> 
             <void property="parameters"> 
              <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc"> 
-                <void property="UDFClass"> 
-                 <class>org.apache.hadoop.hive.ql.udf.UDFToDouble</class> 
-                </void> 
-                <void property="UDFMethod"> 
-                 <object class="org.apache.hadoop.hive.ql.udf.UDFToDouble" method="getMethod"> 
-                  <string>evaluate</string> 
-                  <array class="java.lang.Class" length="1"> 
-                   <void index="0"> 
-                    <class>org.apache.hadoop.io.Text</class> 
-                   </void> 
-                  </array> 
-                 </object> 
-                </void> 
-                <void property="childExprs"> 
-                 <object class="java.util.ArrayList"> 
-                  <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-                    <void property="column"> 
-                     <string>KEY._col0</string> 
-                    </void> 
-                    <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
-                    </void> 
-                   </object> 
-                  </void> 
-                 </object> 
+               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                <void property="column"> 
+                 <string>KEY._col0</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="PrimitiveTypeInfo1"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1470,8 +1383,14 @@
           </void> 
           <void method="add"> 
            <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-            <void property="aggregationClass"> 
-             <class>org.apache.hadoop.hive.ql.udf.UDAFMax$MaxStringEvaluator</class> 
+            <void property="genericUDAFEvaluator"> 
+             <object idref="GenericUDAFBridge$GenericUDAFBridgeEvaluator0"/> 
+            </void> 
+            <void property="genericUDAFName"> 
+             <string>max</string> 
+            </void> 
+            <void property="mode"> 
+             <object idref="GenericUDAFEvaluator$Mode1"/> 
             </void> 
             <void property="parameters"> 
              <object class="java.util.ArrayList"> 
@@ -1491,8 +1410,14 @@
           </void> 
           <void method="add"> 
            <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc"> 
-            <void property="aggregationClass"> 
-             <class>org.apache.hadoop.hive.ql.udf.UDAFMin$MinStringEvaluator</class> 
+            <void property="genericUDAFEvaluator"> 
+             <object idref="GenericUDAFBridge$GenericUDAFBridgeEvaluator1"/> 
+            </void> 
+            <void property="genericUDAFName"> 
+             <string>min</string> 
+            </void> 
+            <void property="mode"> 
+             <object idref="GenericUDAFEvaluator$Mode1"/> 
             </void> 
             <void property="parameters"> 
              <object class="java.util.ArrayList"> 
@@ -1512,25 +1437,6 @@
           </void> 
          </object> 
         </void> 
-        <void property="evalMethods"> 
-         <object class="java.util.ArrayList"> 
-          <void method="add"> 
-           <string>terminate</string> 
-          </void> 
-          <void method="add"> 
-           <string>terminate</string> 
-          </void> 
-          <void method="add"> 
-           <string>terminate</string> 
-          </void> 
-          <void method="add"> 
-           <string>terminate</string> 
-          </void> 
-          <void method="add"> 
-           <string>terminate</string> 
-          </void> 
-         </object> 
-        </void> 
         <void property="keys"> 
          <object class="java.util.ArrayList"/> 
         </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=794129&r1=794128&r2=794129&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml Wed Jul 15 01:52:41 2009
@@ -64,7 +64,7 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+            <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
            </void> 
           </object> 
          </void> 
@@ -193,6 +193,10 @@
                            <string>columns.types</string> 
                            <string></string> 
                           </void> 
+                          <void method="put"> 
+                           <string>escape.delim</string> 
+                           <string>\</string> 
+                          </void> 
                          </object> 
                         </void> 
                        </object> 
@@ -299,15 +303,9 @@
                 </void> 
                 <void property="conf"> 
                  <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-                  <void property="aggMethods"> 
-                   <object class="java.util.ArrayList"/> 
-                  </void> 
                   <void property="aggregators"> 
                    <object class="java.util.ArrayList"/> 
                   </void> 
-                  <void property="evalMethods"> 
-                   <object class="java.util.ArrayList"/> 
-                  </void> 
                   <void property="keys"> 
                    <object class="java.util.ArrayList"> 
                     <void method="add"> 
@@ -456,7 +454,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -468,7 +466,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object idref="LinkedHashMap0"/> 
@@ -509,7 +507,7 @@
               <void property="conf"> 
                <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                 <void property="dirName"> 
-                 <string>file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/tmp/1128436437/10001</string> 
+                 <string>file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1174115931/10001</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -650,15 +648,9 @@
       </void> 
       <void property="conf"> 
        <object class="org.apache.hadoop.hive.ql.plan.groupByDesc"> 
-        <void property="aggMethods"> 
-         <object class="java.util.ArrayList"/> 
-        </void> 
         <void property="aggregators"> 
          <object class="java.util.ArrayList"/> 
         </void> 
-        <void property="evalMethods"> 
-         <object class="java.util.ArrayList"/> 
-        </void> 
         <void property="keys"> 
          <object class="java.util.ArrayList"> 
           <void method="add"> 



Mime
View raw message