You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by he...@apache.org on 2012/10/01 05:52:11 UTC
svn commit: r1392193 [2/2] - in /hive/trunk:
common/src/java/org/apache/hadoop/hive/conf/ conf/
ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/optimiz...
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=1392193&r1=1392192&r2=1392193&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml Mon Oct 1 03:52:10 2012
@@ -198,125 +198,7 @@
<void method="add">
<object id="ReduceSinkOperator0" class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator">
<void property="columnExprMap">
- <object class="java.util.HashMap">
- <void method="put">
- <string>VALUE._col4</string>
- <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col5</string>
- </void>
- <void property="tabAlias">
- <string></string>
- </void>
- <void property="typeInfo">
- <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>string</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="put">
- <string>VALUE._col3</string>
- <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col4</string>
- </void>
- <void property="tabAlias">
- <string></string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="put">
- <string>VALUE._col2</string>
- <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col3</string>
- </void>
- <void property="tabAlias">
- <string></string>
- </void>
- <void property="typeInfo">
- <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
- <void property="allStructFieldNames">
- <object class="java.util.ArrayList">
- <void method="add">
- <string>count</string>
- </void>
- <void method="add">
- <string>sum</string>
- </void>
- </object>
- </void>
- <void property="allStructFieldTypeInfos">
- <object class="java.util.ArrayList">
- <void method="add">
- <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>double</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="put">
- <string>VALUE._col1</string>
- <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col2</string>
- </void>
- <void property="tabAlias">
- <string></string>
- </void>
- <void property="typeInfo">
- <object idref="StructTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="put">
- <string>VALUE._col0</string>
- <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col1</string>
- </void>
- <void property="tabAlias">
- <string></string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo2"/>
- </void>
- </object>
- </void>
- <void method="put">
- <string>KEY._col0:0._col0</string>
- <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col0</string>
- </void>
- <void property="tabAlias">
- <string></string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </object>
+ <object class="java.util.HashMap"/>
</void>
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc">
@@ -334,7 +216,21 @@
<void property="keyCols">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc5"/>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>_col0</string>
+ </void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>string</string>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -405,19 +301,98 @@
<void property="valueCols">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc4"/>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>_col1</string>
+ </void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>double</string>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc3"/>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>_col2</string>
+ </void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
+ <void property="typeInfo">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>count</string>
+ </void>
+ <void method="add">
+ <string>sum</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc2"/>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>_col3</string>
+ </void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
+ <void property="typeInfo">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ </object>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc1"/>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>_col4</string>
+ </void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc0"/>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>_col5</string>
+ </void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -498,7 +473,7 @@
<string>VALUE._col0</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -1031,7 +1006,7 @@
<string></string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -1110,7 +1085,7 @@
<string>src</string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -1311,7 +1286,7 @@
<string>src</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo1"/>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -1637,7 +1612,7 @@
<string></string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -1650,7 +1625,7 @@
<string></string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -1663,7 +1638,7 @@
<string></string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -1705,7 +1680,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col4</string>
- <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col4</string>
</void>
@@ -1719,7 +1694,7 @@
</void>
<void method="put">
<string>_col3</string>
- <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col3</string>
</void>
@@ -1733,7 +1708,7 @@
</void>
<void method="put">
<string>_col2</string>
- <object id="ExprNodeColumnDesc8" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col2</string>
</void>
@@ -1741,13 +1716,13 @@
<string></string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc9" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col1</string>
</void>
@@ -1755,13 +1730,13 @@
<string></string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc10" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -1769,7 +1744,7 @@
<string></string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -1780,19 +1755,19 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc10"/>
+ <object idref="ExprNodeColumnDesc4"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc9"/>
+ <object idref="ExprNodeColumnDesc3"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc8"/>
+ <object idref="ExprNodeColumnDesc2"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc7"/>
+ <object idref="ExprNodeColumnDesc1"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc6"/>
+ <object idref="ExprNodeColumnDesc0"/>
</void>
</object>
</void>
@@ -1856,7 +1831,7 @@
<string>_col0</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -1869,7 +1844,7 @@
<string>_col1</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -1882,7 +1857,7 @@
<string>_col2</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -1948,7 +1923,7 @@
<string>VALUE._col0</string>
</void>
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -2145,7 +2120,7 @@
<string></string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -2158,7 +2133,7 @@
<string></string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
@@ -2171,7 +2146,7 @@
<string></string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=1392193&r1=1392192&r2=1392193&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml Mon Oct 1 03:52:10 2012
@@ -217,24 +217,6 @@
</void>
</object>
</void>
- <void method="put">
- <string>VALUE._col0</string>
- <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col1</string>
- </void>
- <void property="tabAlias">
- <string></string>
- </void>
- <void property="typeInfo">
- <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>double</string>
- </void>
- </object>
- </void>
- </object>
- </void>
</object>
</void>
<void property="conf">
@@ -307,7 +289,21 @@
<void property="valueCols">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc1"/>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>_col1</string>
+ </void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>double</string>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -404,7 +400,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -500,7 +496,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc2"/>
+ <object idref="ExprNodeColumnDesc1"/>
</void>
</object>
</void>
@@ -1185,7 +1181,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col1</string>
</void>
@@ -1199,7 +1195,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -1218,10 +1214,10 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc4"/>
+ <object idref="ExprNodeColumnDesc3"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc3"/>
+ <object idref="ExprNodeColumnDesc2"/>
</void>
</object>
</void>
@@ -1305,7 +1301,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY._col0</string>
</void>
@@ -1357,7 +1353,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc5"/>
+ <object idref="ExprNodeColumnDesc4"/>
</void>
</object>
</void>