You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dh...@apache.org on 2008/11/11 02:50:18 UTC
svn commit: r712905 [30/38] - in /hadoop/core/trunk: ./ src/contrib/hive/
src/contrib/hive/cli/src/java/org/apache/hadoop/hive/cli/
src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/
src/contrib/hive/conf/ src/contrib/hive/data/files/ src/co...
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml?rev=712905&r1=712904&r2=712905&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml Mon Nov 10 17:50:06 2008
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/554218395/580685485.10000.insclause-0</string>
+ <string>/tmp/hive-njain/404713103/151871838.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -80,7 +80,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -108,15 +108,15 @@
<object class="java.util.HashMap">
<void method="put">
<string>s</string>
- <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator">
+ <object id="ForwardOperator0" class="org.apache.hadoop.hive.ql.exec.ForwardOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.FilterOperator">
+ <object id="FilterOperator0" class="org.apache.hadoop.hive.ql.exec.FilterOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.SelectOperator">
+ <object id="SelectOperator0" class="org.apache.hadoop.hive.ql.exec.SelectOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -124,13 +124,20 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/554218395/580685485.10000.insclause-0</string>
+ <string>/tmp/hive-njain/404713103/151871838.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="SelectOperator0"/>
+ </void>
+ </object>
+ </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -193,6 +200,16 @@
</void>
</object>
</void>
+ <void property="selectStar">
+ <boolean>true</boolean>
+ </void>
+ </object>
+ </void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="FilterOperator0"/>
+ </void>
</object>
</void>
<void property="schema">
@@ -363,6 +380,13 @@
</void>
</object>
</void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ForwardOperator0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -402,7 +426,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -414,7 +438,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -437,18 +461,22 @@
<string>srcbucket</string>
</void>
<void method="put">
- <string>serialization.ddl</string>
- <string>struct srcbucket { string key, string value}</string>
+ <string>bucket_field_name</string>
+ <string>key</string>
</void>
<void method="put">
- <string>serialization.format</string>
- <string>1</string>
+ <string>serialization.ddl</string>
+ <string>struct srcbucket { string key, string value}</string>
</void>
<void method="put">
<string>columns</string>
<string>key,value</string>
</void>
<void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -466,7 +494,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
@@ -479,6 +507,9 @@
</void>
</object>
</void>
+ <void property="tagToValueDesc">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
</object>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml?rev=712905&r1=712904&r2=712905&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml Mon Nov 10 17:50:06 2008
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-zshao/393286311/133813526.10000.insclause-0</string>
+ <string>/tmp/hive-njain/1242963668/223671734.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -80,7 +80,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -108,19 +108,19 @@
<object class="java.util.HashMap">
<void method="put">
<string>s</string>
- <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator">
+ <object id="ForwardOperator0" class="org.apache.hadoop.hive.ql.exec.ForwardOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.FilterOperator">
+ <object id="FilterOperator0" class="org.apache.hadoop.hive.ql.exec.FilterOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.FilterOperator">
+ <object id="FilterOperator1" class="org.apache.hadoop.hive.ql.exec.FilterOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.SelectOperator">
+ <object id="SelectOperator0" class="org.apache.hadoop.hive.ql.exec.SelectOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -128,13 +128,20 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-zshao/393286311/133813526.10000.insclause-0</string>
+ <string>/tmp/hive-njain/1242963668/223671734.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="SelectOperator0"/>
+ </void>
+ </object>
+ </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -197,6 +204,16 @@
</void>
</object>
</void>
+ <void property="selectStar">
+ <boolean>true</boolean>
+ </void>
+ </object>
+ </void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="FilterOperator1"/>
+ </void>
</object>
</void>
<void property="schema">
@@ -269,6 +286,13 @@
</void>
</object>
</void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="FilterOperator0"/>
+ </void>
+ </object>
+ </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -450,6 +474,13 @@
</void>
</object>
</void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ForwardOperator0"/>
+ </void>
+ </object>
+ </void>
</object>
</void>
</object>
@@ -468,7 +499,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="java.util.ArrayList">
<void method="add">
<string>s</string>
@@ -480,7 +511,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -503,18 +534,22 @@
<string>srcbucket</string>
</void>
<void method="put">
- <string>serialization.ddl</string>
- <string>struct srcbucket { string key, string value}</string>
+ <string>bucket_field_name</string>
+ <string>key</string>
</void>
<void method="put">
- <string>serialization.format</string>
- <string>1</string>
+ <string>serialization.ddl</string>
+ <string>struct srcbucket { string key, string value}</string>
</void>
<void method="put">
<string>columns</string>
<string>key,value</string>
</void>
<void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
<string>bucket_count</string>
<string>2</string>
</void>
@@ -532,7 +567,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
+ <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string>
</void>
</object>
</void>
@@ -545,6 +580,9 @@
</void>
</object>
</void>
+ <void property="tagToValueDesc">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
</object>
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml?rev=712905&r1=712904&r2=712905&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml Mon Nov 10 17:50:06 2008
@@ -28,7 +28,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/tmp/hive-njain/560916151/1453534343.10000.insclause-0</string>
+ <string>/tmp/hive-njain/361852244/1393208672.10000.insclause-0</string>
</void>
<void property="targetDir">
<string>../../../../build/contrib/hive/ql/test/data/warehouse/union.out</string>
@@ -55,19 +55,19 @@
<object class="java.util.HashMap">
<void method="put">
<string>unioninput:src</string>
- <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator">
+ <object id="ForwardOperator0" class="org.apache.hadoop.hive.ql.exec.ForwardOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.FilterOperator">
+ <object id="FilterOperator0" class="org.apache.hadoop.hive.ql.exec.FilterOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.SelectOperator">
+ <object id="SelectOperator0" class="org.apache.hadoop.hive.ql.exec.SelectOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.SelectOperator">
+ <object id="SelectOperator1" class="org.apache.hadoop.hive.ql.exec.SelectOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -75,7 +75,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/tmp/hive-njain/560916151/1453534343.10000.insclause-0</string>
+ <string>/tmp/hive-njain/361852244/1393208672.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -91,6 +91,10 @@
<void property="properties">
<object class="java.util.Properties">
<void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
<string>serialization.format</string>
<string>1</string>
</void>
@@ -100,6 +104,13 @@
</void>
</object>
</void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="SelectOperator1"/>
+ </void>
+ </object>
+ </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -162,6 +173,16 @@
</void>
</object>
</void>
+ <void property="selectStar">
+ <boolean>true</boolean>
+ </void>
+ </object>
+ </void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="SelectOperator0"/>
+ </void>
</object>
</void>
<void property="schema">
@@ -201,6 +222,16 @@
</void>
</object>
</void>
+ <void property="selectStar">
+ <boolean>true</boolean>
+ </void>
+ </object>
+ </void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="FilterOperator0"/>
+ </void>
</object>
</void>
<void property="schema">
@@ -294,6 +325,13 @@
</void>
</object>
</void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ForwardOperator0"/>
+ </void>
+ </object>
+ </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -417,6 +455,9 @@
</void>
</object>
</void>
+ <void property="tagToValueDesc">
+ <object class="java.util.ArrayList"/>
+ </void>
</object>
</void>
</object>