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 dh...@apache.org on 2008/10/21 20:11:18 UTC
svn commit: r706704 [12/23] - in /hadoop/core/trunk: ./ src/contrib/hive/
src/contrib/hive/bin/
src/contrib/hive/cli/src/java/org/apache/hadoop/hive/cli/
src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/
src/contrib/hive/conf/ src/contrib/h...
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/groupby5.q.xml Tue Oct 21 11:11:05 2008
@@ -35,7 +35,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/1485368551.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/218070299/172646370.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -55,8 +55,8 @@
<string>dest1</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest1 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -67,16 +67,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -88,12 +84,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -122,10 +118,13 @@
<void property="aliasToWork">
<object class="java.util.HashMap">
<void method="put">
- <string>/tmp/hive-zshao/1485368551.10001</string>
+ <string>/tmp/hive-zshao/218070299/172646370.10001</string>
<object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator">
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc">
+ <void property="inferNumReducers">
+ <boolean>true</boolean>
+ </void>
<void property="keyCols">
<object class="java.util.ArrayList">
<void method="add">
@@ -172,6 +171,9 @@
<void property="numPartitionFields">
<int>1</int>
</void>
+ <void property="numReducers">
+ <int>-1</int>
+ </void>
<void property="tag">
<int>-1</int>
</void>
@@ -248,13 +250,16 @@
</void>
</object>
</void>
+ <void property="inferNumReducers">
+ <boolean>true</boolean>
+ </void>
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-zshao/1485368551.10001</string>
+ <string>/tmp/hive-zshao/218070299/172646370.10001</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>/tmp/hive-zshao/1485368551.10001</string>
+ <string>/tmp/hive-zshao/218070299/172646370.10001</string>
</void>
</object>
</void>
@@ -263,7 +268,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-zshao/1485368551.10001</string>
+ <string>/tmp/hive-zshao/218070299/172646370.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">
@@ -307,7 +312,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/1485368551.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/218070299/172646370.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -488,16 +493,12 @@
<void property="keyCols">
<object class="java.util.ArrayList">
<void method="add">
- <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>
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
</void>
- <void property="value">
- <int>0</int>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -531,42 +532,15 @@
<void property="numPartitionFields">
<int>-1</int>
</void>
+ <void property="numReducers">
+ <int>-1</int>
+ </void>
<void property="tag">
<int>-1</int>
</void>
<void property="valueCols">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
- <void property="column">
- <string>key</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
- <void property="column">
- <string>value</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
- <void property="column">
- <string>key</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc">
<void property="UDFClass">
<class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
@@ -599,7 +573,11 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <object class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Integer</class>
+ </void>
+ </object>
</void>
<void property="value">
<int>4</int>
@@ -630,7 +608,7 @@
<object class="java.util.Properties">
<void method="put">
<string>columns</string>
- <string>0,1,2,3</string>
+ <string>0</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -645,31 +623,11 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="Vector1" class="java.util.Vector">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>VALUE.0</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>VALUE.1</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
+ <object class="java.util.Vector">
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>VALUE.2</string>
+ <string>KEY.0</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -679,7 +637,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>VALUE.3</string>
+ <string>VALUE.0</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -729,7 +687,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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>
@@ -741,7 +699,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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"/>
@@ -764,8 +722,8 @@
<string>src</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -776,16 +734,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -797,12 +751,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -811,50 +765,42 @@
</object>
</void>
<void property="reducer">
- <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator">
+ <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator">
- <void property="childOperators">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
- <void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
- <void property="dirName">
- <string>/tmp/hive-zshao/1485368551.10001</string>
+ <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
+ <void property="conf">
+ <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
+ <void property="dirName">
+ <string>/tmp/hive-zshao/218070299/172646370.10001</string>
+ </void>
+ <void property="tableInfo">
+ <object idref="tableDesc1"/>
+ </void>
+ </object>
+ </void>
+ <void property="schema">
+ <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema">
+ <void property="signature">
+ <object class="java.util.Vector">
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>0</string>
</void>
- <void property="tableInfo">
- <object idref="tableDesc1"/>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
- <void property="schema">
- <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema">
- <void property="signature">
- <object class="java.util.Vector">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>0</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>1</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </object>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>1</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
@@ -862,39 +808,25 @@
</void>
</object>
</void>
- <void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.groupByDesc">
- <void property="aggregators">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
- <void property="aggregationClass">
- <class>org.apache.hadoop.hive.ql.udf.UDAFSum</class>
- </void>
- <void property="parameters">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
- <void property="column">
- <string>VALUE.3</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </object>
- </void>
- </object>
- </void>
- </object>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="conf">
+ <object class="org.apache.hadoop.hive.ql.plan.groupByDesc">
+ <void property="aggregators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
+ <void property="aggregationClass">
+ <class>org.apache.hadoop.hive.ql.udf.UDAFSum</class>
</void>
- <void property="keys">
+ <void property="parameters">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
- <string>VALUE.2</string>
+ <string>VALUE.0</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -903,26 +835,33 @@
</void>
</object>
</void>
- <void property="mode">
- <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf">
- <string>PARTIAL1</string>
- </object>
- </void>
</object>
</void>
- <void property="schema">
- <object idref="RowSchema0"/>
+ </object>
+ </void>
+ <void property="keys">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <void property="column">
+ <string>KEY.0</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
</object>
</void>
+ <void property="mode">
+ <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf">
+ <string>PARTIAL1</string>
+ </object>
+ </void>
</object>
</void>
<void property="schema">
- <object class="org.apache.hadoop.hive.ql.exec.RowSchema">
- <void property="signature">
- <object idref="Vector1"/>
- </void>
- </object>
+ <object idref="RowSchema0"/>
</void>
</object>
</void>
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=706704&r1=706703&r2=706704&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 Tue Oct 21 11:11:05 2008
@@ -35,7 +35,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/43559649.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/20627718/64699543.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -55,8 +55,8 @@
<string>dest1</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest1 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -67,16 +67,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -88,12 +84,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -122,10 +118,13 @@
<void property="aliasToWork">
<object class="java.util.HashMap">
<void method="put">
- <string>/tmp/hive-zshao/43559649.10001</string>
+ <string>/tmp/hive-zshao/20627718/64699543.10001</string>
<object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator">
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc">
+ <void property="inferNumReducers">
+ <boolean>true</boolean>
+ </void>
<void property="keyCols">
<object class="java.util.ArrayList">
<void method="add">
@@ -172,6 +171,9 @@
<void property="numPartitionFields">
<int>1</int>
</void>
+ <void property="numReducers">
+ <int>-1</int>
+ </void>
<void property="tag">
<int>-1</int>
</void>
@@ -227,13 +229,16 @@
</void>
</object>
</void>
+ <void property="inferNumReducers">
+ <boolean>true</boolean>
+ </void>
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-zshao/43559649.10001</string>
+ <string>/tmp/hive-zshao/20627718/64699543.10001</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>/tmp/hive-zshao/43559649.10001</string>
+ <string>/tmp/hive-zshao/20627718/64699543.10001</string>
</void>
</object>
</void>
@@ -242,7 +247,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>/tmp/hive-zshao/43559649.10001</string>
+ <string>/tmp/hive-zshao/20627718/64699543.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">
@@ -286,7 +291,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/43559649.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/20627718/64699543.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -415,75 +420,6 @@
<void property="keyCols">
<object class="java.util.ArrayList">
<void method="add">
- <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>
- <void property="numPartitionFields">
- <int>-1</int>
- </void>
- <void property="tag">
- <int>-1</int>
- </void>
- <void property="valueCols">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
- <void property="column">
- <string>key</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
- <void property="column">
- <string>value</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc">
<void property="UDFClass">
<class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class>
@@ -519,7 +455,11 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo">
+ <void property="primitiveClass">
+ <class>java.lang.Integer</class>
+ </void>
+ </object>
</void>
<void property="value">
<int>4</int>
@@ -545,6 +485,43 @@
</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>
+ <void property="numPartitionFields">
+ <int>-1</int>
+ </void>
+ <void property="numReducers">
+ <int>-1</int>
+ </void>
+ <void property="tag">
+ <int>-1</int>
+ </void>
+ <void property="valueCols">
+ <object class="java.util.ArrayList"/>
+ </void>
<void property="valueSerializeInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
<void property="deserializerClass">
@@ -560,7 +537,7 @@
<object class="java.util.Properties">
<void method="put">
<string>columns</string>
- <string>0,1,2</string>
+ <string></string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -575,31 +552,11 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="Vector1" class="java.util.Vector">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>VALUE.0</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>VALUE.1</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
+ <object class="java.util.Vector">
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>VALUE.2</string>
+ <string>KEY.0</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -649,7 +606,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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>
@@ -661,7 +618,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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"/>
@@ -684,8 +641,8 @@
<string>src</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -696,16 +653,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -717,12 +670,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -731,87 +684,72 @@
</object>
</void>
<void property="reducer">
- <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator">
+ <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.GroupByOperator">
- <void property="childOperators">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
- <void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
- <void property="dirName">
- <string>/tmp/hive-zshao/43559649.10001</string>
- </void>
- <void property="tableInfo">
- <object idref="tableDesc1"/>
- </void>
- </object>
- </void>
- <void property="schema">
- <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema">
- <void property="signature">
- <object class="java.util.Vector">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>0</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </object>
- </void>
- </object>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
+ <void property="conf">
+ <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
+ <void property="dirName">
+ <string>/tmp/hive-zshao/20627718/64699543.10001</string>
+ </void>
+ <void property="tableInfo">
+ <object idref="tableDesc1"/>
</void>
</object>
</void>
- <void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.groupByDesc">
- <void property="aggregators">
- <object class="java.util.ArrayList"/>
- </void>
- <void property="keys">
- <object class="java.util.ArrayList">
+ <void property="schema">
+ <object id="RowSchema0" class="org.apache.hadoop.hive.ql.exec.RowSchema">
+ <void property="signature">
+ <object class="java.util.Vector">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
- <void property="column">
- <string>VALUE.2</string>
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>0</string>
</void>
- <void property="typeInfo">
+ <void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
</object>
</void>
</object>
</void>
- <void property="mode">
- <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf">
- <string>PARTIAL1</string>
- </object>
- </void>
</object>
</void>
- <void property="schema">
- <object idref="RowSchema0"/>
- </void>
</object>
</void>
</object>
</void>
- <void property="schema">
- <object class="org.apache.hadoop.hive.ql.exec.RowSchema">
- <void property="signature">
- <object idref="Vector1"/>
+ <void property="conf">
+ <object class="org.apache.hadoop.hive.ql.plan.groupByDesc">
+ <void property="aggregators">
+ <object class="java.util.ArrayList"/>
+ </void>
+ <void property="keys">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <void property="column">
+ <string>KEY.0</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="mode">
+ <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf">
+ <string>PARTIAL1</string>
+ </object>
</void>
</object>
</void>
+ <void property="schema">
+ <object idref="RowSchema0"/>
+ </void>
</object>
</void>
</object>
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=706704&r1=706703&r2=706704&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 Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/54141209.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/374447248/1282977307.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -51,8 +51,8 @@
<string>dest1</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest1 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -63,16 +63,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -84,12 +80,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -128,7 +124,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/54141209.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/374447248/1282977307.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -315,7 +311,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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>
@@ -327,7 +323,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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"/>
@@ -350,8 +346,8 @@
<string>src</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -362,16 +358,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -383,12 +375,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</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=706704&r1=706703&r2=706704&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 Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/2123304.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/20345754/201293413.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -51,8 +51,8 @@
<string>dest1</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest1 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -63,16 +63,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -84,12 +80,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -104,7 +100,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/2123304.10001.insclause-1</string>
+ <string>/tmp/hive-zshao/20345754/201293413.10001.insclause-1</string>
</void>
<void property="table">
<object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -124,8 +120,8 @@
<string>dest2</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest2 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -136,16 +132,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -157,12 +149,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest2</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest2</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -186,7 +178,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/2123304.10002.insclause-2</string>
+ <string>/tmp/hive-zshao/20345754/201293413.10002.insclause-2</string>
</void>
<void property="table">
<object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -206,8 +198,8 @@
<string>dest3</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest3 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -222,16 +214,12 @@
<string>ds/hr</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -243,12 +231,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest3</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest3</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -287,7 +275,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/2123304.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/20345754/201293413.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -471,7 +459,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/2123304.10001.insclause-1</string>
+ <string>/tmp/hive-zshao/20345754/201293413.10001.insclause-1</string>
</void>
<void property="tableInfo">
<object idref="tableDesc1"/>
@@ -696,7 +684,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/2123304.10002.insclause-2</string>
+ <string>/tmp/hive-zshao/20345754/201293413.10002.insclause-2</string>
</void>
<void property="tableInfo">
<object idref="tableDesc2"/>
@@ -830,7 +818,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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>
@@ -842,7 +830,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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"/>
@@ -865,8 +853,8 @@
<string>src</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -877,16 +865,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -898,12 +882,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</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=706704&r1=706703&r2=706704&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 Tue Oct 21 11:11:05 2008
@@ -21,11 +21,14 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.loadFileDesc">
+ <void property="columns">
+ <string>value</string>
+ </void>
<void property="isDfsDir">
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/160162101.10003.insclause-3</string>
+ <string>/tmp/hive-njain/356693511/91381909.10003.insclause-3</string>
</void>
<void property="targetDir">
<string>../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out</string>
@@ -45,7 +48,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/160162101.10000.insclause-0</string>
+ <string>/tmp/hive-njain/356693511/91381909.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -65,8 +68,8 @@
<string>dest1</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest1 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -77,16 +80,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -98,12 +97,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -118,7 +117,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/160162101.10001.insclause-1</string>
+ <string>/tmp/hive-njain/356693511/91381909.10001.insclause-1</string>
</void>
<void property="table">
<object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -138,8 +137,8 @@
<string>dest2</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest2 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -150,16 +149,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -171,12 +166,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest2</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest2</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -200,7 +195,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/160162101.10002.insclause-2</string>
+ <string>/tmp/hive-njain/356693511/91381909.10002.insclause-2</string>
</void>
<void property="table">
<object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -220,8 +215,8 @@
<string>dest3</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest3 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -236,16 +231,12 @@
<string>ds/hr</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -257,12 +248,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest3</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest3</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -301,7 +292,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/160162101.10000.insclause-0</string>
+ <string>/tmp/hive-njain/356693511/91381909.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -485,7 +476,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/160162101.10001.insclause-1</string>
+ <string>/tmp/hive-njain/356693511/91381909.10001.insclause-1</string>
</void>
<void property="tableInfo">
<object idref="tableDesc1"/>
@@ -710,7 +701,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/160162101.10002.insclause-2</string>
+ <string>/tmp/hive-njain/356693511/91381909.10002.insclause-2</string>
</void>
<void property="tableInfo">
<object idref="tableDesc2"/>
@@ -915,7 +906,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/160162101.10003.insclause-3</string>
+ <string>/tmp/hive-njain/356693511/91381909.10003.insclause-3</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -1067,7 +1058,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1079,7 +1070,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/home/njain/workspace/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"/>
@@ -1102,8 +1093,8 @@
<string>src</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -1114,16 +1105,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -1135,12 +1122,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</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=706704&r1=706703&r2=706704&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 Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/225748576.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/1042895489/270462051.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -51,8 +51,8 @@
<string>dest1</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest1 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -63,16 +63,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -84,12 +80,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -173,6 +169,9 @@
<void property="numPartitionFields">
<int>1</int>
</void>
+ <void property="numReducers">
+ <int>-1</int>
+ </void>
<void property="tag">
<int>-1</int>
</void>
@@ -422,7 +421,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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>
@@ -434,7 +433,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/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"/>
@@ -457,8 +456,8 @@
<string>src</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -469,16 +468,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -490,12 +485,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -520,7 +515,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/225748576.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/1042895489/270462051.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input5.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input5.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input5.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/106489316.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/641253778/15454385.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -51,8 +51,8 @@
<string>dest1</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct dest1 { string key, string value}</string>
</void>
<void method="put">
<string>serialization.format</string>
@@ -63,16 +63,12 @@
<string>key,value</string>
</void>
<void method="put">
- <string>field_to_dimension</string>
- <string></string>
- </void>
- <void method="put">
<string>bucket_count</string>
<string>-1</string>
</void>
<void method="put">
<string>serialization.lib</string>
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -84,12 +80,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>simple_meta</string>
+ <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string>
</void>
</object>
</void>
@@ -173,6 +169,9 @@
<void property="numPartitionFields">
<int>1</int>
</void>
+ <void property="numReducers">
+ <int>-1</int>
+ </void>
<void property="tag">
<int>-1</int>
</void>
@@ -485,7 +484,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
<object class="java.util.ArrayList">
<void method="add">
<string>tmap:src_thrift</string>
@@ -497,7 +496,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -520,8 +519,8 @@
<string>src_thrift</string>
</void>
<void method="put">
- <string>bucket_field_name</string>
- <string></string>
+ <string>serialization.ddl</string>
+ <string>struct src_thrift { }</string>
</void>
<void method="put">
<string>columns</string>
@@ -533,11 +532,7 @@
</void>
<void method="put">
<string>serialization.class</string>
- <string>org.apache.hadoop.hive.ql.thrift.Complex</string>
- </void>
- <void method="put">
- <string>field_to_dimension</string>
- <string></string>
+ <string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string>
</void>
<void method="put">
<string>bucket_count</string>
@@ -545,7 +540,7 @@
</void>
<void method="put">
<string>serialization.lib</string>
- <string>thrift</string>
+ <string>org.apache.hadoop.hive.serde2.ThriftDeserializer</string>
</void>
<void method="put">
<string>file.inputformat</string>
@@ -557,12 +552,12 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string>
</void>
</object>
</void>
<void property="serdeClassName">
- <string>thrift</string>
+ <string>org.apache.hadoop.hive.serde2.ThriftDeserializer</string>
</void>
</object>
</void>
@@ -583,7 +578,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/106489316.10000.insclause-0</string>
+ <string>/tmp/hive-zshao/641253778/15454385.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>