You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/03/10 00:53:47 UTC
svn commit: r1454774 [3/3] - in /hive/branches/ptf-windowing: ./
common/src/java/org/apache/hadoop/hive/conf/ data/conf/ eclipse-templates/
ivy/ metastore/src/java/org/apache/hadoop/hive/metastore/ ql/
ql/src/gen/protobuf/ ql/src/gen/protobuf/gen-java/...
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join7.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join7.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join7.q.xml Sat Mar 9 23:53:44 2013
@@ -921,9 +921,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList1" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -936,7 +936,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -948,42 +948,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src1</string>
- </void>
- <void property="type">
- <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src1</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1034,7 +998,50 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList1"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -1087,7 +1094,7 @@
<object class="java.util.ArrayList"/>
</void>
<void property="keyCols">
- <object id="ArrayList2" class="java.util.ArrayList">
+ <object id="ArrayList1" class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
@@ -1153,7 +1160,7 @@
</object>
</void>
<void property="partitionCols">
- <object idref="ArrayList2"/>
+ <object idref="ArrayList1"/>
</void>
<void property="tag">
<int>1</int>
@@ -1498,9 +1505,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList3" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -1513,7 +1520,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -1525,38 +1532,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src2</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo3"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src2</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1607,7 +1582,46 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList3"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo3"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -1660,7 +1674,7 @@
<object class="java.util.ArrayList"/>
</void>
<void property="keyCols">
- <object id="ArrayList4" class="java.util.ArrayList">
+ <object id="ArrayList2" class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
@@ -1726,7 +1740,7 @@
</object>
</void>
<void property="partitionCols">
- <object idref="ArrayList4"/>
+ <object idref="ArrayList2"/>
</void>
<void property="tag">
<int>2</int>
@@ -2071,9 +2085,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList5" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo4" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -2086,7 +2100,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo5" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -2098,38 +2112,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src3</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo3"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src3</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -2180,7 +2162,46 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList5"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo4"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo5"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src3</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src3</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join8.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join8.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join8.q.xml Sat Mar 9 23:53:44 2013
@@ -814,9 +814,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList1" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -829,7 +829,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -841,42 +841,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src1</string>
- </void>
- <void property="type">
- <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src1</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -927,7 +891,50 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList1"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -980,7 +987,7 @@
<object class="java.util.ArrayList"/>
</void>
<void property="keyCols">
- <object id="ArrayList2" class="java.util.ArrayList">
+ <object id="ArrayList1" class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
@@ -1046,7 +1053,7 @@
</object>
</void>
<void property="partitionCols">
- <object idref="ArrayList2"/>
+ <object idref="ArrayList1"/>
</void>
<void property="tag">
<int>1</int>
@@ -1432,9 +1439,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList3" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -1447,7 +1454,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -1459,38 +1466,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src2</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo3"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src2</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1541,7 +1516,46 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList3"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo3"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -2164,7 +2178,7 @@
<void property="signature">
<object class="java.util.ArrayList">
<void method="add">
- <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo4" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>_col0</string>
</void>
@@ -2177,7 +2191,7 @@
</object>
</void>
<void method="add">
- <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo5" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>_col1</string>
</void>
@@ -2190,7 +2204,7 @@
</object>
</void>
<void method="add">
- <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo6" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>_col2</string>
</void>
@@ -2203,7 +2217,7 @@
</object>
</void>
<void method="add">
- <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo7" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>_col3</string>
</void>
@@ -2453,16 +2467,16 @@
<void property="signature">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ColumnInfo0"/>
+ <object idref="ColumnInfo4"/>
</void>
<void method="add">
- <object idref="ColumnInfo1"/>
+ <object idref="ColumnInfo5"/>
</void>
<void method="add">
- <object idref="ColumnInfo2"/>
+ <object idref="ColumnInfo6"/>
</void>
<void method="add">
- <object idref="ColumnInfo3"/>
+ <object idref="ColumnInfo7"/>
</void>
</object>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample7.q.xml Sat Mar 9 23:53:44 2013
@@ -1113,9 +1113,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList1" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -1128,7 +1128,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -1140,42 +1140,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1226,7 +1190,50 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList1"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/subq.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/subq.q.xml Sat Mar 9 23:53:44 2013
@@ -836,9 +836,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList1" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -851,7 +851,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -863,42 +863,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -949,7 +913,50 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList1"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf1.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf1.q.xml Sat Mar 9 23:53:44 2013
@@ -1787,9 +1787,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList0" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -1801,55 +1801,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1897,7 +1848,60 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList0"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/union.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/union.q.xml Sat Mar 9 23:53:44 2013
@@ -1160,9 +1160,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList1" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -1175,7 +1175,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -1234,7 +1234,14 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList1"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -1508,9 +1515,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList2" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -1523,7 +1530,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -1535,38 +1542,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo3"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1617,7 +1592,46 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList2"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo3"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>