You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2009/06/15 07:43:29 UTC
svn commit: r784656 [26/30] - in /hadoop/hive/trunk: ./
common/src/java/org/apache/hadoop/hive/conf/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/optimizer/
ql/src/java/org/apache/hadoop/hive/ql/parse/ ql/src/java/o...
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml?rev=784656&r1=784655&r2=784656&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml Mon Jun 15 05:43:22 2009
@@ -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_03-p3" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive3/hive3/ql/../build/ql/tmp/117389447/112985063.10000.insclause-0</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1324415703/10000</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -84,7 +84,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -94,7 +94,7 @@
</object>
</void>
<void property="tmpDir">
- <string>/data/users/njain/hive3/hive3/ql/../build/ql/tmp/117389447/112985063.10001</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1324415703/10001</string>
</void>
</object>
</void>
@@ -173,7 +173,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
@@ -204,7 +204,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive3/hive3/ql/../build/ql/tmp/117389447/112985063.10000.insclause-0</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1324415703/10000</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -225,7 +225,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>0</string>
+ <string>_col0</string>
</void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -239,7 +239,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>1</string>
+ <string>_col1</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -257,7 +257,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>1</string>
+ <string>_col1</string>
<object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>value</string>
@@ -268,7 +268,7 @@
</object>
</void>
<void method="put">
- <string>0</string>
+ <string>_col0</string>
<object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>key</string>
@@ -292,6 +292,16 @@
</void>
</object>
</void>
+ <void property="outputColumnNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>_col0</string>
+ </void>
+ <void method="add">
+ <string>_col1</string>
+ </void>
+ </object>
+ </void>
<void property="selectStar">
<boolean>true</boolean>
</void>
@@ -350,7 +360,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -362,7 +372,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml?rev=784656&r1=784655&r2=784656&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml Mon Jun 15 05:43:22 2009
@@ -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_03-p3" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/363663800/10000</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/420759637/10000</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -84,7 +84,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -94,7 +94,7 @@
</object>
</void>
<void property="tmpDir">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/363663800/10001</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/420759637/10001</string>
</void>
</object>
</void>
@@ -173,7 +173,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
@@ -208,7 +208,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/363663800/10000</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/420759637/10000</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -229,7 +229,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>0</string>
+ <string>_col0</string>
</void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -243,7 +243,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>1</string>
+ <string>_col1</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -261,7 +261,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>1</string>
+ <string>_col1</string>
<object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>value</string>
@@ -272,7 +272,7 @@
</object>
</void>
<void method="put">
- <string>0</string>
+ <string>_col0</string>
<object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>key</string>
@@ -296,6 +296,16 @@
</void>
</object>
</void>
+ <void property="outputColumnNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>_col0</string>
+ </void>
+ <void method="add">
+ <string>_col1</string>
+ </void>
+ </object>
+ </void>
<void property="selectStar">
<boolean>true</boolean>
</void>
@@ -522,7 +532,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -534,7 +544,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml?rev=784656&r1=784655&r2=784656&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml Mon Jun 15 05:43:22 2009
@@ -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_03-p3" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive3/hive3/ql/../build/ql/tmp/145612569/100290263.10000.insclause-0</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1611537125/10000</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -84,7 +84,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -94,7 +94,7 @@
</object>
</void>
<void property="tmpDir">
- <string>/data/users/njain/hive3/hive3/ql/../build/ql/tmp/145612569/100290263.10001</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1611537125/10001</string>
</void>
</object>
</void>
@@ -173,7 +173,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
@@ -204,7 +204,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive3/hive3/ql/../build/ql/tmp/145612569/100290263.10000.insclause-0</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1611537125/10000</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -225,7 +225,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>0</string>
+ <string>_col0</string>
</void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -239,7 +239,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>1</string>
+ <string>_col1</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -257,7 +257,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>1</string>
+ <string>_col1</string>
<object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>value</string>
@@ -268,7 +268,7 @@
</object>
</void>
<void method="put">
- <string>0</string>
+ <string>_col0</string>
<object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>key</string>
@@ -292,6 +292,16 @@
</void>
</object>
</void>
+ <void property="outputColumnNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>_col0</string>
+ </void>
+ <void method="add">
+ <string>_col1</string>
+ </void>
+ </object>
+ </void>
<void property="selectStar">
<boolean>true</boolean>
</void>
@@ -350,7 +360,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -362,7 +372,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml?rev=784656&r1=784655&r2=784656&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml Mon Jun 15 05:43:22 2009
@@ -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_03-p3" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/372494516/10000</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/661836886/10000</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -84,7 +84,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -94,7 +94,7 @@
</object>
</void>
<void property="tmpDir">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/372494516/10001</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/661836886/10001</string>
</void>
</object>
</void>
@@ -173,7 +173,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
@@ -208,7 +208,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/372494516/10000</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/661836886/10000</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -229,7 +229,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>0</string>
+ <string>_col0</string>
</void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -243,7 +243,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>1</string>
+ <string>_col1</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -261,7 +261,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>1</string>
+ <string>_col1</string>
<object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>value</string>
@@ -272,7 +272,7 @@
</object>
</void>
<void method="put">
- <string>0</string>
+ <string>_col0</string>
<object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>key</string>
@@ -296,6 +296,16 @@
</void>
</object>
</void>
+ <void property="outputColumnNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>_col0</string>
+ </void>
+ <void method="add">
+ <string>_col1</string>
+ </void>
+ </object>
+ </void>
<void property="selectStar">
<boolean>true</boolean>
</void>
@@ -512,7 +522,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -524,7 +534,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml?rev=784656&r1=784655&r2=784656&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml Mon Jun 15 05:43:22 2009
@@ -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_03-p3" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/1896390522/10000</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1075692222/10000</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -84,7 +84,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -94,7 +94,7 @@
</object>
</void>
<void property="tmpDir">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/1896390522/10001</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1075692222/10001</string>
</void>
</object>
</void>
@@ -173,7 +173,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
@@ -208,7 +208,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/1896390522/10000</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1075692222/10000</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -229,7 +229,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>0</string>
+ <string>_col0</string>
</void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -243,7 +243,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>1</string>
+ <string>_col1</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -261,7 +261,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>1</string>
+ <string>_col1</string>
<object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>value</string>
@@ -272,7 +272,7 @@
</object>
</void>
<void method="put">
- <string>0</string>
+ <string>_col0</string>
<object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>key</string>
@@ -296,6 +296,16 @@
</void>
</object>
</void>
+ <void property="outputColumnNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>_col0</string>
+ </void>
+ <void method="add">
+ <string>_col1</string>
+ </void>
+ </object>
+ </void>
<void property="selectStar">
<boolean>true</boolean>
</void>
@@ -512,7 +522,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -524,7 +534,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml?rev=784656&r1=784655&r2=784656&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml Mon Jun 15 05:43:22 2009
@@ -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_03-p3" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/49875747/10000</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/2043373641/10000</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -84,7 +84,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -94,7 +94,7 @@
</object>
</void>
<void property="tmpDir">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/49875747/10001</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/2043373641/10001</string>
</void>
</object>
</void>
@@ -173,7 +173,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
@@ -212,7 +212,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/njain/hive2/hive2/build/ql/tmp/49875747/10000</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/2043373641/10000</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
@@ -233,7 +233,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>0</string>
+ <string>_col0</string>
</void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -247,7 +247,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>1</string>
+ <string>_col1</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -265,7 +265,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>1</string>
+ <string>_col1</string>
<object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>value</string>
@@ -276,7 +276,7 @@
</object>
</void>
<void method="put">
- <string>0</string>
+ <string>_col0</string>
<object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>key</string>
@@ -300,6 +300,16 @@
</void>
</object>
</void>
+ <void property="outputColumnNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>_col0</string>
+ </void>
+ <void method="add">
+ <string>_col1</string>
+ </void>
+ </object>
+ </void>
<void property="selectStar">
<boolean>true</boolean>
</void>
@@ -637,7 +647,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -649,7 +659,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive2/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml?rev=784656&r1=784655&r2=784656&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml Mon Jun 15 05:43:22 2009
@@ -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_03-p3" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -28,7 +28,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive3/hive3/ql/../build/ql/tmp/1002677573/903748310.10000.insclause-0</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/14428452/10000</string>
</void>
<void property="targetDir">
<string>../build/ql/test/data/warehouse/union.out</string>
@@ -109,7 +109,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -148,7 +148,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive3/hive3/ql/../build/ql/tmp/1002677573/903748310.10000.insclause-0</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/14428452/10000</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -191,7 +191,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>0</string>
+ <string>_col0</string>
</void>
<void property="type">
<object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
@@ -205,7 +205,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>1</string>
+ <string>_col1</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -223,10 +223,10 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>1</string>
+ <string>_col1</string>
<object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
- <string>1</string>
+ <string>_col1</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -234,10 +234,10 @@
</object>
</void>
<void method="put">
- <string>0</string>
+ <string>_col0</string>
<object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
- <string>0</string>
+ <string>_col0</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
@@ -258,6 +258,16 @@
</void>
</object>
</void>
+ <void property="outputColumnNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>_col0</string>
+ </void>
+ <void method="add">
+ <string>_col1</string>
+ </void>
+ </object>
+ </void>
<void property="selectStar">
<boolean>true</boolean>
</void>
@@ -284,7 +294,7 @@
<void property="columnExprMap">
<object class="java.util.HashMap">
<void method="put">
- <string>1</string>
+ <string>_col1</string>
<object id="exprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>value</string>
@@ -295,7 +305,7 @@
</object>
</void>
<void method="put">
- <string>0</string>
+ <string>_col0</string>
<object id="exprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
<void property="column">
<string>key</string>
@@ -319,6 +329,16 @@
</void>
</object>
</void>
+ <void property="outputColumnNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>_col0</string>
+ </void>
+ <void method="add">
+ <string>_col1</string>
+ </void>
+ </object>
+ </void>
<void property="selectStar">
<boolean>true</boolean>
</void>
@@ -338,7 +358,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>0</string>
+ <string>_col0</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -348,7 +368,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
- <string>1</string>
+ <string>_col1</string>
</void>
<void property="type">
<object idref="PrimitiveTypeInfo0"/>
@@ -527,7 +547,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>unioninput:src</string>
@@ -539,7 +559,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
+ <string>file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>