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 [2/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/clientpositive/union26.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/clientpositive/union26.q.out?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/clientpositive/union26.q.out (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/clientpositive/union26.q.out Sat Mar 9 23:53:44 2013
@@ -151,9 +151,14 @@ STAGE PLANS:
alias: srcpart
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: key
+ type: string
+ expr: value
+ type: string
+ outputColumnNames: key, value
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3, _col4
+ outputColumnNames: _col0, _col1, _col4
Select Operator
expressions:
expr: _col0
@@ -204,7 +209,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3, _col4
+ outputColumnNames: _col0, _col1, _col4
Select Operator
expressions:
expr: _col0
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/case_sensitivity.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/case_sensitivity.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/case_sensitivity.q.xml Sat Mar 9 23:53:44 2013
@@ -1085,35 +1085,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">
- <void property="internalName">
- <string>aint</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</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="internalName">
- <string>astring</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <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>lint</string>
</void>
@@ -1126,24 +1100,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>lstring</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
- <void property="listElementTypeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </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>lintstring</string>
</void>
@@ -1155,62 +1112,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>mstringstring</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
- <void property="mapKeyTypeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="mapValueTypeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </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>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</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_thrift</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1261,7 +1162,113 @@
<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 class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>aint</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</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="internalName">
+ <string>astring</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>lstring</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
+ <void property="listElementTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>mstringstring</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </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>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</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_thrift</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/cast1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/cast1.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/cast1.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/cast1.q.xml Sat Mar 9 23:53:44 2013
@@ -961,9 +961,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>
@@ -975,55 +975,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="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>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="PrimitiveTypeInfo3"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1071,7 +1022,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="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>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="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input1.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input1.q.xml Sat Mar 9 23:53:44 2013
@@ -963,9 +963,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>
@@ -978,7 +978,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>
@@ -990,42 +990,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>
@@ -1076,7 +1040,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/input6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input6.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input6.q.xml Sat Mar 9 23:53:44 2013
@@ -949,9 +949,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>
@@ -964,7 +964,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>
@@ -976,42 +976,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 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>
@@ -1062,7 +1026,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 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>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input9.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input9.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input9.q.xml Sat Mar 9 23:53:44 2013
@@ -945,9 +945,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>
@@ -959,55 +959,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>src1</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="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 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>
@@ -1055,7 +1006,60 @@
<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 class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</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="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 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>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input_part1.q.xml Sat Mar 9 23:53:44 2013
@@ -638,9 +638,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>
@@ -653,7 +653,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>
@@ -666,7 +666,7 @@
</object>
</void>
<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>ds</string>
</void>
@@ -679,7 +679,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>hr</string>
</void>
@@ -691,42 +691,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>srcpart</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>srcpart</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -777,7 +741,56 @@
<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 idref="ColumnInfo1"/>
+ </void>
+ <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>srcpart</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>srcpart</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/input_testxpath2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input_testxpath2.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input_testxpath2.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/input_testxpath2.q.xml Sat Mar 9 23:53:44 2013
@@ -674,35 +674,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">
- <void property="internalName">
- <string>aint</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</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>astring</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
- <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>lint</string>
</void>
@@ -715,24 +689,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>lstring</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
- <void property="listElementTypeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
- </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>lintstring</string>
</void>
@@ -745,7 +702,7 @@
</object>
</void>
<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>mstringstring</string>
</void>
@@ -757,42 +714,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_thrift</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_thrift</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -846,7 +767,96 @@
<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 class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>aint</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</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>astring</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>lstring</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
+ <void property="listElementTypeInfo">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo2"/>
+ </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_thrift</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_thrift</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/join4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join4.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join4.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join4.q.xml Sat Mar 9 23:53:44 2013
@@ -773,9 +773,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>
@@ -788,7 +788,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>
@@ -800,42 +800,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>
@@ -886,7 +850,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>
@@ -939,7 +946,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">
@@ -1005,7 +1012,7 @@
</object>
</void>
<void property="partitionCols">
- <object idref="ArrayList2"/>
+ <object idref="ArrayList1"/>
</void>
<void property="tag">
<int>1</int>
@@ -1350,9 +1357,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>
@@ -1365,7 +1372,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>
@@ -1377,38 +1384,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>
@@ -1459,7 +1434,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>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join5.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join5.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join5.q.xml Sat Mar 9 23:53:44 2013
@@ -773,9 +773,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>
@@ -788,7 +788,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>
@@ -800,42 +800,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>
@@ -886,7 +850,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>
@@ -939,7 +946,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">
@@ -1005,7 +1012,7 @@
</object>
</void>
<void property="partitionCols">
- <object idref="ArrayList2"/>
+ <object idref="ArrayList1"/>
</void>
<void property="tag">
<int>1</int>
@@ -1350,9 +1357,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>
@@ -1365,7 +1372,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>
@@ -1377,38 +1384,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>
@@ -1459,7 +1434,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>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join6.q.xml?rev=1454774&r1=1454773&r2=1454774&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join6.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/join6.q.xml Sat Mar 9 23:53:44 2013
@@ -773,9 +773,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>
@@ -788,7 +788,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>
@@ -800,42 +800,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>
@@ -886,7 +850,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>
@@ -939,7 +946,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">
@@ -1005,7 +1012,7 @@
</object>
</void>
<void property="partitionCols">
- <object idref="ArrayList2"/>
+ <object idref="ArrayList1"/>
</void>
<void property="tag">
<int>1</int>
@@ -1350,9 +1357,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>
@@ -1365,7 +1372,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>
@@ -1377,38 +1384,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>
@@ -1459,7 +1434,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>