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 [34/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/udf1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.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>1280088532</string>
+ <string>1280428563</string>
</void>
</object>
</void>
@@ -119,7 +119,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-08-55_192_2194975541337978080/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-36-05_931_7419020417472725956/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -1741,6 +1741,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>
@@ -1754,6 +1778,9 @@
<void property="alias">
<string>src</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1796,7 +1823,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>
@@ -1808,7 +1835,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>
@@ -1865,11 +1892,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>1280088532</string>
+ <string>1280428563</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.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/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>1280088553</string>
+ <string>1280428575</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-09-13_877_6910137373121445004/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-36-16_270_5974993682577917215/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -1549,6 +1549,9 @@
<void property="alias">
<string>dest1</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1601,6 +1604,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="PrimitiveTypeInfo0"/>
+ </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>
@@ -1612,7 +1635,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <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>
<object class="java.util.ArrayList">
<void method="add">
<string>dest1</string>
@@ -1624,7 +1647,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <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>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>dest1</string>
@@ -1681,11 +1704,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>1280088553</string>
+ <string>1280428575</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.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>1280088562</string>
+ <string>1280428583</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-09-24_874_4624432500031555414/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-36-26_046_9042300921461782115/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -404,6 +404,9 @@
<void property="alias">
<string>src</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -452,6 +455,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>
@@ -463,7 +490,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>
@@ -475,7 +502,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>
@@ -532,11 +559,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>1280088562</string>
+ <string>1280428583</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_case.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>1280088573</string>
+ <string>1280428593</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-09-35_681_1344016804653403382/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-36-35_720_8123425694890521692/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -497,6 +497,9 @@
<void property="alias">
<string>src</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -549,6 +552,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>
@@ -560,7 +587,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>
@@ -572,7 +599,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>
@@ -629,11 +656,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>1280088573</string>
+ <string>1280428593</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_when.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>1280088583</string>
+ <string>1280428603</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-09-46_492_8271745675595132779/-ext-10001</string>
+ <string>file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-07-29_11-36-46_279_4238044052234466202/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -617,6 +617,9 @@
<void property="alias">
<string>src</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -669,6 +672,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="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -680,7 +707,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>
@@ -692,7 +719,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>
@@ -749,11 +776,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>1280088583</string>
+ <string>1280428603</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.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>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10001</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10001</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>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10001</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10001</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10001</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10001</string>
</void>
</object>
</void>
@@ -298,7 +298,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10001</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10001</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>-ext-10001</string>
@@ -357,7 +357,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10000</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10000</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -522,7 +522,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10000</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10000</string>
</void>
<void property="targetDir">
<string>../build/ql/test/data/warehouse/union.out</string>
@@ -546,10 +546,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10001</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10001</string>
</void>
<void property="targetDir">
- <string>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10000</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10000</string>
</void>
</object>
</void>
@@ -575,7 +575,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10001</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10001</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -661,11 +661,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>1280088594</string>
+ <string>1280428614</string>
</void>
</object>
</void>
@@ -748,11 +748,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>1280088594</string>
+ <string>1280428614</string>
</void>
</object>
</void>
@@ -816,7 +816,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/jssarma/hive_trunk/build/ql/scratchdir/hive_2010-07-25_13-09-57_296_5421351551755182607/-ext-10001</string>
+ <string>file:/Users/heyongqiang/Documents/workspace/Hive-2/build/ql/scratchdir/hive_2010-07-29_11-36-56_283_393428452587662105/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
@@ -1285,6 +1285,9 @@
<void property="alias">
<string>src</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1340,6 +1343,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="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>
@@ -1737,6 +1764,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>
@@ -1750,6 +1797,9 @@
<void property="alias">
<string>src</string>
</void>
+ <void property="virtualCols">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
<void property="counterNames">
@@ -1799,7 +1849,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>null-subquery1:unioninput-subquery1:src</string>
@@ -1814,7 +1864,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>
@@ -1871,11 +1921,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>1280088594</string>
+ <string>1280428614</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java?rev=980659&r1=980658&r2=980659&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java Fri Jul 30 06:40:04 2010
@@ -18,6 +18,9 @@
package org.apache.hadoop.hive.serde2.objectinspector.primitive;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -36,6 +39,7 @@ import org.apache.hadoop.io.LongWritable
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableUtils;
/**
* ObjectInspectorFactory is the primary way to create new ObjectInspector
@@ -49,7 +53,7 @@ public final class PrimitiveObjectInspec
/**
* TypeEntry stores information about a Hive Primitive TypeInfo.
*/
- public static class PrimitiveTypeEntry {
+ public static class PrimitiveTypeEntry implements Writable{
/**
* The category of the PrimitiveType.
@@ -85,6 +89,29 @@ public final class PrimitiveObjectInspec
primitiveWritableClass = hiveClass;
this.typeName = typeName;
}
+
+ @Override
+ public void readFields(DataInput in) throws IOException {
+ primitiveCategory = WritableUtils.readEnum(in,
+ PrimitiveObjectInspector.PrimitiveCategory.class);
+ typeName = WritableUtils.readString(in);
+ try {
+ primitiveJavaType = Class.forName(WritableUtils.readString(in));
+ primitiveJavaClass = Class.forName(WritableUtils.readString(in));
+ primitiveWritableClass = Class.forName(WritableUtils.readString(in));
+ } catch (ClassNotFoundException e) {
+ throw new IOException(e);
+ }
+ }
+
+ @Override
+ public void write(DataOutput out) throws IOException {
+ WritableUtils.writeEnum(out, primitiveCategory);
+ WritableUtils.writeString(out, typeName);
+ WritableUtils.writeString(out, primitiveJavaType.getName());
+ WritableUtils.writeString(out, primitiveJavaClass.getName());
+ WritableUtils.writeString(out, primitiveWritableClass.getName());
+ }
}
static final Map<PrimitiveCategory, PrimitiveTypeEntry> primitiveCategoryToTypeEntry = new HashMap<PrimitiveCategory, PrimitiveTypeEntry>();