You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2010/11/17 18:33:11 UTC
svn commit: r1036128 [19/19] - in /hive/trunk: ./
common/src/java/org/apache/hadoop/hive/conf/ conf/
ql/src/java/org/apache/hadoop/hive/ql/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/ ql/src/java/...
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=1036128&r1=1036127&r2=1036128&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 Wed Nov 17 17:33:06 2010
@@ -41,7 +41,7 @@
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10001</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -50,7 +50,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10000</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -124,6 +124,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -138,6 +141,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -186,10 +192,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10001</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10001</string>
</void>
</object>
</void>
@@ -198,7 +204,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10001</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>-ext-10001</string>
@@ -271,7 +277,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10000</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10000</string>
</void>
<void property="targetDir">
<string>../build/ql/test/data/warehouse/union.out</string>
@@ -295,10 +301,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10001</string>
</void>
<void property="targetDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10000</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10000</string>
</void>
</object>
</void>
@@ -324,7 +330,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10001</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -410,11 +416,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1287465229</string>
+ <string>1290011964</string>
</void>
</object>
</void>
@@ -474,13 +480,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-13-53_475_6468347213258050555/-ext-10000/</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-39-28_369_4065673259860755711/-ext-10000/</string>
</void>
<void property="tableInfo">
<object idref="TableDesc0"/>
@@ -620,6 +626,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -633,6 +642,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -740,6 +752,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -750,6 +765,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -847,6 +865,9 @@
<void property="internalName">
<string>key</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -857,6 +878,9 @@
<void property="internalName">
<string>value</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -949,9 +973,15 @@
</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">
@@ -963,9 +993,15 @@
</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>
@@ -1032,7 +1068,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>unioninput:src</string>
@@ -1044,7 +1080,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -1101,11 +1137,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1287465229</string>
+ <string>1290011964</string>
</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=1036128&r1=1036127&r2=1036128&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 Wed Nov 17 17:33:06 2010
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1287465245</string>
+ <string>1290011979</string>
</void>
</object>
</void>
@@ -119,13 +119,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/njain/hive_2010-10-18_22-14-09_057_2107459775320689541/-ext-10001</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-39-43_567_6512311296185018388/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/njain/hive_2010-10-18_22-14-09_057_2107459775320689541/-ext-10001/</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-39-43_567_6512311296185018388/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
@@ -196,6 +196,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -210,6 +213,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -220,6 +226,9 @@
<void property="internalName">
<string>_col2</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -230,6 +239,9 @@
<void property="internalName">
<string>_col3</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -240,6 +252,9 @@
<void property="internalName">
<string>_col4</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -250,6 +265,9 @@
<void property="internalName">
<string>_col5</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -260,6 +278,9 @@
<void property="internalName">
<string>_col6</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -270,6 +291,9 @@
<void property="internalName">
<string>_col7</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -280,6 +304,9 @@
<void property="internalName">
<string>_col8</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -290,6 +317,9 @@
<void property="internalName">
<string>_col9</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -300,6 +330,9 @@
<void property="internalName">
<string>_col10</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -310,6 +343,9 @@
<void property="internalName">
<string>_col11</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -320,6 +356,9 @@
<void property="internalName">
<string>_col12</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -330,6 +369,9 @@
<void property="internalName">
<string>_col13</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -344,6 +386,9 @@
<void property="internalName">
<string>_col14</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -354,6 +399,9 @@
<void property="internalName">
<string>_col15</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -364,6 +412,9 @@
<void property="internalName">
<string>_col16</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -1627,6 +1678,9 @@
<void property="internalName">
<string>key</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -1719,6 +1773,9 @@
<void property="internalName">
<string>value</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -1726,9 +1783,15 @@
</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">
@@ -1740,9 +1803,15 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="internalName">
<string>INPUT__FILE__NAME</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -1806,7 +1875,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1818,7 +1887,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -1875,11 +1944,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1287465245</string>
+ <string>1290011979</string>
</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=1036128&r1=1036127&r2=1036128&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 Wed Nov 17 17:33:06 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_14" class="java.beans.XMLDecoder">
+<java version="1.6.0_07" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1284515470</string>
+ <string>1290011998</string>
</void>
</object>
</void>
@@ -111,13 +111,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/nzhang/hive_2010-09-14_18-51-10_695_8552333714232132191/-ext-10001</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-39-58_998_104183998094092313/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/nzhang/hive_2010-09-14_18-51-10_695_8552333714232132191/-ext-10001/</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-39-58_998_104183998094092313/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
@@ -188,6 +188,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -202,6 +205,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -212,6 +218,9 @@
<void property="internalName">
<string>_col2</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -222,6 +231,9 @@
<void property="internalName">
<string>_col3</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -232,6 +244,9 @@
<void property="internalName">
<string>_col4</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -242,6 +257,9 @@
<void property="internalName">
<string>_col5</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -252,6 +270,9 @@
<void property="internalName">
<string>_col6</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -266,6 +287,9 @@
<void property="internalName">
<string>_col7</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -276,6 +300,9 @@
<void property="internalName">
<string>_col8</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -286,6 +313,9 @@
<void property="internalName">
<string>_col9</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -296,6 +326,9 @@
<void property="internalName">
<string>_col10</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -306,6 +339,9 @@
<void property="internalName">
<string>_col11</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -316,6 +352,9 @@
<void property="internalName">
<string>_col12</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -326,6 +365,9 @@
<void property="internalName">
<string>_col13</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -336,6 +378,9 @@
<void property="internalName">
<string>_col14</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -350,6 +395,9 @@
<void property="internalName">
<string>_col15</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo2"/>
</void>
@@ -360,6 +408,9 @@
<void property="internalName">
<string>_col16</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo2"/>
</void>
@@ -370,6 +421,9 @@
<void property="internalName">
<string>_col17</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo2"/>
</void>
@@ -380,6 +434,9 @@
<void property="internalName">
<string>_col18</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo2"/>
</void>
@@ -1588,6 +1645,9 @@
<void property="internalName">
<string>key</string>
</void>
+ <void property="tabAlias">
+ <string>dest1</string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -1602,6 +1662,9 @@
<void property="internalName">
<string>value</string>
</void>
+ <void property="tabAlias">
+ <string>dest1</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo3"/>
</void>
@@ -1609,9 +1672,15 @@
</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>dest1</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1619,9 +1688,15 @@
</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>dest1</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo3"/>
</void>
@@ -1638,7 +1713,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>dest1</string>
@@ -1650,7 +1725,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>dest1</string>
@@ -1707,11 +1782,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1284515470</string>
+ <string>1290011998</string>
</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=1036128&r1=1036127&r2=1036128&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 Wed Nov 17 17:33:06 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_14" class="java.beans.XMLDecoder">
+<java version="1.6.0_07" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1284515482</string>
+ <string>1290012010</string>
</void>
</object>
</void>
@@ -111,13 +111,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/nzhang/hive_2010-09-14_18-51-27_061_6114610854850063770/-ext-10001</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-40-14_635_3895190531484661102/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/nzhang/hive_2010-09-14_18-51-27_061_6114610854850063770/-ext-10001/</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-40-14_635_3895190531484661102/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
@@ -188,6 +188,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -202,6 +205,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -443,6 +449,9 @@
<void property="internalName">
<string>key</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -453,6 +462,9 @@
<void property="internalName">
<string>value</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -460,9 +472,15 @@
</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">
@@ -474,9 +492,15 @@
</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>
@@ -493,7 +517,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -505,7 +529,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -562,11 +586,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1284515482</string>
+ <string>1290012010</string>
</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=1036128&r1=1036127&r2=1036128&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 Wed Nov 17 17:33:06 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_14" class="java.beans.XMLDecoder">
+<java version="1.6.0_07" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1284515499</string>
+ <string>1290012026</string>
</void>
</object>
</void>
@@ -115,13 +115,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/nzhang/hive_2010-09-14_18-51-42_745_6167539490084767001/-ext-10001</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-40-29_816_1617817159576425839/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/nzhang/hive_2010-09-14_18-51-42_745_6167539490084767001/-ext-10001/</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-40-29_816_1617817159576425839/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
@@ -192,6 +192,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -206,6 +209,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -536,6 +542,9 @@
<void property="internalName">
<string>key</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -550,6 +559,9 @@
<void property="internalName">
<string>value</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -557,9 +569,15 @@
</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">
@@ -571,9 +589,15 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="internalName">
<string>INPUT__FILE__NAME</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -590,7 +614,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -602,7 +626,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -659,11 +683,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/nzhang/work/784/apache-hive/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1284515499</string>
+ <string>1290012026</string>
</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=1036128&r1=1036127&r2=1036128&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 Wed Nov 17 17:33:06 2010
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1287465308</string>
+ <string>1290012041</string>
</void>
</object>
</void>
@@ -115,13 +115,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/njain/hive_2010-10-18_22-15-12_414_1015400256226766331/-ext-10001</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-40-45_104_3491886633745685100/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/njain/hive_2010-10-18_22-15-12_414_1015400256226766331/-ext-10001/</string>
+ <string>file:/tmp/njain/hive_2010-11-17_08-40-45_104_3491886633745685100/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
@@ -192,6 +192,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -206,6 +209,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -616,6 +622,9 @@
<void property="internalName">
<string>key</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -630,6 +639,9 @@
<void property="internalName">
<string>value</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo2"/>
</void>
@@ -637,9 +649,15 @@
</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">
@@ -651,9 +669,15 @@
</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="PrimitiveTypeInfo2"/>
</void>
@@ -670,7 +694,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -682,7 +706,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -739,11 +763,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1287465308</string>
+ <string>1290012041</string>
</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=1036128&r1=1036127&r2=1036128&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 Wed Nov 17 17:33:06 2010
@@ -41,7 +41,7 @@
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10001</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -50,7 +50,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10000</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -124,6 +124,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -138,6 +141,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string></string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -186,10 +192,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10001</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10001</string>
</void>
</object>
</void>
@@ -198,7 +204,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10001</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>-ext-10001</string>
@@ -271,7 +277,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10000</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10000</string>
</void>
<void property="targetDir">
<string>../build/ql/test/data/warehouse/union.out</string>
@@ -295,10 +301,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10001</string>
</void>
<void property="targetDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10000</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10000</string>
</void>
</object>
</void>
@@ -324,7 +330,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10001</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -410,11 +416,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1287465324</string>
+ <string>1290012056</string>
</void>
</object>
</void>
@@ -497,11 +503,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1287465324</string>
+ <string>1290012056</string>
</void>
</object>
</void>
@@ -565,13 +571,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10001</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/scratchdir/hive_2010-10-18_22-15-28_057_5202140703313155019/-ext-10000/</string>
+ <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/scratchdir/hive_2010-11-17_08-41-00_459_3600797151942406281/-ext-10000/</string>
</void>
<void property="tableInfo">
<object idref="TableDesc0"/>
@@ -711,6 +717,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -724,6 +733,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1060,6 +1072,9 @@
<void property="internalName">
<string>key</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1070,6 +1085,9 @@
<void property="internalName">
<string>value</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1077,9 +1095,15 @@
</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 id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -1091,9 +1115,15 @@
</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>
@@ -1145,6 +1175,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1155,6 +1188,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1177,6 +1213,9 @@
<void property="internalName">
<string>_col0</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1187,6 +1226,9 @@
<void property="internalName">
<string>_col1</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1376,6 +1418,9 @@
<void property="internalName">
<string>key</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1386,6 +1431,9 @@
<void property="internalName">
<string>value</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -1478,9 +1526,15 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="internalName">
<string>BLOCK__OFFSET__INSIDE__FILE</string>
</void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
<void property="type">
<object idref="PrimitiveTypeInfo3"/>
</void>
@@ -1488,9 +1542,15 @@
</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>
@@ -1561,7 +1621,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>null-subquery1:unioninput-subquery1:src</string>
@@ -1576,7 +1636,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -1633,11 +1693,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1287465324</string>
+ <string>1290012056</string>
</void>
</object>
</void>
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java?rev=1036128&r1=1036127&r2=1036128&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java Wed Nov 17 17:33:06 2010
@@ -187,6 +187,7 @@ public final class ObjectInspectorUtils
return copyToStandardObject(o, oi, ObjectInspectorCopyOption.DEFAULT);
}
+
public static Object copyToStandardObject(Object o, ObjectInspector oi,
ObjectInspectorCopyOption objectInspectorOption) {
if (o == null) {