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 [29/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/join8.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join8.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join8.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/199979.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/113642626.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>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>
@@ -155,7 +184,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -165,7 +194,32 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <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>VALUE.0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -193,7 +247,7 @@
<string>VALUE.1</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -215,7 +269,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -225,7 +279,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -243,7 +297,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -253,7 +307,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -313,14 +367,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>15</int>
@@ -330,7 +388,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>
@@ -360,14 +422,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>25</int>
@@ -377,14 +439,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>
@@ -400,7 +462,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -410,7 +472,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -456,7 +518,32 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo4" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
+ </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>
@@ -473,7 +560,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -483,7 +570,32 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo5" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <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>
@@ -501,7 +613,7 @@
<string>VALUE.0</string>
</void>
<void property="type">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -511,7 +623,7 @@
<string>VALUE.1</string>
</void>
<void property="type">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -533,7 +645,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -543,7 +655,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -561,7 +673,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -571,7 +683,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -631,14 +743,14 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>10</int>
@@ -648,7 +760,7 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -678,14 +790,14 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>20</int>
@@ -695,14 +807,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>
@@ -718,7 +830,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -728,7 +840,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -757,7 +869,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>c:a:src1</string>
@@ -772,13 +884,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>
@@ -825,13 +940,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>
@@ -862,7 +974,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-athusoo/199979.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/113642626.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -879,7 +991,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -889,7 +1001,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -899,7 +1011,7 @@
<string>2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -909,7 +1021,7 @@
<string>3</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -931,7 +1043,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -941,7 +1053,7 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -951,7 +1063,7 @@
<string>2</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -961,7 +1073,7 @@
<string>3</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1025,14 +1137,14 @@
<string>2</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -1059,21 +1171,21 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</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>
@@ -1089,7 +1201,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1099,7 +1211,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1109,7 +1221,7 @@
<string>2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1119,7 +1231,7 @@
<string>3</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1141,7 +1253,7 @@
<string>0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1151,7 +1263,7 @@
<string>1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1161,7 +1273,7 @@
<string>2</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1171,7 +1283,7 @@
<string>3</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1217,7 +1329,7 @@
<string>VALUE.0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1227,7 +1339,7 @@
<string>VALUE.1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1242,7 +1354,7 @@
<string>VALUE.0</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1252,7 +1364,7 @@
<string>VALUE.1</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1272,7 +1384,7 @@
<string>0</string>
</void>
<void property="type">
- <object idref="TypeInfo4"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1282,7 +1394,7 @@
<string>1</string>
</void>
<void property="type">
- <object idref="TypeInfo5"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1292,7 +1404,7 @@
<string>2</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -1302,7 +1414,7 @@
<string>3</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample1.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample1.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/335196861.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/299196740.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/335196861.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/299196740.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>ds</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -233,7 +237,7 @@
<string>hr</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -300,14 +304,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>
@@ -317,7 +321,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>
@@ -347,14 +355,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>11</string>
@@ -364,14 +372,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>
@@ -387,7 +395,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -397,7 +405,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -410,7 +418,7 @@
<boolean>true</boolean>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -423,7 +431,7 @@
<boolean>true</boolean>
</void>
<void property="type">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -449,7 +457,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=11</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -461,7 +469,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=11</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap">
@@ -477,6 +485,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>
@@ -527,13 +538,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/sample2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample2.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample2.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/449925177.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/1471624673.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/449925177.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/1471624673.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/srcbucket/kv1.txt</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</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/srcbucket/kv1.txt</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</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/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample3.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample3.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/620806943.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/426518465.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/620806943.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/426518465.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>
@@ -294,7 +298,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -304,21 +308,25 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</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.Integer</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="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>2147483647</int>
@@ -328,14 +336,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<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>2</int>
@@ -345,14 +353,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo3"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<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>
@@ -362,7 +370,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>
@@ -382,7 +394,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -392,7 +404,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -407,7 +419,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -419,13 +431,16 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
</void>
<void property="tableDesc">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -472,13 +487,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample4.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample4.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/40001623.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/371950458.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/40001623.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/371950458.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -145,7 +145,11 @@
<string>0</string>
</void>
<void property="type">
- <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.String</class>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -155,7 +159,7 @@
<string>1</string>
</void>
<void property="type">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -177,7 +181,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -187,7 +191,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -291,21 +295,25 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Integer</class>
+ </void>
+ </object>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>2147483647</int>
@@ -315,14 +323,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>2</int>
@@ -332,14 +340,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>1</int>
@@ -349,7 +357,11 @@
</object>
</void>
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Boolean</class>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -369,7 +381,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -379,7 +391,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -394,7 +406,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -406,13 +418,16 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
</void>
<void property="tableDesc">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -459,13 +474,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample5.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample5.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-athusoo/1419001593.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/450613668.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/1419001593.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/450613668.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -145,7 +145,11 @@
<string>0</string>
</void>
<void property="type">
- <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.String</class>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -155,7 +159,7 @@
<string>1</string>
</void>
<void property="type">
- <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -177,7 +181,7 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -187,7 +191,7 @@
<string>value</string>
</void>
<void property="typeInfo">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -291,21 +295,25 @@
<string>key</string>
</void>
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</object>
</void>
<void property="typeInfo">
- <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Integer</class>
+ </void>
+ </object>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>2147483647</int>
@@ -315,14 +323,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>5</int>
@@ -332,14 +340,14 @@
</object>
</void>
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="TypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
<int>1</int>
@@ -349,7 +357,11 @@
</object>
</void>
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.ql.parse.TypeInfo"/>
+ <object class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Boolean</class>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -369,7 +381,7 @@
<string>key</string>
</void>
<void property="type">
- <object idref="TypeInfo0"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -379,7 +391,7 @@
<string>value</string>
</void>
<void property="type">
- <object idref="TypeInfo1"/>
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -394,7 +406,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -406,13 +418,16 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
</void>
<void property="tableDesc">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>
+ </void>
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -459,13 +474,10 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
- <void property="serdeClass">
- <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class>
- </void>
<void property="serdeClassName">
<string>simple_meta</string>
</void>