hadoop-common-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	zs...@apache.org
Subject	svn commit: r697291 [30/31] - in /hadoop/core/trunk: ./ src/contrib/hive/cli/src/java/org/apache/hadoop/hive/cli/ src/contrib/hive/metastore/if/ src/contrib/hive/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ src/contrib/hive/metastor...
Date	Fri, 19 Sep 2008 23:56:35 GMT
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml?rev=697291&r1=697290&r2=697291&view=diff ============================================================================== --- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml (original) +++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml Fri Sep 19 16:56:30 2008 @@ -31,10 +31,13 @@ <boolean>true</boolean> </void> <void property="sourceDir"> - <string>/tmp/hive-athusoo/521364755.10000.insclause-0</string> + <string>/tmp/hive-zshao/5802842.10000.insclause-0</string> </void> <void property="table"> <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -81,13 +84,10 @@ </void> <void method="put"> <string>location</string> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest1</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> <void property="serdeClassName"> <string>simple_meta</string> </void> @@ -128,7 +128,7 @@ <void property="conf"> <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> <void property="dirName"> - <string>/tmp/hive-athusoo/521364755.10000.insclause-0</string> + <string>/tmp/hive-zshao/5802842.10000.insclause-0</string> </void> <void property="tableInfo"> <object idref="tableDesc0"/> @@ -145,7 +145,11 @@ <string>0</string> </void> <void property="type"> - <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.String</class> + </void> + </object> </void> </object> </void> @@ -155,7 +159,7 @@ <string>1</string> </void> <void property="type"> - <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -177,7 +181,7 @@ <string>key</string> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -187,7 +191,7 @@ <string>value</string> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -291,21 +295,25 @@ <string>key</string> </void> <void property="typeInfo"> - <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> </object> </void> <void property="typeInfo"> - <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Integer</class> + </void> + </object> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> <void property="value"> <int>2147483647</int> @@ -315,14 +323,14 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> <void property="value"> <int>4</int> @@ -332,14 +340,14 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> <void property="value"> <int>1</int> @@ -349,7 +357,11 @@ </object> </void> <void property="typeInfo"> - <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Boolean</class> + </void> + </object> </void> </object> </void> @@ -369,7 +381,7 @@ <string>key</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -379,7 +391,7 @@ <string>value</string> </void> <void property="type"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -394,7 +406,7 @@ <void property="pathToAliases"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> <object class="java.util.ArrayList"> <void method="add"> <string>s</string> @@ -406,13 +418,16 @@ <void property="pathToPartitionInfo"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> <void property="partSpec"> <object class="java.util.LinkedHashMap"/> </void> <void property="tableDesc"> <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -459,13 +474,10 @@ </void> <void method="put"> <string>location</string> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> <void property="serdeClassName"> <string>simple_meta</string> </void> Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml?rev=697291&r1=697290&r2=697291&view=diff ============================================================================== --- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml (original) +++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml Fri Sep 19 16:56:30 2008 @@ -31,10 +31,13 @@ <boolean>true</boolean> </void> <void property="sourceDir"> - <string>/tmp/hive-athusoo/113641038.10000.insclause-0</string> + <string>/tmp/hive-zshao/33801322.10000.insclause-0</string> </void> <void property="table"> <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -81,13 +84,10 @@ </void> <void method="put"> <string>location</string> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest1</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> <void property="serdeClassName"> <string>simple_meta</string> </void> @@ -132,7 +132,7 @@ <void property="conf"> <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> <void property="dirName"> - <string>/tmp/hive-athusoo/113641038.10000.insclause-0</string> + <string>/tmp/hive-zshao/33801322.10000.insclause-0</string> </void> <void property="tableInfo"> <object idref="tableDesc0"/> @@ -149,7 +149,11 @@ <string>0</string> </void> <void property="type"> - <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.String</class> + </void> + </object> </void> </object> </void> @@ -159,7 +163,7 @@ <string>1</string> </void> <void property="type"> - <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -181,7 +185,7 @@ <string>key</string> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -191,7 +195,7 @@ <string>value</string> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -238,14 +242,18 @@ <string>key</string> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Integer</class> + </void> + </object> </void> <void property="value"> <int>100</int> @@ -255,7 +263,11 @@ </object> </void> <void property="typeInfo"> - <object id="TypeInfo3" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Boolean</class> + </void> + </object> </void> </object> </void> @@ -271,7 +283,7 @@ <string>key</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -281,7 +293,7 @@ <string>value</string> </void> <void property="type"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -378,21 +390,21 @@ <string>key</string> </void> <void property="typeInfo"> - <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> </object> </void> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> <void property="value"> <int>2147483647</int> @@ -402,14 +414,14 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> <void property="value"> <int>4</int> @@ -419,14 +431,14 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> <void property="value"> <int>1</int> @@ -436,7 +448,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo3"/> + <object idref="PrimitiveTypeInfo2"/> </void> </object> </void> @@ -460,7 +472,7 @@ <void property="pathToAliases"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> <object class="java.util.ArrayList"> <void method="add"> <string>s</string> @@ -472,13 +484,16 @@ <void property="pathToPartitionInfo"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> <void property="partSpec"> <object class="java.util.LinkedHashMap"/> </void> <void property="tableDesc"> <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -525,13 +540,10 @@ </void> <void method="put"> <string>location</string> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> <void property="serdeClassName"> <string>simple_meta</string> </void> Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml?rev=697291&r1=697290&r2=697291&view=diff ============================================================================== --- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml (original) +++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml Fri Sep 19 16:56:30 2008 @@ -25,7 +25,7 @@ <boolean>true</boolean> </void> <void property="sourceDir"> - <string>/tmp/hive-athusoo/275397500.10000.insclause-0</string> + <string>/tmp/hive-zshao/147290682.10000.insclause-0</string> </void> <void property="targetDir"> <string>../../../../build/contrib/hive/ql/test/data/warehouse/union.out</string> @@ -72,10 +72,13 @@ <void property="conf"> <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> <void property="dirName"> - <string>/tmp/hive-athusoo/275397500.10000.insclause-0</string> + <string>/tmp/hive-zshao/147290682.10000.insclause-0</string> </void> <void property="tableInfo"> <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -90,9 +93,6 @@ </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> </object> </void> </object> @@ -107,7 +107,11 @@ <string>0</string> </void> <void property="type"> - <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.String</class> + </void> + </object> </void> </object> </void> @@ -117,7 +121,7 @@ <string>1</string> </void> <void property="type"> - <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -139,7 +143,7 @@ <string>0</string> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -149,7 +153,7 @@ <string>1</string> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -178,7 +182,7 @@ <string>key</string> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -188,7 +192,7 @@ <string>value</string> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -206,7 +210,7 @@ <string>0</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -216,7 +220,7 @@ <string>1</string> </void> <void property="type"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -256,14 +260,18 @@ <string>key</string> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Integer</class> + </void> + </object> </void> <void property="value"> <int>100</int> @@ -273,7 +281,11 @@ </object> </void> <void property="typeInfo"> - <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Boolean</class> + </void> + </object> </void> </object> </void> @@ -289,7 +301,7 @@ <string>key</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -299,7 +311,7 @@ <string>value</string> </void> <void property="type"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -325,7 +337,7 @@ <void property="pathToAliases"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> <object class="java.util.ArrayList"> <void method="add"> <string>unioninput:src</string> @@ -337,13 +349,16 @@ <void property="pathToPartitionInfo"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> <void property="partSpec"> <object class="java.util.LinkedHashMap"/> </void> <void property="tableDesc"> <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -390,13 +405,10 @@ </void> <void method="put"> <string>location</string> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> <void property="serdeClassName"> <string>simple_meta</string> </void> Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/udf1.q.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/udf1.q.xml?rev=697291&r1=697290&r2=697291&view=diff ============================================================================== --- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/udf1.q.xml (original) +++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/udf1.q.xml Fri Sep 19 16:56:30 2008 @@ -31,10 +31,13 @@ <boolean>true</boolean> </void> <void property="sourceDir"> - <string>/tmp/hive-athusoo/173244358.10000.insclause-0</string> + <string>/tmp/hive-zshao/151420038.10000.insclause-0</string> </void> <void property="table"> <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -81,13 +84,10 @@ </void> <void method="put"> <string>location</string> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest1</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> <void property="serdeClassName"> <string>simple_meta</string> </void> @@ -128,7 +128,7 @@ <void property="conf"> <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> <void property="dirName"> - <string>/tmp/hive-athusoo/173244358.10000.insclause-0</string> + <string>/tmp/hive-zshao/151420038.10000.insclause-0</string> </void> <void property="tableInfo"> <object idref="tableDesc0"/> @@ -145,7 +145,11 @@ <string>0</string> </void> <void property="type"> - <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.String</class> + </void> + </object> </void> </object> </void> @@ -155,7 +159,7 @@ <string>1</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -165,7 +169,7 @@ <string>2</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -175,7 +179,7 @@ <string>3</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -185,7 +189,7 @@ <string>4</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -195,7 +199,7 @@ <string>5</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -205,7 +209,7 @@ <string>6</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -215,7 +219,7 @@ <string>7</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -225,7 +229,7 @@ <string>8</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -235,7 +239,7 @@ <string>9</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -245,7 +249,7 @@ <string>10</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -255,7 +259,7 @@ <string>11</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -265,7 +269,7 @@ <string>12</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -275,7 +279,7 @@ <string>13</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -285,7 +289,7 @@ <string>14</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -295,7 +299,7 @@ <string>15</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -305,7 +309,7 @@ <string>16</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -344,7 +348,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>a</string> @@ -354,7 +358,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>%a%</string> @@ -364,7 +368,11 @@ </object> </void> <void property="typeInfo"> - <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Boolean</class> + </void> + </object> </void> </object> </void> @@ -391,7 +399,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>b</string> @@ -401,7 +409,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>%a%</string> @@ -411,7 +419,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -438,7 +446,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>ab</string> @@ -448,7 +456,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>%a%</string> @@ -458,7 +466,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -485,7 +493,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>ab</string> @@ -495,7 +503,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>%a_</string> @@ -505,7 +513,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -532,7 +540,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>%_</string> @@ -542,7 +550,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>\%\_</string> @@ -552,7 +560,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -579,7 +587,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>ab</string> @@ -589,7 +597,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>\%\_</string> @@ -599,7 +607,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -626,7 +634,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>ab</string> @@ -636,7 +644,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>_a%</string> @@ -646,7 +654,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -673,7 +681,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>ab</string> @@ -683,7 +691,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>a</string> @@ -693,7 +701,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -720,7 +728,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string></string> @@ -730,7 +738,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>.</string> @@ -740,7 +748,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -767,7 +775,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>a</string> @@ -777,7 +785,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>[ab]</string> @@ -787,7 +795,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -814,7 +822,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string></string> @@ -824,7 +832,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>[ab]</string> @@ -834,7 +842,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -861,7 +869,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>hadoop</string> @@ -871,7 +879,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>[a-z]</string> @@ -881,7 +889,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -908,7 +916,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>hadoop</string> @@ -918,7 +926,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>o</string> @@ -928,7 +936,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -958,7 +966,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>abc</string> @@ -968,7 +976,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>b</string> @@ -978,7 +986,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>c</string> @@ -988,7 +996,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -1018,7 +1026,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>abc</string> @@ -1028,7 +1036,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>z</string> @@ -1038,7 +1046,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>a</string> @@ -1048,7 +1056,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -1078,7 +1086,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>abbbb</string> @@ -1088,7 +1096,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>bb</string> @@ -1098,7 +1106,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>b</string> @@ -1108,7 +1116,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -1138,7 +1146,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>hadoop</string> @@ -1148,7 +1156,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>(.)[a-z]</string> @@ -1158,7 +1166,7 @@ <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> <void property="value"> <string>$1ive</string> @@ -1168,7 +1176,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -1215,14 +1223,18 @@ <string>key</string> </void> <void property="typeInfo"> - <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Integer</class> + </void> + </object> </void> <void property="value"> <int>86</int> @@ -1232,7 +1244,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo1"/> </void> </object> </void> @@ -1248,7 +1260,7 @@ <string>key</string> </void> <void property="type"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -1258,7 +1270,7 @@ <string>value</string> </void> <void property="type"> - <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -1284,7 +1296,7 @@ <void property="pathToAliases"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> <object class="java.util.ArrayList"> <void method="add"> <string>src</string> @@ -1296,13 +1308,16 @@ <void property="pathToPartitionInfo"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> <void property="partSpec"> <object class="java.util.LinkedHashMap"/> </void> <void property="tableDesc"> <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -1349,13 +1364,10 @@ </void> <void method="put"> <string>location</string> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> <void property="serdeClassName"> <string>simple_meta</string> </void> Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/union.q.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/union.q.xml?rev=697291&r1=697290&r2=697291&view=diff ============================================================================== --- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/union.q.xml (original) +++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/union.q.xml Fri Sep 19 16:56:30 2008 @@ -25,7 +25,7 @@ <boolean>true</boolean> </void> <void property="sourceDir"> - <string>/tmp/hive-athusoo/259792934.10000.insclause-0</string> + <string>/tmp/hive-zshao/831940234.10000.insclause-0</string> </void> <void property="targetDir"> <string>../../../../build/contrib/hive/ql/test/data/warehouse/union.out</string> @@ -76,10 +76,13 @@ <void property="conf"> <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> <void property="dirName"> - <string>/tmp/hive-athusoo/259792934.10000.insclause-0</string> + <string>/tmp/hive-zshao/831940234.10000.insclause-0</string> </void> <void property="tableInfo"> <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -94,9 +97,6 @@ </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> </object> </void> </object> @@ -111,7 +111,11 @@ <string>0</string> </void> <void property="type"> - <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.String</class> + </void> + </object> </void> </object> </void> @@ -121,7 +125,7 @@ <string>1</string> </void> <void property="type"> - <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -143,7 +147,7 @@ <string>0</string> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -153,7 +157,7 @@ <string>1</string> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -182,7 +186,7 @@ <string>0</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -192,7 +196,7 @@ <string>1</string> </void> <void property="type"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -214,7 +218,7 @@ <string>key</string> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -224,7 +228,7 @@ <string>value</string> </void> <void property="typeInfo"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -278,14 +282,18 @@ <string>key</string> </void> <void property="typeInfo"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Integer</class> + </void> + </object> </void> <void property="value"> <int>100</int> @@ -295,7 +303,11 @@ </object> </void> <void property="typeInfo"> - <object id="TypeInfo3" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> + <void property="primitiveClass"> + <class>java.lang.Boolean</class> + </void> + </object> </void> </object> </void> @@ -311,7 +323,7 @@ <string>key</string> </void> <void property="type"> - <object idref="TypeInfo0"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -321,7 +333,7 @@ <string>value</string> </void> <void property="type"> - <object idref="TypeInfo1"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -366,7 +378,7 @@ <string>key</string> </void> <void property="typeInfo"> - <object id="TypeInfo4" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -376,7 +388,7 @@ <string>value</string> </void> <void property="typeInfo"> - <object id="TypeInfo5" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -394,7 +406,7 @@ <string>0</string> </void> <void property="type"> - <object idref="TypeInfo4"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -404,7 +416,7 @@ <string>1</string> </void> <void property="type"> - <object idref="TypeInfo5"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -444,14 +456,14 @@ <string>key</string> </void> <void property="typeInfo"> - <object idref="TypeInfo4"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> <void method="add"> <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> <void property="typeInfo"> - <object idref="TypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> <void property="value"> <int>100</int> @@ -461,7 +473,7 @@ </object> </void> <void property="typeInfo"> - <object idref="TypeInfo3"/> + <object idref="PrimitiveTypeInfo2"/> </void> </object> </void> @@ -477,7 +489,7 @@ <string>key</string> </void> <void property="type"> - <object idref="TypeInfo4"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -487,7 +499,7 @@ <string>value</string> </void> <void property="type"> - <object idref="TypeInfo5"/> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> @@ -513,7 +525,7 @@ <void property="pathToAliases"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> <object class="java.util.ArrayList"> <void method="add"> <string>null-subquery1:unioninput-subquery1:src</string> @@ -528,13 +540,16 @@ <void property="pathToPartitionInfo"> <object class="java.util.LinkedHashMap"> <void method="put"> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> <void property="partSpec"> <object class="java.util.LinkedHashMap"/> </void> <void property="tableDesc"> <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> + <void property="deserializerClass"> + <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> + </void> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -581,13 +596,10 @@ </void> <void method="put"> <string>location</string> - <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> + <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> </void> </object> </void> - <void property="serdeClass"> - <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> - </void> <void property="serdeClassName"> <string>simple_meta</string> </void> Modified: hadoop/core/trunk/src/contrib/hive/serde/if/serde.thrift URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/serde/if/serde.thrift?rev=697291&r1=697290&r2=697291&view=diff ============================================================================== --- hadoop/core/trunk/src/contrib/hive/serde/if/serde.thrift (original) +++ hadoop/core/trunk/src/contrib/hive/serde/if/serde.thrift Fri Sep 19 16:56:30 2008 @@ -8,3 +8,29 @@ const string SERIALIZATION_CLASS = "serialization.class" const string SERIALIZATION_FORMAT = "serialization.format" const string SERIALIZATION_DDL = "serialization.ddl" + +const string FIELD_DELIM = "field.delim" +const string COLLECTION_DELIM = "colelction.delim" +const string LINE_DELIM = "line.delim" +const string MAPKEY_DELIM = "mapkey.delim" + +typedef string PrimitiveType +typedef string CollectionType + +const string TINYINT_TYPE_NAME = "tinyint"; +const string INT_TYPE_NAME = "int"; +const string BIGINT_TYPE_NAME = "bigint"; +const string FLOAT_TYPE_NAME = "float"; +const string DOUBLE_TYPE_NAME = "double"; +const string STRING_TYPE_NAME = "string"; +const string DATE_TYPE_NAME = "date"; +const string DATETIME_TYPE_NAME = "datetime"; +const string TIMESTAMP_TYPE_NAME = "timestamp"; + +const string LIST_TYPE_NAME = "array"; +const string MAP_TYPE_NAME = "map"; + +const set<string> PrimitiveTypes = [ TINYINT_TYPE_NAME INT_TYPE_NAME BIGINT_TYPE_NAME FLOAT_TYPE_NAME DOUBLE_TYPE_NAME STRING_TYPE_NAME DATE_TYPE_NAME DATETIME_TYPE_NAME TIMESTAMP_TYPE_NAME ], +const set<string> CollectionTypes = [ LIST_TYPE_NAME MAP_TYPE_NAME ], + + Modified: hadoop/core/trunk/src/contrib/hive/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java?rev=697291&r1=697290&r2=697291&view=diff ============================================================================== --- hadoop/core/trunk/src/contrib/hive/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java (original) +++ hadoop/core/trunk/src/contrib/hive/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java Fri Sep 19 16:56:30 2008 @@ -1,22 +1,4 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - / - -/* * Autogenerated by Thrift * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING @@ -41,4 +23,53 @@ public static final String SERIALIZATION_DDL = "serialization.ddl"; + public static final String FIELD_DELIM = "field.delim"; + + public static final String COLLECTION_DELIM = "colelction.delim"; + + public static final String LINE_DELIM = "line.delim"; + + public static final String MAPKEY_DELIM = "mapkey.delim"; + + public static final String TINYINT_TYPE_NAME = "tinyint"; + + public static final String INT_TYPE_NAME = "int"; + + public static final String BIGINT_TYPE_NAME = "bigint"; + + public static final String FLOAT_TYPE_NAME = "float"; + + public static final String DOUBLE_TYPE_NAME = "double"; + + public static final String STRING_TYPE_NAME = "string"; + + public static final String DATE_TYPE_NAME = "date"; + + public static final String DATETIME_TYPE_NAME = "datetime"; + + public static final String TIMESTAMP_TYPE_NAME = "timestamp"; + + public static final String LIST_TYPE_NAME = "array"; + + public static final String MAP_TYPE_NAME = "map"; + + public static final Set<String> PrimitiveTypes = new HashSet<String>(); + static { + PrimitiveTypes.add("tinyint"); + PrimitiveTypes.add("int"); + PrimitiveTypes.add("bigint"); + PrimitiveTypes.add("float"); + PrimitiveTypes.add("double"); + PrimitiveTypes.add("string"); + PrimitiveTypes.add("date"); + PrimitiveTypes.add("datetime"); + PrimitiveTypes.add("timestamp"); + } + + public static final Set<String> CollectionTypes = new HashSet<String>(); + static { + CollectionTypes.add("array"); + CollectionTypes.add("map"); + } + }
Mime	Unnamed text/plain (inline, 7-Bit, 89875 bytes)
	View raw message