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 [24/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/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby6.q.xml Fri Sep 19 16:56:30 2008
@@ -35,10 +35,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/644754203.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/43559649.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>
@@ -85,13 +88,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>
@@ -122,7 +122,7 @@
<void property="aliasToWork">
<object class="java.util.HashMap">
<void method="put">
- <string>/tmp/hive-athusoo/644754203.10001</string>
+ <string>/tmp/hive-zshao/43559649.10001</string>
<object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator">
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc">
@@ -134,7 +134,36 @@
<string>0</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>
@@ -149,6 +178,31 @@
<void property="valueCols">
<object class="java.util.ArrayList"/>
</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></string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
</object>
</void>
<void property="schema">
@@ -161,7 +215,7 @@
<string>KEY.0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -176,10 +230,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-athusoo/644754203.10001</string>
+ <string>/tmp/hive-zshao/43559649.10001</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>/tmp/hive-athusoo/644754203.10001</string>
+ <string>/tmp/hive-zshao/43559649.10001</string>
</void>
</object>
</void>
@@ -188,10 +242,13 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-athusoo/644754203.10001</string>
+ <string>/tmp/hive-zshao/43559649.10001</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="tableDesc">
<object id="tableDesc1" 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>
@@ -210,9 +267,6 @@
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
</object>
</void>
</object>
@@ -232,7 +286,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/644754203.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/43559649.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -249,7 +303,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -271,7 +325,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -303,7 +357,7 @@
<string>KEY.0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -326,7 +380,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -361,7 +415,43 @@
<void property="keyCols">
<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 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>0</int>
+ </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>
</object>
</void>
@@ -379,7 +469,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -389,7 +479,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -422,14 +512,14 @@
<string>value</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 id="TypeInfo3" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>4</int>
@@ -439,7 +529,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>1</int>
@@ -449,7 +539,32 @@
</object>
</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,2</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
</void>
</object>
</void>
@@ -467,7 +582,7 @@
<string>VALUE.0</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -477,7 +592,7 @@
<string>VALUE.1</string>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -487,7 +602,7 @@
<string>VALUE.2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -509,7 +624,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -519,7 +634,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -534,7 +649,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>
@@ -546,13 +661,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>
@@ -599,13 +717,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>
@@ -628,7 +743,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/644754203.10001</string>
+ <string>/tmp/hive-zshao/43559649.10001</string>
</void>
<void property="tableInfo">
<object idref="tableDesc1"/>
@@ -645,7 +760,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -670,7 +785,7 @@
<string>VALUE.2</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input1.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input1.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/612295459.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/54141209.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/612295459.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/54141209.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>
@@ -234,14 +238,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>
@@ -251,7 +259,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>
@@ -267,7 +279,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -277,7 +289,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -303,7 +315,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>
@@ -315,13 +327,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>
@@ -368,13 +383,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/input2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input2.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input2.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input2.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/570590308.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/2123304.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>
@@ -104,10 +104,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/570590308.10001.insclause-1</string>
+ <string>/tmp/hive-zshao/2123304.10001.insclause-1</string>
</void>
<void property="table">
<object id="tableDesc1" 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>
@@ -154,13 +157,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest2</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest2</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>
@@ -186,10 +186,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/570590308.10002.insclause-2</string>
+ <string>/tmp/hive-zshao/2123304.10002.insclause-2</string>
</void>
<void property="table">
<object id="tableDesc2" 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>
@@ -240,13 +243,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest3</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest3</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>
@@ -287,7 +287,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/570590308.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/2123304.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -304,7 +304,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>
@@ -314,7 +318,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>
@@ -336,7 +340,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -346,7 +350,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -393,14 +397,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>
@@ -410,7 +418,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>
@@ -426,7 +438,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -436,7 +448,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -459,7 +471,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/570590308.10001.insclause-1</string>
+ <string>/tmp/hive-zshao/2123304.10001.insclause-1</string>
</void>
<void property="tableInfo">
<object idref="tableDesc1"/>
@@ -476,7 +488,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -486,7 +498,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -508,7 +520,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -518,7 +530,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -585,14 +597,14 @@
<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 idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>100</int>
@@ -602,7 +614,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -632,14 +644,14 @@
<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 idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>200</int>
@@ -649,14 +661,14 @@
</object>
</void>
<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>
@@ -684,7 +696,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/570590308.10002.insclause-2</string>
+ <string>/tmp/hive-zshao/2123304.10002.insclause-2</string>
</void>
<void property="tableInfo">
<object idref="tableDesc2"/>
@@ -701,7 +713,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -723,7 +735,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -770,14 +782,14 @@
<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 idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>200</int>
@@ -787,7 +799,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -818,7 +830,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>
@@ -830,13 +842,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>
@@ -883,13 +898,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/input3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input3.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input3.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input3.q.xml Fri Sep 19 16:56:30 2008
@@ -25,7 +25,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/1357902447.10003.insclause-3</string>
+ <string>/tmp/hive-zshao/160162101.10003.insclause-3</string>
</void>
<void property="targetDir">
<string>../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out</string>
@@ -45,10 +45,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/1357902447.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/160162101.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>
@@ -95,13 +98,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>
@@ -118,10 +118,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/1357902447.10001.insclause-1</string>
+ <string>/tmp/hive-zshao/160162101.10001.insclause-1</string>
</void>
<void property="table">
<object id="tableDesc1" 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>
@@ -168,13 +171,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest2</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest2</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>
@@ -200,10 +200,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/1357902447.10002.insclause-2</string>
+ <string>/tmp/hive-zshao/160162101.10002.insclause-2</string>
</void>
<void property="table">
<object id="tableDesc2" 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>
@@ -254,13 +257,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest3</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest3</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>
@@ -301,7 +301,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/1357902447.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/160162101.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -318,7 +318,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>
@@ -328,7 +332,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>
@@ -350,7 +354,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -360,7 +364,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -407,14 +411,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>
@@ -424,7 +432,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>
@@ -440,7 +452,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -450,7 +462,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -473,7 +485,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/1357902447.10001.insclause-1</string>
+ <string>/tmp/hive-zshao/160162101.10001.insclause-1</string>
</void>
<void property="tableInfo">
<object idref="tableDesc1"/>
@@ -490,7 +502,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -500,7 +512,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -522,7 +534,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -532,7 +544,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -599,14 +611,14 @@
<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 idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>100</int>
@@ -616,7 +628,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -646,14 +658,14 @@
<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 idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>200</int>
@@ -663,14 +675,14 @@
</object>
</void>
<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>
@@ -698,7 +710,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/1357902447.10002.insclause-2</string>
+ <string>/tmp/hive-zshao/160162101.10002.insclause-2</string>
</void>
<void property="tableInfo">
<object idref="tableDesc2"/>
@@ -715,7 +727,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -737,7 +749,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -804,14 +816,14 @@
<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 idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>200</int>
@@ -821,7 +833,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -851,14 +863,14 @@
<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 idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>300</int>
@@ -868,14 +880,14 @@
</object>
</void>
<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>
@@ -903,10 +915,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/1357902447.10003.insclause-3</string>
+ <string>/tmp/hive-zshao/160162101.10003.insclause-3</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>
@@ -921,9 +936,6 @@
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
</object>
</void>
</object>
@@ -938,7 +950,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -960,7 +972,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1007,14 +1019,14 @@
<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 idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>300</int>
@@ -1024,7 +1036,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -1055,7 +1067,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>
@@ -1067,13 +1079,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>
@@ -1120,13 +1135,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/input4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input4.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input4.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input4.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/320749977.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/225748576.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,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -268,7 +347,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -286,7 +365,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -296,7 +375,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -318,7 +397,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -328,7 +407,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -343,7 +422,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>tmap:src</string>
@@ -355,13 +434,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>
@@ -408,13 +490,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>
@@ -441,7 +520,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/320749977.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/225748576.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -458,7 +537,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -468,7 +547,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -490,7 +569,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -500,7 +579,7 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -547,14 +626,18 @@
<string>0</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>
@@ -564,7 +647,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>
@@ -580,7 +667,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -590,7 +677,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -610,7 +697,7 @@
<string>VALUE</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>