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 [32/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/join2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/join2.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">
@@ -30,7 +30,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-06-09_037_1027509941398845443/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-33-16_408_7811625023359789610/-ext-10000</string>
</void>
<void property="table">
<object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
@@ -83,11 +83,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>1280088368</string>
+ <string>1280428396</string>
</void>
</object>
</void>
@@ -97,7 +97,7 @@
</object>
</void>
<void property="tmpDir">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-06-09_037_1027509941398845443/-ext-10001</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-33-16_408_7811625023359789610/-ext-10001</string>
</void>
</object>
</void>
@@ -175,11 +175,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>1280088366</string>
+ <string>1280428393</string>
</void>
</object>
</void>
@@ -220,7 +220,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>VALUE._col2</string>
+ <string>VALUE._col4</string>
<object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
@@ -263,7 +263,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>_col2</string>
+ <string>_col4</string>
</void>
<void property="tabAlias">
<string>src2</string>
@@ -341,7 +341,7 @@
<void property="outputValueColumnNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>_col2</string>
+ <string>_col4</string>
</void>
</object>
</void>
@@ -370,7 +370,7 @@
<object class="java.util.Properties">
<void method="put">
<string>columns</string>
- <string>_col2</string>
+ <string>_col4</string>
</void>
<void method="put">
<string>columns.types</string>
@@ -419,7 +419,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>VALUE._col2</string>
+ <string>VALUE._col4</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -470,7 +470,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>_col2</string>
+ <string>_col4</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -691,6 +691,9 @@
<void property="alias">
<string>src3</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -746,6 +749,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="PrimitiveTypeInfo2" 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>
@@ -766,7 +793,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/tmp/jssarma/hive_2010-07-25_13-06-09_037_1027509941398845443/-mr-10002</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-33-16_408_7811625023359789610/-mr-10002</string>
<object class="java.util.ArrayList">
<void method="add">
<string>$INTNAME</string>
@@ -774,7 +801,7 @@
</object>
</void>
<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>src3</string>
@@ -786,7 +813,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/tmp/jssarma/hive_2010-07-25_13-06-09_037_1027509941398845443/-mr-10002</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-33-16_408_7811625023359789610/-mr-10002</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>-mr-10002</string>
@@ -804,7 +831,7 @@
<object id="Properties1" class="java.util.Properties">
<void method="put">
<string>columns</string>
- <string>_col0,_col2</string>
+ <string>_col0,_col4</string>
</void>
<void method="put">
<string>columns.types</string>
@@ -835,7 +862,7 @@
</object>
</void>
<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>
@@ -892,11 +919,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>1280088366</string>
+ <string>1280428393</string>
</void>
</object>
</void>
@@ -942,7 +969,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-06-09_037_1027509941398845443/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-33-16_408_7811625023359789610/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -1019,7 +1046,7 @@
<string>_col1</string>
<object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>_col5</string>
+ <string>_col9</string>
</void>
<void property="tabAlias">
<string>src3</string>
@@ -1033,7 +1060,7 @@
<string>_col0</string>
<object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>_col2</string>
+ <string>_col4</string>
</void>
<void property="tabAlias">
<string>src1</string>
@@ -1130,13 +1157,13 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>_col5</string>
+ <string>_col4</string>
<object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>VALUE._col1</string>
+ <string>VALUE._col4</string>
</void>
<void property="tabAlias">
- <string>src3</string>
+ <string>src1</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -1144,13 +1171,13 @@
</object>
</void>
<void method="put">
- <string>_col2</string>
+ <string>_col9</string>
<object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>VALUE._col2</string>
+ <string>VALUE._col1</string>
</void>
<void property="tabAlias">
- <string>src1</string>
+ <string>src3</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -1178,7 +1205,7 @@
<byte>0</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc5"/>
+ <object idref="ExprNodeColumnDesc4"/>
</void>
</object>
</void>
@@ -1186,7 +1213,7 @@
<byte>1</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc4"/>
+ <object idref="ExprNodeColumnDesc5"/>
</void>
</object>
</void>
@@ -1195,24 +1222,44 @@
<void property="outputColumnNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>_col2</string>
+ <string>_col4</string>
</void>
<void method="add">
- <string>_col5</string>
+ <string>_col9</string>
</void>
</object>
</void>
<void property="reversedExprs">
<object class="java.util.HashMap">
<void method="put">
- <string>_col5</string>
+ <string>_col8</string>
<byte>1</byte>
</void>
<void method="put">
- <string>_col4</string>
+ <string>_col7</string>
+ <byte>0</byte>
+ </void>
+ <void method="put">
+ <string>_col11</string>
<byte>1</byte>
</void>
<void method="put">
+ <string>_col6</string>
+ <byte>0</byte>
+ </void>
+ <void method="put">
+ <string>_col10</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
+ <string>_col5</string>
+ <byte>0</byte>
+ </void>
+ <void method="put">
+ <string>_col4</string>
+ <byte>0</byte>
+ </void>
+ <void method="put">
<string>_col3</string>
<byte>0</byte>
</void>
@@ -1228,6 +1275,10 @@
<string>_col0</string>
<byte>0</byte>
</void>
+ <void method="put">
+ <string>_col9</string>
+ <byte>1</byte>
+ </void>
</object>
</void>
<void property="tagOrder">
@@ -1301,7 +1352,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>_col2</string>
+ <string>_col4</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -1311,7 +1362,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>_col5</string>
+ <string>_col9</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -1401,11 +1452,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>1280088366</string>
+ <string>1280428393</string>
</void>
</object>
</void>
@@ -1488,11 +1539,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>1280088366</string>
+ <string>1280428393</string>
</void>
</object>
</void>
@@ -1710,6 +1761,9 @@
<void property="alias">
<string>src2</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1762,6 +1816,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="PrimitiveTypeInfo2"/>
+ </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>
@@ -1952,6 +2026,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -2004,6 +2081,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="PrimitiveTypeInfo2"/>
+ </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>
@@ -2024,7 +2121,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>
@@ -2039,7 +2136,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>
@@ -2096,11 +2193,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>1280088366</string>
+ <string>1280428393</string>
</void>
</object>
</void>
@@ -2139,7 +2236,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-06-09_037_1027509941398845443/-mr-10002</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-33-16_408_7811625023359789610/-mr-10002</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -2188,7 +2285,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>_col2</string>
+ <string>_col4</string>
<object id="ExprNodeColumnDesc8" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>VALUE._col0</string>
@@ -2256,21 +2353,37 @@
<string>_col0</string>
</void>
<void method="add">
- <string>_col2</string>
+ <string>_col4</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>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/join3.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-06-19_693_6322269693461336741/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-33-26_795_8741871014422720580/-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>1280088379</string>
+ <string>1280428406</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-06-19_693_6322269693461336741/-ext-10001</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-33-26_795_8741871014422720580/-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>1280088377</string>
+ <string>1280428404</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>1280088377</string>
+ <string>1280428404</string>
</void>
</object>
</void>
@@ -338,11 +338,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>1280088377</string>
+ <string>1280428404</string>
</void>
</object>
</void>
@@ -530,6 +530,9 @@
<void property="alias">
<string>src2</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -582,6 +585,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>
@@ -775,6 +802,9 @@
<void property="alias">
<string>src3</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -830,6 +860,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>
@@ -1020,6 +1070,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1072,6 +1125,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>
@@ -1092,7 +1165,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>
@@ -1110,7 +1183,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>
@@ -1167,11 +1240,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>1280088377</string>
+ <string>1280428404</string>
</void>
</object>
</void>
@@ -1217,7 +1290,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>pfile:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-06-19_693_6322269693461336741/-ext-10000</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-33-26_795_8741871014422720580/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -1294,7 +1367,7 @@
<string>_col1</string>
<object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>_col5</string>
+ <string>_col9</string>
</void>
<void property="tabAlias">
<string>src3</string>
@@ -1405,13 +1478,13 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>_col5</string>
+ <string>_col0</string>
<object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>VALUE._col1</string>
+ <string>VALUE._col0</string>
</void>
<void property="tabAlias">
- <string>src3</string>
+ <string>src1</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -1419,13 +1492,13 @@
</object>
</void>
<void method="put">
- <string>_col0</string>
+ <string>_col9</string>
<object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
- <string>VALUE._col0</string>
+ <string>VALUE._col1</string>
</void>
<void property="tabAlias">
- <string>src1</string>
+ <string>src3</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -1460,7 +1533,7 @@
<byte>0</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc5"/>
+ <object idref="ExprNodeColumnDesc4"/>
</void>
</object>
</void>
@@ -1472,7 +1545,7 @@
<byte>2</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc4"/>
+ <object idref="ExprNodeColumnDesc5"/>
</void>
</object>
</void>
@@ -1484,29 +1557,49 @@
<string>_col0</string>
</void>
<void method="add">
- <string>_col5</string>
+ <string>_col9</string>
</void>
</object>
</void>
<void property="reversedExprs">
<object class="java.util.HashMap">
<void method="put">
- <string>_col5</string>
+ <string>_col8</string>
<byte>2</byte>
</void>
<void method="put">
- <string>_col4</string>
+ <string>_col7</string>
+ <byte>1</byte>
+ </void>
+ <void method="put">
+ <string>_col11</string>
<byte>2</byte>
</void>
<void method="put">
- <string>_col3</string>
+ <string>_col6</string>
<byte>1</byte>
</void>
<void method="put">
- <string>_col2</string>
+ <string>_col10</string>
+ <byte>2</byte>
+ </void>
+ <void method="put">
+ <string>_col5</string>
<byte>1</byte>
</void>
<void method="put">
+ <string>_col4</string>
+ <byte>1</byte>
+ </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>
@@ -1514,6 +1607,10 @@
<string>_col0</string>
<byte>0</byte>
</void>
+ <void method="put">
+ <string>_col9</string>
+ <byte>2</byte>
+ </void>
</object>
</void>
<void property="tagOrder">
@@ -1608,7 +1705,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>_col5</string>
+ <string>_col9</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/join4.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/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>1280088387</string>
+ <string>1280428421</string>
</void>
</object>
</void>
@@ -149,11 +149,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>1280088387</string>
+ <string>1280428421</string>
</void>
</object>
</void>
@@ -860,6 +860,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 id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -873,6 +897,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1580,6 +1607,26 @@
<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 idref="PrimitiveTypeInfo3"/>
+ </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>
@@ -1593,6 +1640,9 @@
<void property="alias">
<string>src2</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1647,7 +1697,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>c:a:src1</string>
@@ -1662,7 +1712,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>
@@ -1719,11 +1769,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>1280088387</string>
+ <string>1280428421</string>
</void>
</object>
</void>
@@ -1770,7 +1820,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-06-30_246_8518249950111098172/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-33-44_273_7704263600537075966/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/join5.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/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>1280088398</string>
+ <string>1280428432</string>
</void>
</object>
</void>
@@ -149,11 +149,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>1280088398</string>
+ <string>1280428432</string>
</void>
</object>
</void>
@@ -860,6 +860,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 id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -873,6 +897,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1580,6 +1607,26 @@
<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 idref="PrimitiveTypeInfo3"/>
+ </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>
@@ -1593,6 +1640,9 @@
<void property="alias">
<string>src2</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1647,7 +1697,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>c:a:src1</string>
@@ -1662,7 +1712,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>
@@ -1719,11 +1769,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>1280088398</string>
+ <string>1280428432</string>
</void>
</object>
</void>
@@ -1770,7 +1820,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-06-40_779_333971552423904122/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-33-55_679_4766407629267536508/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/join6.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/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>1280088409</string>
+ <string>1280428444</string>
</void>
</object>
</void>
@@ -149,11 +149,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>1280088409</string>
+ <string>1280428444</string>
</void>
</object>
</void>
@@ -860,6 +860,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 id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -873,6 +897,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1580,6 +1607,26 @@
<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 idref="PrimitiveTypeInfo3"/>
+ </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>
@@ -1593,6 +1640,9 @@
<void property="alias">
<string>src2</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1647,7 +1697,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>c:a:src1</string>
@@ -1662,7 +1712,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>
@@ -1719,11 +1769,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>1280088409</string>
+ <string>1280428444</string>
</void>
</object>
</void>
@@ -1770,7 +1820,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-06-51_595_3424012524895465104/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-34-06_582_4634593079540338600/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/join7.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/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>1280088419</string>
+ <string>1280428454</string>
</void>
</object>
</void>
@@ -149,11 +149,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>1280088419</string>
+ <string>1280428454</string>
</void>
</object>
</void>
@@ -236,11 +236,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>1280088419</string>
+ <string>1280428454</string>
</void>
</object>
</void>
@@ -947,6 +947,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 id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -960,6 +984,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1667,6 +1694,26 @@
<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 idref="PrimitiveTypeInfo3"/>
+ </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>
@@ -1680,6 +1727,9 @@
<void property="alias">
<string>src2</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -2387,6 +2437,26 @@
<void method="add">
<object idref="ColumnInfo5"/>
</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="PrimitiveTypeInfo3"/>
+ </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>
@@ -2400,6 +2470,9 @@
<void property="alias">
<string>src3</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -2454,7 +2527,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>c:a:src1</string>
@@ -2472,7 +2545,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>
@@ -2529,11 +2602,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>1280088419</string>
+ <string>1280428454</string>
</void>
</object>
</void>
@@ -2580,7 +2653,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-07-02_396_9053923551912186403/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-34-17_232_5474968231933889523/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/join8.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/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>1280088430</string>
+ <string>1280428466</string>
</void>
</object>
</void>
@@ -149,11 +149,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>1280088430</string>
+ <string>1280428466</string>
</void>
</object>
</void>
@@ -860,6 +860,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 id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -873,6 +897,9 @@
<void property="alias">
<string>src1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1580,6 +1607,26 @@
<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 idref="PrimitiveTypeInfo3"/>
+ </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>
@@ -1593,6 +1640,9 @@
<void property="alias">
<string>src2</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1647,7 +1697,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>c:a:src1</string>
@@ -1662,7 +1712,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>
@@ -1719,11 +1769,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>1280088430</string>
+ <string>1280428466</string>
</void>
</object>
</void>
@@ -1774,7 +1824,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-07-13_366_6194872683241788765/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-34-28_793_5549220000529260542/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample1.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>1280088434</string>
+ <string>1280428470</string>
</void>
</object>
</void>
@@ -136,7 +136,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-07-24_317_2168471623218361185/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-34-41_580_2222138714722247932/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -265,6 +265,9 @@
<void property="column">
<string>hr</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>s</string>
</void>
@@ -279,6 +282,9 @@
<void property="column">
<string>ds</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>s</string>
</void>
@@ -461,6 +467,9 @@
<void property="column">
<string>ds</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>s</string>
</void>
@@ -512,6 +521,9 @@
<void property="column">
<string>hr</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>s</string>
</void>
@@ -665,6 +677,9 @@
<void property="column">
<string>ds</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>s</string>
</void>
@@ -712,6 +727,9 @@
<void property="column">
<string>hr</string>
</void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
<void property="tabAlias">
<string>s</string>
</void>
@@ -814,6 +832,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>
@@ -1028,6 +1070,9 @@
<void property="alias">
<string>s</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1054,12 +1099,6 @@
<void method="add">
<int>1</int>
</void>
- <void method="add">
- <int>2</int>
- </void>
- <void method="add">
- <int>3</int>
- </void>
</object>
</void>
<void property="operatorId">
@@ -1079,7 +1118,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=11</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -1091,7 +1130,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=11</string>
+ <string>pfile:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>hr=11</string>
@@ -1161,11 +1200,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>1280088434</string>
+ <string>1280428470</string>
</void>
</object>
</void>