You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2009/08/14 09:48:09 UTC
svn commit: r804106 [9/24] - in /hadoop/hive/trunk: ./
contrib/src/java/org/apache/hadoop/hive/contrib/udaf/
contrib/src/java/org/apache/hadoop/hive/contrib/udaf/example/
contrib/src/java/org/apache/hadoop/hive/contrib/udf/
contrib/src/java/org/apache/...
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=804106&r1=804105&r2=804106&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 Fri Aug 14 07:48:02 2009
@@ -64,7 +64,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -335,23 +335,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col1</string>
- <object id="exprNodeFuncDesc0" 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>
+ <object id="exprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -383,8 +367,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -393,26 +384,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="exprNodeFuncDesc1" 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="3">
- <void index="0">
- <class>org.apache.hadoop.io.Text</class>
- </void>
- <void index="1">
- <class>org.apache.hadoop.io.IntWritable</class>
- </void>
- <void index="2">
- <class>org.apache.hadoop.io.IntWritable</class>
- </void>
- </array>
- </object>
- </void>
+ <object id="exprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -450,8 +422,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -469,8 +448,8 @@
<void property="distinct">
<boolean>true</boolean>
</void>
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFCount$GenericUDAFCountEvaluator</class>
+ <void property="genericUDAFEvaluator">
+ <object id="GenericUDAFCount$GenericUDAFCountEvaluator0" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFCount$GenericUDAFCountEvaluator"/>
</void>
<void property="genericUDAFName">
<string>count</string>
@@ -483,23 +462,7 @@
<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.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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -527,8 +490,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -541,8 +511,8 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class>
+ <void property="genericUDAFEvaluator">
+ <object id="GenericUDAFSum$GenericUDAFSumDouble0" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble"/>
</void>
<void property="genericUDAFName">
<string>sum</string>
@@ -553,23 +523,7 @@
<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.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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -597,8 +551,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -614,10 +575,10 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeFuncDesc1"/>
+ <object idref="exprNodeGenericFuncDesc1"/>
</void>
<void method="add">
- <object idref="exprNodeFuncDesc0"/>
+ <object idref="exprNodeGenericFuncDesc0"/>
</void>
</object>
</void>
@@ -826,7 +787,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -838,7 +799,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
@@ -879,7 +840,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1399819330/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1872940625/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -965,23 +926,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col2</string>
- <object id="exprNodeFuncDesc2" class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc">
- <void property="UDFClass">
- <class>org.apache.hadoop.hive.ql.udf.UDFConcat</class>
- </void>
- <void property="UDFMethod">
- <object class="org.apache.hadoop.hive.ql.udf.UDFConcat" 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.Text</class>
- </void>
- </array>
- </object>
- </void>
+ <object id="exprNodeGenericFuncDesc2" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -998,49 +943,29 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc">
- <void property="UDFClass">
- <class>org.apache.hadoop.hive.ql.udf.UDFToString</class>
- </void>
- <void property="UDFMethod">
- <object class="org.apache.hadoop.hive.ql.udf.UDFToString" method="getMethod">
- <string>evaluate</string>
- <array class="java.lang.Class" length="1">
- <void index="0">
- <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</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>_col2</string>
- </void>
- <void property="tabAlias">
- <string></string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo2"/>
- </void>
- </object>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <void property="column">
+ <string>_col2</string>
</void>
- <void property="methodName">
- <string>string</string>
+ <void property="tabAlias">
+ <string></string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
</object>
</void>
- <void property="methodName">
- <string>concat</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFConcat</class>
+ </void>
+ <void property="udfName">
+ <string>concat</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -1088,7 +1013,7 @@
<object idref="exprNodeColumnDesc2"/>
</void>
<void method="add">
- <object idref="exprNodeFuncDesc2"/>
+ <object idref="exprNodeGenericFuncDesc2"/>
</void>
</object>
</void>
@@ -1180,8 +1105,8 @@
<void property="distinct">
<boolean>true</boolean>
</void>
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFCount$GenericUDAFCountEvaluator</class>
+ <void property="genericUDAFEvaluator">
+ <object idref="GenericUDAFCount$GenericUDAFCountEvaluator0"/>
</void>
<void property="genericUDAFName">
<string>count</string>
@@ -1209,8 +1134,8 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class>
+ <void property="genericUDAFEvaluator">
+ <object idref="GenericUDAFSum$GenericUDAFSumDouble0"/>
</void>
<void property="genericUDAFName">
<string>sum</string>
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=804106&r1=804105&r2=804106&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 Fri Aug 14 07:48:02 2009
@@ -64,7 +64,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -375,23 +375,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="exprNodeFuncDesc0" 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>
+ <object id="exprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -423,8 +407,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -439,8 +430,8 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class>
+ <void property="genericUDAFEvaluator">
+ <object id="GenericUDAFSum$GenericUDAFSumDouble0" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble"/>
</void>
<void property="genericUDAFName">
<string>sum</string>
@@ -453,23 +444,7 @@
<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.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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -497,8 +472,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -511,8 +493,8 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator</class>
+ <void property="genericUDAFEvaluator">
+ <object id="GenericUDAFAverage$GenericUDAFAverageEvaluator0" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator"/>
</void>
<void property="genericUDAFName">
<string>avg</string>
@@ -523,23 +505,7 @@
<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.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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -567,8 +533,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -584,8 +557,8 @@
<void property="distinct">
<boolean>true</boolean>
</void>
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator</class>
+ <void property="genericUDAFEvaluator">
+ <object id="GenericUDAFAverage$GenericUDAFAverageEvaluator1" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator"/>
</void>
<void property="genericUDAFName">
<string>avg</string>
@@ -596,23 +569,7 @@
<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.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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -640,8 +597,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -670,23 +634,7 @@
<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.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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -714,8 +662,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -744,23 +699,7 @@
<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.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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -788,8 +727,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -805,7 +751,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeFuncDesc0"/>
+ <object idref="exprNodeGenericFuncDesc0"/>
</void>
</object>
</void>
@@ -1025,7 +971,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1037,7 +983,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
@@ -1078,7 +1024,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/471792069/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1500606145/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -1374,8 +1320,8 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class>
+ <void property="genericUDAFEvaluator">
+ <object idref="GenericUDAFSum$GenericUDAFSumDouble0"/>
</void>
<void property="genericUDAFName">
<string>sum</string>
@@ -1403,8 +1349,8 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator</class>
+ <void property="genericUDAFEvaluator">
+ <object idref="GenericUDAFAverage$GenericUDAFAverageEvaluator0"/>
</void>
<void property="genericUDAFName">
<string>avg</string>
@@ -1433,8 +1379,8 @@
<void property="distinct">
<boolean>true</boolean>
</void>
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage$GenericUDAFAverageEvaluator</class>
+ <void property="genericUDAFEvaluator">
+ <object idref="GenericUDAFAverage$GenericUDAFAverageEvaluator1"/>
</void>
<void property="genericUDAFName">
<string>avg</string>
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=804106&r1=804105&r2=804106&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 Fri Aug 14 07:48:02 2009
@@ -64,7 +64,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -239,26 +239,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="exprNodeFuncDesc0" 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="3">
- <void index="0">
- <class>org.apache.hadoop.io.Text</class>
- </void>
- <void index="1">
- <class>org.apache.hadoop.io.IntWritable</class>
- </void>
- <void index="2">
- <class>org.apache.hadoop.io.IntWritable</class>
- </void>
- </array>
- </object>
- </void>
+ <object id="exprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -300,8 +281,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -318,7 +306,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeFuncDesc0"/>
+ <object idref="exprNodeGenericFuncDesc0"/>
</void>
</object>
</void>
@@ -473,7 +461,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -485,7 +473,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
@@ -526,7 +514,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1227320587/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/10347622/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=804106&r1=804105&r2=804106&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml Fri Aug 14 07:48:02 2009
@@ -64,7 +64,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -291,8 +291,8 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class>
+ <void property="genericUDAFEvaluator">
+ <object id="GenericUDAFSum$GenericUDAFSumDouble0" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble"/>
</void>
<void property="genericUDAFName">
<string>sum</string>
@@ -305,23 +305,7 @@
<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.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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -353,8 +337,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -553,7 +544,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -565,7 +556,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
@@ -606,7 +597,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/38674669/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1604589661/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -794,8 +785,8 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
- <void property="genericUDAFEvaluatorClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble</class>
+ <void property="genericUDAFEvaluator">
+ <object idref="GenericUDAFSum$GenericUDAFSumDouble0"/>
</void>
<void property="genericUDAFName">
<string>sum</string>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=804106&r1=804105&r2=804106&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml Fri Aug 14 07:48:02 2009
@@ -64,7 +64,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -239,26 +239,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="exprNodeFuncDesc0" 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="3">
- <void index="0">
- <class>org.apache.hadoop.io.Text</class>
- </void>
- <void index="1">
- <class>org.apache.hadoop.io.IntWritable</class>
- </void>
- <void index="2">
- <class>org.apache.hadoop.io.IntWritable</class>
- </void>
- </array>
- </object>
- </void>
+ <object id="exprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
@@ -300,8 +281,15 @@
</void>
</object>
</void>
- <void property="methodName">
- <string>substr</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
+ </void>
+ <void property="udfName">
+ <string>substr</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -318,7 +306,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeFuncDesc0"/>
+ <object idref="exprNodeGenericFuncDesc0"/>
</void>
</object>
</void>
@@ -473,7 +461,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -485,7 +473,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
@@ -526,7 +514,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/596704722/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/491369639/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml?rev=804106&r1=804105&r2=804106&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml Fri Aug 14 07:48:02 2009
@@ -30,7 +30,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/574595116/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/47445525/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/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -93,7 +93,7 @@
</object>
</void>
<void property="tmpDir">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/574595116/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/47445525/10001</string>
</void>
</object>
</void>
@@ -121,10 +121,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2068381100/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/982909484/10002</string>
</void>
<void property="targetDir">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/574595116/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/47445525/10000</string>
</void>
</object>
</void>
@@ -142,7 +142,7 @@
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2068381100/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/982909484/10002</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -201,24 +201,22 @@
<void property="partitionCols">
<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.UDFRand</class>
- </void>
- <void property="UDFMethod">
- <object class="org.apache.hadoop.hive.ql.udf.UDFRand" method="getMethod">
- <string>evaluate</string>
- <array class="java.lang.Class" length="0"/>
- </object>
- </void>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList"/>
</void>
- <void property="methodName">
- <string>rand</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFRand</class>
+ </void>
+ <void property="udfName">
+ <string>rand</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
- <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>double</string>
</void>
@@ -242,7 +240,7 @@
<string></string>
</void>
<void property="typeInfo">
- <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>string</string>
</void>
@@ -259,7 +257,7 @@
<string></string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -313,7 +311,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -323,7 +321,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -351,10 +349,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2068381100/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/982909484/10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2068381100/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/982909484/10002</string>
</void>
</object>
</void>
@@ -363,7 +361,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2068381100/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/982909484/10002</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="tableDesc">
<object idref="tableDesc0"/>
@@ -381,7 +379,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/574595116/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/47445525/10000</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -430,7 +428,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>file.outputformat</string>
@@ -470,7 +468,7 @@
<string></string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -486,7 +484,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -496,7 +494,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -532,7 +530,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2068381100/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/982909484/10002</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -620,7 +618,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -659,7 +657,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2068381100/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/982909484/10002</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -692,7 +690,7 @@
<string>src</string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -706,7 +704,7 @@
<string>src</string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -753,7 +751,7 @@
<string>_col0</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -763,7 +761,7 @@
<string>_col1</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -778,59 +776,16 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.filterDesc">
<void property="predicate">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc">
- <void property="UDFClass">
- <class>org.apache.hadoop.hive.ql.udf.UDFOPLessThan</class>
- </void>
- <void property="UDFMethod">
- <object id="Method0" class="org.apache.hadoop.hive.ql.udf.UDFOPLessThan" method="getMethod">
- <string>evaluate</string>
- <array class="java.lang.Class" length="2">
- <void index="0">
- <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class>
- </void>
- <void index="1">
- <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class>
- </void>
- </array>
- </object>
- </void>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<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.UDFToDouble</class>
- </void>
- <void property="UDFMethod">
- <object id="Method1" 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</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
</void>
- <void property="methodName">
- <string>double</string>
+ <void property="tabAlias">
+ <string>src</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -838,53 +793,36 @@
</object>
</void>
<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 id="Method2" 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.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.exprNodeConstantDesc">
- <void property="typeInfo">
- <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>int</string>
- </void>
- </object>
- </void>
- <void property="value">
- <int>100</int>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>int</string>
</void>
</object>
</void>
- <void property="methodName">
- <string>double</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
+ <void property="value">
+ <int>100</int>
</void>
</object>
</void>
</object>
</void>
- <void property="methodName">
- <string><</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="operator">
+ <boolean>true</boolean>
+ </void>
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFOPLessThan</class>
+ </void>
+ <void property="udfName">
+ <string><</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
- <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>boolean</string>
</void>
@@ -911,7 +849,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -921,7 +859,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -936,42 +874,16 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.filterDesc">
<void property="predicate">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc">
- <void property="UDFClass">
- <class>org.apache.hadoop.hive.ql.udf.UDFOPLessThan</class>
- </void>
- <void property="UDFMethod">
- <object idref="Method0"/>
- </void>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
<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.UDFToDouble</class>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
</void>
- <void property="UDFMethod">
- <object idref="Method1"/>
- </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</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="methodName">
- <string>double</string>
+ <void property="tabAlias">
+ <string>src</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -979,42 +891,32 @@
</object>
</void>
<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 idref="Method2"/>
- </void>
- <void property="childExprs">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo2"/>
- </void>
- <void property="value">
- <int>100</int>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="methodName">
- <string>double</string>
- </void>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void property="value">
+ <int>100</int>
</void>
</object>
</void>
</object>
</void>
- <void property="methodName">
- <string><</string>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
+ <void property="operator">
+ <boolean>true</boolean>
+ </void>
+ <void property="udfClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDFOPLessThan</class>
+ </void>
+ <void property="udfName">
+ <string><</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -1069,7 +971,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1081,7 +983,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>