You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zs...@apache.org on 2008/09/20 01:56:35 UTC
svn commit: r697291 [25/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...
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input5.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input5.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input5.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/447469659.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/106489316.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>
@@ -135,7 +135,36 @@
<string>tkey</string>
</void>
<void property="typeInfo">
- <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>
+ </object>
+ </void>
+ <void property="keySerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -155,7 +184,7 @@
<string>tkey</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -165,7 +194,32 @@
<string>tvalue</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="valueSerializeInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string>0,1</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -183,7 +237,7 @@
<string>tkey</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -193,7 +247,7 @@
<string>tvalue</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -210,8 +264,36 @@
<void property="scriptCmd">
<string>/bin/cat</string>
</void>
+ <void property="scriptInputInfo">
+ <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>columns</string>
+ <string></string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>9</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
<void property="scriptOutputInfo">
<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>
@@ -230,9 +312,6 @@
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
</object>
</void>
</object>
@@ -258,7 +337,15 @@
<string>lint</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="ListTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.ListTypeInfo">
+ <void property="listElementTypeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Integer</class>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -268,7 +355,11 @@
<string>lintstring</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="ListTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.ListTypeInfo">
+ <void property="listElementTypeInfo">
+ <object class="org.apache.hadoop.hive.ql.typeinfo.StructTypeInfo"/>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -286,7 +377,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="ListTypeInfo0"/>
</void>
</object>
</void>
@@ -296,7 +387,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="ListTypeInfo1"/>
</void>
</object>
</void>
@@ -318,7 +409,7 @@
<string>aint</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -328,7 +419,7 @@
<string>astring</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -338,7 +429,7 @@
<string>lint</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="ListTypeInfo0"/>
</void>
</object>
</void>
@@ -348,7 +439,11 @@
<string>lstring</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object class="org.apache.hadoop.hive.ql.typeinfo.ListTypeInfo">
+ <void property="listElementTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -358,7 +453,7 @@
<string>lintstring</string>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="ListTypeInfo1"/>
</void>
</object>
</void>
@@ -368,7 +463,14 @@
<string>mstringstring</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object class="org.apache.hadoop.hive.ql.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -383,7 +485,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_thrift</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
<object class="java.util.ArrayList">
<void method="add">
<string>tmap:src_thrift</string>
@@ -395,13 +497,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_thrift</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</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.ThriftDeserializer</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -440,7 +545,7 @@
</void>
<void method="put">
<string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde.thrift.ThriftSerDe</string>
+ <string>thrift</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -452,15 +557,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.thrift.ThriftSerDe</class>
- </void>
<void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde.thrift.ThriftSerDe</string>
+ <string>thrift</string>
</void>
</object>
</void>
@@ -481,7 +583,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/447469659.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/106489316.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -498,7 +600,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -508,7 +610,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -530,7 +632,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -540,7 +642,7 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -567,7 +669,7 @@
<string>VALUE</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -583,7 +685,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -593,7 +695,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input6.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input6.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/638081595.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/111172075.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/638081595.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/111172075.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>
@@ -231,14 +235,18 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</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>
@@ -254,7 +262,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -264,7 +272,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -290,7 +298,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/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -302,13 +310,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/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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>
@@ -355,13 +366,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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/input7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input7.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input7.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input7.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/334340251.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/305356690.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>
@@ -124,7 +124,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/334340251.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/305356690.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -141,7 +141,11 @@
<string>0</string>
</void>
<void property="type">
- <object 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>
@@ -151,7 +155,7 @@
<string>1</string>
</void>
<void property="type">
- <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -168,7 +172,11 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"/>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
@@ -176,7 +184,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -205,7 +213,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -215,7 +223,7 @@
<string>value</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -230,7 +238,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/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -242,13 +250,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/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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>
@@ -295,13 +306,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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/input8.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input8.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input8.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input8.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/49261310.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/339241232.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>
@@ -124,7 +124,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/49261310.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/339241232.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -141,7 +141,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>
@@ -151,7 +155,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -161,7 +165,7 @@
<string>2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -200,7 +204,11 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<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.Integer</class>
+ </void>
+ </object>
</void>
<void property="value">
<int>4</int>
@@ -210,14 +218,14 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -264,28 +272,32 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</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.Double</class>
+ </void>
+ </object>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -312,21 +324,25 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object id="TypeInfo4" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Byte</class>
+ </void>
+ </object>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo3"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo3"/>
</void>
</object>
</void>
@@ -355,7 +371,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -365,7 +381,7 @@
<string>value</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -380,7 +396,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/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -392,13 +408,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/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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>
@@ -445,13 +464,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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/input9.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input9.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input9.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/930184964.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/350289238.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/930184964.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/350289238.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>
@@ -172,7 +176,11 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"/>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
@@ -180,7 +188,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -224,21 +232,25 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<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 idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</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>
@@ -254,7 +266,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -264,7 +276,7 @@
<string>value</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -290,7 +302,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/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -302,13 +314,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/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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>
@@ -355,13 +370,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src1</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_part1.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/241239641.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/476762580.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/241239641.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/476762580.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>
@@ -168,7 +172,7 @@
<boolean>true</boolean>
</void>
<void property="type">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -181,7 +185,7 @@
<boolean>true</boolean>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -203,7 +207,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -213,7 +217,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -223,7 +227,7 @@
<string>hr</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -233,7 +237,7 @@
<string>ds</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -320,14 +324,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>
@@ -337,7 +345,11 @@
</object>
</void>
<void property="typeInfo">
- <object id="TypeInfo3" 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>
@@ -367,14 +379,14 @@
<string>ds</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <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="PrimitiveTypeInfo0"/>
</void>
<void property="value">
<string>2008-04-08</string>
@@ -384,14 +396,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -421,14 +433,14 @@
<string>hr</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <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="PrimitiveTypeInfo0"/>
</void>
<void property="value">
<string>12</string>
@@ -438,14 +450,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -461,7 +473,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -471,7 +483,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -484,7 +496,7 @@
<boolean>true</boolean>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -497,7 +509,7 @@
<boolean>true</boolean>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -523,7 +535,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/srcpart/ds=2008-04-08/hr=12</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string>
<object class="java.util.ArrayList">
<void method="add">
<string>srcpart</string>
@@ -535,7 +547,7 @@
<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/srcpart/ds=2008-04-08/hr=12</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap">
@@ -551,6 +563,9 @@
</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>
@@ -601,13 +616,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcpart</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart</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/input_testsequencefile.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/145133142.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/238032349.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.SequenceFileInputFormat</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/dest4_sequencefile</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest4_sequencefile</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>
@@ -124,7 +124,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/145133142.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/238032349.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -141,7 +141,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>
@@ -151,7 +155,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>
@@ -173,7 +177,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -183,7 +187,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -212,7 +216,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -222,7 +226,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -237,7 +241,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>
@@ -249,13 +253,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>
@@ -302,13 +309,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/input_testxpath.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testxpath.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testxpath.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testxpath.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/394499547.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/638994494.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>
@@ -124,7 +124,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/394499547.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/638994494.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -141,7 +141,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>
@@ -151,7 +155,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -175,14 +179,22 @@
<string>lint</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="ListTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.ListTypeInfo">
+ <void property="listElementTypeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Integer</class>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
<void property="index">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>1</int>
@@ -190,7 +202,7 @@
</object>
</void>
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -204,14 +216,18 @@
<string>lintstring</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo3" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="ListTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.ListTypeInfo">
+ <void property="listElementTypeInfo">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.StructTypeInfo"/>
+ </void>
+ </object>
</void>
</object>
</void>
<void property="index">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>0</int>
@@ -219,7 +235,7 @@
</object>
</void>
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="StructTypeInfo0"/>
</void>
</object>
</void>
@@ -227,7 +243,7 @@
<string>mystring</string>
</void>
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -256,7 +272,7 @@
<string>aint</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -266,7 +282,7 @@
<string>astring</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -276,7 +292,7 @@
<string>lint</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="ListTypeInfo0"/>
</void>
</object>
</void>
@@ -286,7 +302,11 @@
<string>lstring</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object class="org.apache.hadoop.hive.ql.typeinfo.ListTypeInfo">
+ <void property="listElementTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -296,7 +316,7 @@
<string>lintstring</string>
</void>
<void property="type">
- <object idref="TypeInfo3"/>
+ <object idref="ListTypeInfo1"/>
</void>
</object>
</void>
@@ -306,7 +326,14 @@
<string>mstringstring</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object class="org.apache.hadoop.hive.ql.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -321,7 +348,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_thrift</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src_thrift</string>
@@ -333,13 +360,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_thrift</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</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.ThriftDeserializer</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -378,7 +408,7 @@
</void>
<void method="put">
<string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde.thrift.ThriftSerDe</string>
+ <string>thrift</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -390,15 +420,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.thrift.ThriftSerDe</class>
- </void>
<void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde.thrift.ThriftSerDe</string>
+ <string>thrift</string>
</void>
</object>
</void>