You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2010/07/30 08:40:11 UTC
svn commit: r980659 [31/34] - in /hadoop/hive/trunk: ./
common/src/java/org/apache/hadoop/hive/common/
contrib/src/test/results/clientpositive/ metastore/if/ metastore/src/gen-cpp/
metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ metast...
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml Fri Jul 30 06:40:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_15" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -41,7 +41,7 @@
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10002</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -286,10 +286,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10002</string>
</void>
</object>
</void>
@@ -298,7 +298,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10002</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>-ext-10002</string>
@@ -352,11 +352,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088273</string>
+ <string>1280428299</string>
</void>
</object>
</void>
@@ -395,7 +395,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -447,7 +447,7 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>file.outputformat</string>
@@ -455,7 +455,7 @@
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088273</string>
+ <string>1280428299</string>
</void>
</object>
</void>
@@ -592,13 +592,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10000</string>
</void>
<void property="table">
<object idref="TableDesc2"/>
</void>
<void property="tmpDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10001</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10001</string>
</void>
</object>
</void>
@@ -619,10 +619,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10002</string>
</void>
<void property="targetDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10000</string>
</void>
</object>
</void>
@@ -648,7 +648,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10002</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -734,11 +734,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088271</string>
+ <string>1280428298</string>
</void>
</object>
</void>
@@ -794,7 +794,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-33_880_2343898316681491373/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-39_949_295579374205388027/-ext-10002</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -1114,6 +1114,30 @@
<void method="add">
<object idref="ColumnInfo1"/>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -1127,6 +1151,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1172,7 +1199,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -1184,7 +1211,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src1</string>
@@ -1241,11 +1268,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088271</string>
+ <string>1280428298</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml Fri Jul 30 06:40:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_15" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -41,7 +41,7 @@
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10002</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -286,10 +286,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10002</string>
</void>
</object>
</void>
@@ -298,7 +298,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10002</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>-ext-10002</string>
@@ -352,11 +352,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088284</string>
+ <string>1280428310</string>
</void>
</object>
</void>
@@ -395,7 +395,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -447,7 +447,7 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>file.outputformat</string>
@@ -455,7 +455,7 @@
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088284</string>
+ <string>1280428310</string>
</void>
</object>
</void>
@@ -596,13 +596,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10000</string>
</void>
<void property="table">
<object idref="TableDesc2"/>
</void>
<void property="tmpDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10001</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10001</string>
</void>
</object>
</void>
@@ -623,10 +623,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10002</string>
</void>
<void property="targetDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10000</string>
</void>
</object>
</void>
@@ -652,7 +652,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10002</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -738,11 +738,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088282</string>
+ <string>1280428309</string>
</void>
</object>
</void>
@@ -790,7 +790,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-04-44_365_7299170351769290977/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-31-50_826_2056588105087143415/-ext-10002</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -949,6 +949,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1001,6 +1004,30 @@
</void>
</object>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -1012,7 +1039,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -1024,7 +1051,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src1</string>
@@ -1081,11 +1108,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088282</string>
+ <string>1280428309</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml Fri Jul 30 06:40:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_15" 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/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088293</string>
+ <string>1280428319</string>
</void>
</object>
</void>
@@ -111,7 +111,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/jssarma/hive_2010-07-25_13-04-54_997_7394818789296003573/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-32-01_241_722568681933551707/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -460,6 +460,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -512,6 +515,30 @@
</void>
</object>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -523,7 +550,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -535,7 +562,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src1</string>
@@ -592,11 +619,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088293</string>
+ <string>1280428319</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml Fri Jul 30 06:40:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_15" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -41,7 +41,7 @@
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10002</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -286,10 +286,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10002</string>
</void>
</object>
</void>
@@ -298,7 +298,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10002</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>-ext-10002</string>
@@ -352,11 +352,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088305</string>
+ <string>1280428331</string>
</void>
</object>
</void>
@@ -395,7 +395,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -447,7 +447,7 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>file.outputformat</string>
@@ -455,7 +455,7 @@
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088305</string>
+ <string>1280428331</string>
</void>
</object>
</void>
@@ -596,13 +596,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10000</string>
</void>
<void property="table">
<object idref="TableDesc2"/>
</void>
<void property="tmpDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10001</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10001</string>
</void>
</object>
</void>
@@ -623,10 +623,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10002</string>
</void>
<void property="targetDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10000</string>
</void>
</object>
</void>
@@ -652,7 +652,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10002</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -738,11 +738,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088303</string>
+ <string>1280428329</string>
</void>
</object>
</void>
@@ -798,7 +798,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-05_501_5411413768519085045/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-11_447_3436106646564217474/-ext-10002</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -1131,6 +1131,30 @@
</void>
</object>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -1144,6 +1168,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1186,7 +1213,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src1</string>
@@ -1198,7 +1225,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src1</string>
@@ -1255,11 +1282,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088303</string>
+ <string>1280428329</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml Fri Jul 30 06:40:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_15" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -75,11 +75,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/srcpart</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/srcpart</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088306</string>
+ <string>1280428332</string>
</void>
</object>
</void>
@@ -132,7 +132,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/jssarma/hive_2010-07-25_13-05-15_985_1867478457323905745/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-32-22_247_7387614374769260367/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -261,6 +261,9 @@
<void property="column">
<string>ds</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>srcpart</string>
</void>
@@ -275,6 +278,9 @@
<void property="column">
<string>hr</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>srcpart</string>
</void>
@@ -513,6 +519,9 @@
<void property="column">
<string>ds</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>srcpart</string>
</void>
@@ -580,6 +589,9 @@
<void property="column">
<string>hr</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>srcpart</string>
</void>
@@ -784,6 +796,9 @@
<void property="column">
<string>ds</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>srcpart</string>
</void>
@@ -851,6 +866,9 @@
<void property="column">
<string>hr</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>srcpart</string>
</void>
@@ -953,6 +971,30 @@
<void method="add">
<object idref="ColumnInfo3"/>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -966,6 +1008,9 @@
<void property="alias">
<string>srcpart</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -992,12 +1037,6 @@
<void method="add">
<int>1</int>
</void>
- <void method="add">
- <int>3</int>
- </void>
- <void method="add">
- <int>2</int>
- </void>
</object>
</void>
<void property="operatorId">
@@ -1017,7 +1056,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string>
<object class="java.util.ArrayList">
<void method="add">
<string>srcpart</string>
@@ -1029,7 +1068,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>hr=12</string>
@@ -1099,11 +1138,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/srcpart</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/srcpart</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088306</string>
+ <string>1280428332</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml Fri Jul 30 06:40:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_15" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -41,7 +41,7 @@
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10002</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -286,10 +286,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10002</string>
</void>
</object>
</void>
@@ -298,7 +298,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10002</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>-ext-10002</string>
@@ -352,11 +352,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/dest4_sequencefile</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/dest4_sequencefile</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088326</string>
+ <string>1280428353</string>
</void>
</object>
</void>
@@ -395,7 +395,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -447,7 +447,7 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/dest4_sequencefile</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/dest4_sequencefile</string>
</void>
<void method="put">
<string>file.outputformat</string>
@@ -455,7 +455,7 @@
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088326</string>
+ <string>1280428353</string>
</void>
</object>
</void>
@@ -592,13 +592,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10000</string>
</void>
<void property="table">
<object idref="TableDesc2"/>
</void>
<void property="tmpDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10001</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10001</string>
</void>
</object>
</void>
@@ -619,10 +619,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10002</string>
</void>
<void property="targetDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10000</string>
</void>
</object>
</void>
@@ -648,7 +648,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10002</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -734,11 +734,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088324</string>
+ <string>1280428351</string>
</void>
</object>
</void>
@@ -786,7 +786,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-26_630_7271300760805424669/-ext-10002</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-32-33_894_3291278668989466834/-ext-10002</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -951,6 +951,9 @@
<void property="alias">
<string>src</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1006,6 +1009,30 @@
</void>
</object>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -1017,7 +1044,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1029,7 +1056,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -1086,11 +1113,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088324</string>
+ <string>1280428351</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml Fri Jul 30 06:40:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_15" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -66,11 +66,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src_thrift</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src_thrift</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088336</string>
+ <string>1280428364</string>
</void>
</object>
</void>
@@ -115,7 +115,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/jssarma/hive_2010-07-25_13-05-37_227_2935276077759223319/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-32-45_063_2743394562997908149/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -515,6 +515,9 @@
<void property="alias">
<string>src_thrift</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -617,6 +620,30 @@
</void>
</object>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -628,7 +655,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src_thrift</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src_thrift</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src_thrift</string>
@@ -640,7 +667,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src_thrift</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src_thrift</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src_thrift</string>
@@ -701,11 +728,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src_thrift</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src_thrift</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088336</string>
+ <string>1280428364</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml Fri Jul 30 06:40:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_15" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -66,11 +66,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src_thrift</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src_thrift</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088346</string>
+ <string>1280428374</string>
</void>
</object>
</void>
@@ -123,7 +123,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/jssarma/hive_2010-07-25_13-05-47_700_5157146486927954964/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-32-55_229_6309081763005434975/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -832,6 +832,30 @@
<void method="add">
<object idref="ColumnInfo2"/>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -845,6 +869,9 @@
<void property="alias">
<string>src_thrift</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -893,7 +920,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src_thrift</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src_thrift</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src_thrift</string>
@@ -905,7 +932,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src_thrift</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src_thrift</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src_thrift</string>
@@ -966,11 +993,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src_thrift</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src_thrift</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088346</string>
+ <string>1280428374</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml Fri Jul 30 06:40:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_15" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -26,7 +26,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-58_464_6389807953466097671/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-33-05_758_213252720732930549/-ext-10000</string>
</void>
<void property="table">
<object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
@@ -79,11 +79,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088358</string>
+ <string>1280428385</string>
</void>
</object>
</void>
@@ -93,7 +93,7 @@
</object>
</void>
<void property="tmpDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-58_464_6389807953466097671/-ext-10001</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-33-05_758_213252720732930549/-ext-10001</string>
</void>
</object>
</void>
@@ -164,11 +164,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088355</string>
+ <string>1280428383</string>
</void>
</object>
</void>
@@ -251,11 +251,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088355</string>
+ <string>1280428383</string>
</void>
</object>
</void>
@@ -477,6 +477,9 @@
<void property="alias">
<string>src2</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -532,6 +535,30 @@
</void>
</object>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -722,6 +749,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -774,6 +804,26 @@
</void>
</object>
</void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -794,7 +844,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src2</string>
@@ -809,7 +859,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -866,11 +916,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1280088355</string>
+ <string>1280428383</string>
</void>
</object>
</void>
@@ -916,7 +966,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-05-58_464_6389807953466097671/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-33-05_758_213252720732930549/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -993,7 +1043,7 @@
<string>_col1</string>
<object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>_col3</string>
+ <string>_col5</string>
</void>
<void property="tabAlias">
<string>src2</string>
@@ -1104,7 +1154,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>_col3</string>
+ <string>_col5</string>
<object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>VALUE._col1</string>
@@ -1172,21 +1222,37 @@
<string>_col0</string>
</void>
<void method="add">
- <string>_col3</string>
+ <string>_col5</string>
</void>
</object>
</void>
<void property="reversedExprs">
<object class="java.util.HashMap">
<void method="put">
- <string>_col3</string>
+ <string>_col7</string>
<byte>1</byte>
</void>
<void method="put">
- <string>_col2</string>
+ <string>_col6</string>
<byte>1</byte>
</void>
<void method="put">
+ <string>_col5</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
+ <string>_col4</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
+ <string>_col3</string>
+ <byte>0</byte>
+ </void>
+ <void method="put">
+ <string>_col2</string>
+ <byte>0</byte>
+ </void>
+ <void method="put">
<string>_col1</string>
<byte>0</byte>
</void>
@@ -1274,7 +1340,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>_col3</string>
+ <string>_col5</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>