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 [13/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/sample6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample6.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/sample7.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml Mon Aug 18 17:05:02 2014
@@ -1184,7 +1184,7 @@
<string>s</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>
@@ -1214,6 +1214,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="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>
Modified: hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml Mon Aug 18 17:05:02 2014
@@ -726,7 +726,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>
@@ -866,7 +866,7 @@
<string>src</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>
@@ -896,6 +896,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</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/udf1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml Mon Aug 18 17:05:02 2014
@@ -1871,7 +1871,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>
@@ -1998,7 +1998,7 @@
<string>src</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>
@@ -2028,6 +2028,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</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/udf4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml Mon Aug 18 17:05:02 2014
@@ -1802,6 +1802,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>dest1</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 idref="PrimitiveTypeInfo2"/>
+ </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/udf6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml Mon Aug 18 17:05:02 2014
@@ -531,7 +531,7 @@
<string>src</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>
@@ -561,6 +561,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</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/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml Mon Aug 18 17:05:02 2014
@@ -608,7 +608,7 @@
<string>src</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>
@@ -638,6 +638,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</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/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml Mon Aug 18 17:05:02 2014
@@ -688,7 +688,7 @@
<string>src</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>
@@ -718,6 +718,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</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/union.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml?rev=1618664&r1=1618663&r2=1618664&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/union.q.xml Mon Aug 18 17:05:02 2014
@@ -1069,6 +1069,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</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>
@@ -1457,6 +1503,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>src</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>