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 [12/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/input6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml?rev=804106&r1=804105&r2=804106&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.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/4331220/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1815502527/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/4331220/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1815502527/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/1927961056/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/65186427/10002</string>
</void>
<void property="targetDir">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/4331220/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1815502527/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/1927961056/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/65186427/10002</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -201,21 +201,19 @@
<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 class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -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/1927961056/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/65186427/10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1927961056/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/65186427/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/1927961056/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/65186427/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/4331220/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1815502527/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>
@@ -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/1927961056/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/65186427/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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</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/1927961056/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/65186427/10002</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -796,8 +794,8 @@
</void>
</object>
</void>
- <void property="genericUDFClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNull</class>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNull"/>
</void>
<void property="typeInfo">
<object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -870,8 +868,8 @@
</void>
</object>
</void>
- <void property="genericUDFClass">
- <class>org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNull</class>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNull"/>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
@@ -929,7 +927,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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -941,7 +939,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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</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/input7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml?rev=804106&r1=804105&r2=804106&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.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/596164267/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1042673038/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/596164267/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1042673038/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/1045855320/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/803094684/10002</string>
</void>
<void property="targetDir">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/596164267/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1042673038/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/1045855320/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/803094684/10002</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -201,21 +201,19 @@
<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 class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -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/1045855320/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/803094684/10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1045855320/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/803094684/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/1045855320/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/803094684/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/596164267/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1042673038/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>
@@ -536,7 +534,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/1045855320/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/803094684/10002</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -624,7 +622,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</string>
</void>
</object>
</void>
@@ -655,7 +653,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1045855320/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/803094684/10002</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -814,7 +812,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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -826,7 +824,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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</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/input8.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml?rev=804106&r1=804105&r2=804106&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</string>
</void>
</object>
</void>
@@ -92,7 +92,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/114537537/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1131129873/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -182,43 +182,29 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col2</string>
- <object id="exprNodeFuncDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc">
- <void property="UDFClass">
- <class>org.apache.hadoop.hive.ql.udf.UDFOPPlus</class>
- </void>
- <void property="UDFMethod">
- <object class="org.apache.hadoop.hive.ql.udf.UDFOPPlus" 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 id="exprNodeGenericFuncDesc0" 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.exprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"/>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"/>
</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.UDFOPPlus</class>
+ </void>
+ <void property="udfName">
+ <string>+</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -227,80 +213,43 @@
</void>
<void method="put">
<string>_col1</string>
- <object id="exprNodeFuncDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc">
- <void property="UDFClass">
- <class>org.apache.hadoop.hive.ql.udf.UDFOPMinus</class>
- </void>
- <void property="UDFMethod">
- <object class="org.apache.hadoop.hive.ql.udf.UDFOPMinus" 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 id="exprNodeGenericFuncDesc1" 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 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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
</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>src1</string>
- </void>
- <void property="typeInfo">
- <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>string</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="methodName">
- <string>double</string>
+ <void property="tabAlias">
+ <string>src1</string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>string</string>
+ </void>
+ </object>
</void>
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"/>
</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.UDFOPMinus</class>
+ </void>
+ <void property="udfName">
+ <string>-</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -309,77 +258,40 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="exprNodeFuncDesc2" class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc">
- <void property="UDFClass">
- <class>org.apache.hadoop.hive.ql.udf.UDFOPPlus</class>
- </void>
- <void property="UDFMethod">
- <object class="org.apache.hadoop.hive.ql.udf.UDFOPPlus" 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 id="exprNodeGenericFuncDesc2" 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 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 class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>int</string>
- </void>
- </object>
- </void>
- <void property="value">
- <int>4</int>
- </void>
- </object>
+ <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="methodName">
- <string>double</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
+ <void property="value">
+ <int>4</int>
</void>
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"/>
</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.UDFOPPlus</class>
+ </void>
+ <void property="udfName">
+ <string>+</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -393,13 +305,13 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeFuncDesc2"/>
+ <object idref="exprNodeGenericFuncDesc2"/>
</void>
<void method="add">
- <object idref="exprNodeFuncDesc1"/>
+ <object idref="exprNodeGenericFuncDesc1"/>
</void>
<void method="add">
- <object idref="exprNodeFuncDesc0"/>
+ <object idref="exprNodeGenericFuncDesc0"/>
</void>
</object>
</void>
@@ -516,7 +428,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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -528,7 +440,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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</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/input9.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml?rev=804106&r1=804105&r2=804106&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.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/1598259567/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1253763511/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/1598259567/10001</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1253763511/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/2075389576/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/836715098/10002</string>
</void>
<void property="targetDir">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1598259567/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1253763511/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/2075389576/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/836715098/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/2075389576/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/836715098/10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2075389576/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/836715098/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/2075389576/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/836715098/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/1598259567/10000</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/1253763511/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 id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>void</string>
</void>
@@ -500,7 +498,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -536,7 +534,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/2075389576/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/836715098/10002</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -624,7 +622,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</string>
</void>
</object>
</void>
@@ -663,7 +661,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2075389576/10002</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/836715098/10002</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -696,7 +694,7 @@
<string>src1</string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -704,7 +702,7 @@
<string>_col0</string>
<object id="exprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -751,7 +749,7 @@
<string>_col0</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -761,7 +759,7 @@
<string>_col1</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -776,46 +774,40 @@
<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.UDFOPEqual</class>
- </void>
- <void property="UDFMethod">
- <object id="Method0" class="org.apache.hadoop.hive.ql.udf.UDFOPEqual" 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.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc">
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc">
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
+ <object idref="PrimitiveTypeInfo1"/>
</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.UDFOPEqual</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>
@@ -842,7 +834,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -852,7 +844,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -867,36 +859,40 @@
<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.UDFOPEqual</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.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc">
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc">
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
+ <object idref="PrimitiveTypeInfo1"/>
</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.UDFOPEqual</class>
+ </void>
+ <void property="udfName">
+ <string>=</string>
+ </void>
+ </object>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -948,7 +944,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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -960,7 +956,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/src1</string>
+ <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src1</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>