You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ga...@apache.org on 2014/08/18 19:05:07 UTC
svn commit: r1618664 [12/13] - in /hive/trunk:
hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/exec/mr/
ql/src/java/org/apache/hadoop/hive/ql/io/ ql/src/j...
Modified: hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml Mon Aug 18 17:05:02 2014
@@ -1017,7 +1017,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -1047,6 +1047,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml Mon Aug 18 17:05:02 2014
@@ -1028,7 +1028,7 @@
<string>src1</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -1058,6 +1058,56 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>int</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml Mon Aug 18 17:05:02 2014
@@ -957,7 +957,7 @@
<string>src1</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -987,6 +987,56 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>int</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml Mon Aug 18 17:05:02 2014
@@ -373,7 +373,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>int</string>
</void>
@@ -579,7 +579,7 @@
<string>src1</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -609,6 +609,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml Mon Aug 18 17:05:02 2014
@@ -1008,7 +1008,7 @@
<string>src1</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -1038,6 +1038,56 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>int</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml Mon Aug 18 17:05:02 2014
@@ -564,7 +564,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>int</string>
</void>
@@ -748,7 +748,7 @@
<string>srcpart</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -778,6 +778,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>srcpart</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml Mon Aug 18 17:05:02 2014
@@ -912,7 +912,7 @@
<string>src</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -942,6 +942,56 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>int</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml Mon Aug 18 17:05:02 2014
@@ -746,7 +746,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -776,6 +776,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml Mon Aug 18 17:05:02 2014
@@ -822,7 +822,7 @@
<string>src_thrift</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -852,6 +852,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml Mon Aug 18 17:05:02 2014
@@ -740,6 +740,56 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>int</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1047,6 +1097,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1282,7 +1351,7 @@
<string>_col1</string>
<object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>_col5</string>
+ <string>_col6</string>
</void>
<void property="tabAlias">
<string>src2</string>
@@ -1384,7 +1453,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>_col5</string>
+ <string>_col6</string>
<object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>VALUE._col0</string>
@@ -1473,13 +1542,17 @@
<string>_col0</string>
</void>
<void method="add">
- <string>_col5</string>
+ <string>_col6</string>
</void>
</object>
</void>
<void property="reversedExprs">
<object class="java.util.HashMap">
<void method="put">
+ <string>_col8</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
<string>_col7</string>
<byte>1</byte>
</void>
@@ -1493,7 +1566,7 @@
</void>
<void method="put">
<string>_col4</string>
- <byte>1</byte>
+ <byte>0</byte>
</void>
<void method="put">
<string>_col3</string>
@@ -1511,6 +1584,10 @@
<string>_col0</string>
<byte>0</byte>
</void>
+ <void method="put">
+ <string>_col9</string>
+ <byte>1</byte>
+ </void>
</object>
</void>
<void property="tagOrder">
@@ -1578,7 +1655,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>_col5</string>
+ <string>_col6</string>
</void>
<void property="tabAlias">
<string>src2</string>
Modified: hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml Mon Aug 18 17:05:02 2014
@@ -363,7 +363,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>_col4</string>
+ <string>_col5</string>
</void>
<void property="tabAlias">
<string>src2</string>
@@ -555,7 +555,7 @@
<string>_col0</string>
</void>
<void method="add">
- <string>_col4</string>
+ <string>_col5</string>
</void>
</object>
</void>
@@ -589,7 +589,7 @@
<void method="add">
<object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>_col4</string>
+ <string>_col5</string>
</void>
<void property="tabAlias">
<string>src2</string>
@@ -1015,6 +1015,56 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src3</string>
+ </void>
+ <void property="type">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>int</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1059,7 +1109,7 @@
<object id="Properties0" class="java.util.Properties">
<void method="put">
<string>columns</string>
- <string>_col0,_col4</string>
+ <string>_col0,_col5</string>
</void>
<void method="put">
<string>serialization.lib</string>
@@ -1302,7 +1352,7 @@
<string>_col1</string>
<object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>_col9</string>
+ <string>_col11</string>
</void>
<void property="tabAlias">
<string>src3</string>
@@ -1404,13 +1454,13 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>_col0</string>
+ <string>_col11</string>
<object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>VALUE._col0</string>
+ <string>VALUE._col1</string>
</void>
<void property="tabAlias">
- <string>src1</string>
+ <string>src3</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -1418,13 +1468,13 @@
</object>
</void>
<void method="put">
- <string>_col9</string>
+ <string>_col0</string>
<object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>VALUE._col1</string>
+ <string>VALUE._col0</string>
</void>
<void property="tabAlias">
- <string>src3</string>
+ <string>src1</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -1452,7 +1502,7 @@
<byte>0</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc4"/>
+ <object idref="ExprNodeColumnDesc5"/>
</void>
</object>
</void>
@@ -1460,7 +1510,7 @@
<byte>1</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc5"/>
+ <object idref="ExprNodeColumnDesc4"/>
</void>
</object>
</void>
@@ -1493,7 +1543,7 @@
<string>_col0</string>
</void>
<void method="add">
- <string>_col9</string>
+ <string>_col11</string>
</void>
</object>
</void>
@@ -1501,25 +1551,17 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col8</string>
- <byte>1</byte>
+ <byte>0</byte>
</void>
<void method="put">
<string>_col7</string>
<byte>0</byte>
</void>
<void method="put">
- <string>_col11</string>
- <byte>1</byte>
- </void>
- <void method="put">
<string>_col6</string>
<byte>0</byte>
</void>
<void method="put">
- <string>_col10</string>
- <byte>1</byte>
- </void>
- <void method="put">
<string>_col5</string>
<byte>0</byte>
</void>
@@ -1540,13 +1582,33 @@
<byte>0</byte>
</void>
<void method="put">
- <string>_col0</string>
+ <string>_col9</string>
<byte>0</byte>
</void>
<void method="put">
- <string>_col9</string>
+ <string>_col13</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
+ <string>_col12</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
+ <string>_col11</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
+ <string>_col10</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
+ <string>_col14</string>
<byte>1</byte>
</void>
+ <void method="put">
+ <string>_col0</string>
+ <byte>0</byte>
+ </void>
</object>
</void>
<void property="tagOrder">
@@ -1617,7 +1679,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>_col9</string>
+ <string>_col11</string>
</void>
<void property="tabAlias">
<string>src3</string>
@@ -2095,6 +2157,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -2402,6 +2483,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -2608,7 +2708,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>_col4</string>
+ <string>_col5</string>
<object id="ExprNodeColumnDesc8" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY.reducesinkkey0</string>
@@ -2697,13 +2797,17 @@
<string>_col0</string>
</void>
<void method="add">
- <string>_col4</string>
+ <string>_col5</string>
</void>
</object>
</void>
<void property="reversedExprs">
<object class="java.util.HashMap">
<void method="put">
+ <string>_col8</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
<string>_col7</string>
<byte>1</byte>
</void>
@@ -2717,7 +2821,7 @@
</void>
<void method="put">
<string>_col4</string>
- <byte>1</byte>
+ <byte>0</byte>
</void>
<void method="put">
<string>_col3</string>
@@ -2735,6 +2839,10 @@
<string>_col0</string>
<byte>0</byte>
</void>
+ <void method="put">
+ <string>_col9</string>
+ <byte>1</byte>
+ </void>
</object>
</void>
<void property="tagOrder">
Modified: hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml Mon Aug 18 17:05:02 2014
@@ -752,6 +752,56 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>int</string>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1115,6 +1165,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src3</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1422,6 +1491,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1660,7 +1748,7 @@
<string>_col1</string>
<object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>_col9</string>
+ <string>_col11</string>
</void>
<void property="tabAlias">
<string>src3</string>
@@ -1762,13 +1850,13 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>_col0</string>
+ <string>_col11</string>
<object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>KEY.reducesinkkey0</string>
+ <string>VALUE._col0</string>
</void>
<void property="tabAlias">
- <string>src1</string>
+ <string>src3</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -1776,13 +1864,13 @@
</object>
</void>
<void method="put">
- <string>_col9</string>
+ <string>_col0</string>
<object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>VALUE._col0</string>
+ <string>KEY.reducesinkkey0</string>
</void>
<void property="tabAlias">
- <string>src3</string>
+ <string>src1</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -1817,7 +1905,7 @@
<byte>0</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc6"/>
+ <object idref="ExprNodeColumnDesc7"/>
</void>
</object>
</void>
@@ -1829,7 +1917,7 @@
<byte>2</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc7"/>
+ <object idref="ExprNodeColumnDesc6"/>
</void>
</object>
</void>
@@ -1866,7 +1954,7 @@
<string>_col0</string>
</void>
<void method="add">
- <string>_col9</string>
+ <string>_col11</string>
</void>
</object>
</void>
@@ -1874,31 +1962,23 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col8</string>
- <byte>2</byte>
+ <byte>1</byte>
</void>
<void method="put">
<string>_col7</string>
<byte>1</byte>
</void>
<void method="put">
- <string>_col11</string>
- <byte>2</byte>
- </void>
- <void method="put">
<string>_col6</string>
<byte>1</byte>
</void>
<void method="put">
- <string>_col10</string>
- <byte>2</byte>
- </void>
- <void method="put">
<string>_col5</string>
<byte>1</byte>
</void>
<void method="put">
<string>_col4</string>
- <byte>1</byte>
+ <byte>0</byte>
</void>
<void method="put">
<string>_col3</string>
@@ -1913,13 +1993,33 @@
<byte>0</byte>
</void>
<void method="put">
- <string>_col0</string>
- <byte>0</byte>
+ <string>_col9</string>
+ <byte>1</byte>
</void>
<void method="put">
- <string>_col9</string>
+ <string>_col13</string>
+ <byte>2</byte>
+ </void>
+ <void method="put">
+ <string>_col12</string>
<byte>2</byte>
</void>
+ <void method="put">
+ <string>_col11</string>
+ <byte>2</byte>
+ </void>
+ <void method="put">
+ <string>_col10</string>
+ <byte>2</byte>
+ </void>
+ <void method="put">
+ <string>_col14</string>
+ <byte>2</byte>
+ </void>
+ <void method="put">
+ <string>_col0</string>
+ <byte>0</byte>
+ </void>
</object>
</void>
<void property="tagOrder">
@@ -2001,7 +2101,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>_col9</string>
+ <string>_col11</string>
</void>
<void property="tabAlias">
<string>src3</string>
Modified: hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml Mon Aug 18 17:05:02 2014
@@ -750,6 +750,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1270,6 +1316,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml Mon Aug 18 17:05:02 2014
@@ -750,6 +750,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1270,6 +1316,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml Mon Aug 18 17:05:02 2014
@@ -750,6 +750,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1270,6 +1316,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml Mon Aug 18 17:05:02 2014
@@ -815,6 +815,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1335,6 +1381,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1855,6 +1920,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src3</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml Mon Aug 18 17:05:02 2014
@@ -791,6 +791,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object id="StructTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
@@ -1352,6 +1398,25 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>src2</string>
+ </void>
+ <void property="type">
+ <object idref="StructTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml Mon Aug 18 17:05:02 2014
@@ -841,7 +841,7 @@
<string>s</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -871,6 +871,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml Mon Aug 18 17:05:02 2014
@@ -1139,7 +1139,7 @@
<string>s</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -1169,6 +1169,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml Mon Aug 18 17:05:02 2014
@@ -1149,7 +1149,7 @@
<string>s</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -1179,6 +1179,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml Mon Aug 18 17:05:02 2014
@@ -1139,7 +1139,7 @@
<string>s</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -1169,6 +1169,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml Mon Aug 18 17:05:02 2014
@@ -1136,7 +1136,7 @@
<string>s</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
<string>bigint</string>
</void>
@@ -1166,6 +1166,52 @@
</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>ROW__ID</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo">
+ <void property="allStructFieldNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>transactionid</string>
+ </void>
+ <void method="add">
+ <string>bucketid</string>
+ </void>
+ <void method="add">
+ <string>rowid</string>
+ </void>
+ </object>
+ </void>
+ <void property="allStructFieldTypeInfos">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="typeName">
+ <string>struct<transactionid:bigint,bucketid:int,rowid:bigint></string>
+ </void>
+ </object>
+ </void>
</void>
</object>
</void>