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/04/24 03:20:19 UTC
svn commit: r768112 [1/3] - in /hadoop/hive/trunk: ./
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/ppd/ ql/src/test/results/compiler/plan/
Author: namit
Date: Fri Apr 24 01:20:17 2009
New Revision: 768112
URL: http://svn.apache.org/viewvc?rev=768112&view=rev
Log:
HIVE-366. testParse should not depend on a static field
(Zheng Shao via namit)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Fri Apr 24 01:20:17 2009
@@ -87,6 +87,9 @@
HIVE-437. Allow both table.name and col.field
(Zheng Shao via namit)
+ HIVE-366. testParse should not depend on a static field
+ (Zheng Shao via namit)
+
Release 0.3.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java Fri Apr 24 01:20:17 2009
@@ -162,7 +162,13 @@
this.id = id;
}
- public String getid() { return id; }
+ /**
+ * This function is not named getId(), to make sure java serialization
+ * does NOT serialize it. Some TestParse tests will fail if we serialize
+ * this field, since the Operator ID will change based on the number of
+ * query tests.
+ */
+ public String getIdentifier() { return id; }
public void setOutputCollector(OutputCollector out) {
this.out = out;
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java Fri Apr 24 01:20:17 2009
@@ -74,7 +74,7 @@
@Override
public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
Object... nodeOutputs) throws SemanticException {
- LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getid() + ")");
+ LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getIdentifier() + ")");
// script operator is a black-box to hive so no optimization here
// assuming that nothing can be pushed above the script op
return null;
@@ -90,7 +90,7 @@
@Override
public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
Object... nodeOutputs) throws SemanticException {
- LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getid() + ")");
+ LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getIdentifier() + ")");
OpWalkerInfo owi = (OpWalkerInfo)procCtx;
RowResolver inputRR = owi.getRowResolver(nd);
TableScanOperator tsOp = (TableScanOperator)nd;
@@ -160,7 +160,7 @@
@Override
public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
Object... nodeOutputs) throws SemanticException {
- LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getid() + ")");
+ LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getIdentifier() + ")");
OpWalkerInfo owi = (OpWalkerInfo)procCtx;
Operator<? extends Serializable> op = (Operator<? extends Serializable>) nd;
exprNodeFuncDesc predicate = (exprNodeFuncDesc) (((FilterOperator)nd).getConf()).getPredicate();
@@ -183,7 +183,7 @@
@Override
public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
Object... nodeOutputs) throws SemanticException {
- LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getid() + ")");
+ LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getIdentifier() + ")");
OpWalkerInfo owi = (OpWalkerInfo)procCtx;
Set<String> aliases = getQualifiedAliases((JoinOperator) nd, owi.getRowResolver(nd));
mergeWithChildrenPred(nd, owi, null, aliases, false);
@@ -251,7 +251,7 @@
@Override
public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
Object... nodeOutputs) throws SemanticException {
- LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getid() + ")");
+ LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getIdentifier() + ")");
OpWalkerInfo owi = (OpWalkerInfo)procCtx;
Set<String> aliases = owi.getRowResolver(nd).getTableNames();
boolean ignoreAliases = false;
@@ -275,7 +275,7 @@
@Override
public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
Object... nodeOutputs) throws SemanticException {
- LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getid() + ")");
+ LOG.info("Processing for " + nd.getName() + "(" + ((Operator)nd).getIdentifier() + ")");
mergeWithChildrenPred(nd, (OpWalkerInfo)procCtx, null, null, false);
return null;
}
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml Fri Apr 24 01:20:17 2009
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/740093100.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/673816800.10000.insclause-0</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/hive/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -135,16 +135,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/740093100.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/673816800.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
- <void property="id">
- <string>7</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -287,9 +284,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>6</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -380,9 +374,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>5</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -450,9 +441,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>4</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -471,9 +459,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>0</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -560,7 +545,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src_thrift</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src_thrift</string>
@@ -572,7 +557,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src_thrift</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -632,7 +617,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src_thrift</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml Fri Apr 24 01:20:17 2009
@@ -30,7 +30,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/1647659539.10001.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/1224686051.10001.insclause-0</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -59,9 +59,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>20</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -578,9 +575,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>19</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -702,9 +696,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>18</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -752,9 +743,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>17</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -773,9 +761,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>13</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -811,7 +796,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -823,7 +808,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -879,7 +864,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml Fri Apr 24 01:20:17 2009
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/528179418/504093884.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/691407696/435337973.10000.insclause-0</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/hive/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -236,9 +236,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>28</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -413,9 +410,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>27</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -455,9 +449,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>26</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -499,7 +490,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -511,7 +502,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -567,7 +558,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -596,16 +587,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/528179418/504093884.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/691407696/435337973.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
- <void property="id">
- <string>31</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -685,9 +673,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>30</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -776,9 +761,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>29</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml Fri Apr 24 01:20:17 2009
@@ -166,9 +166,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>40</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -531,9 +528,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>39</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -593,9 +587,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>38</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -637,7 +628,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -649,7 +640,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -705,7 +696,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -731,7 +722,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/416548281/722723131.10001.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/22319010/672997305.10001.insclause-0</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -760,9 +751,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>43</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -927,9 +915,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>42</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1048,9 +1033,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>41</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml Fri Apr 24 01:20:17 2009
@@ -178,9 +178,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>58</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -739,9 +736,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>57</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -839,9 +833,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>56</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -871,9 +862,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>50</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -915,7 +903,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -927,7 +915,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -983,7 +971,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -1009,7 +997,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/67797214.10001.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/1061860864.10001.insclause-0</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -1038,9 +1026,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>61</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1192,9 +1177,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>60</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1402,9 +1384,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>59</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml Fri Apr 24 01:20:17 2009
@@ -123,9 +123,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>77</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -249,9 +246,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>76</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -299,9 +293,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>75</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -331,9 +322,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>69</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -375,7 +363,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -387,7 +375,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -443,7 +431,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -469,7 +457,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/853479232.10001.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/399906261.10001.insclause-0</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -498,9 +486,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>80</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -556,9 +541,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>79</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -617,9 +599,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>78</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml Fri Apr 24 01:20:17 2009
@@ -134,9 +134,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>90</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -311,9 +308,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>89</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -353,9 +347,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>88</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -520,9 +511,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>93</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -602,9 +590,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>92</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -693,9 +678,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>91</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml Fri Apr 24 01:20:17 2009
@@ -123,9 +123,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>108</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -249,9 +246,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>107</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -299,9 +293,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>106</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -331,9 +322,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>100</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -375,7 +363,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -387,7 +375,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -443,7 +431,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -469,7 +457,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/17456907.10001.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/717453259.10001.insclause-0</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -498,9 +486,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>111</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -556,9 +541,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>110</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -617,9 +599,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>109</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml Fri Apr 24 01:20:17 2009
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/242891659/366994768.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/862865280/488554482.10000.insclause-0</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/hive/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -131,16 +131,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/242891659/366994768.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/862865280/488554482.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
- <void property="id">
- <string>122</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -224,9 +221,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>121</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -356,9 +350,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>120</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -398,9 +389,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>119</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -415,7 +403,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -427,7 +415,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -483,7 +471,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml Fri Apr 24 01:20:17 2009
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/53294104/1248659293.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/147616301/869864491.10000.insclause-0</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/hive/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -104,7 +104,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/53294104/1248659293.10001.insclause-1</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/147616301/869864491.10001.insclause-1</string>
</void>
<void property="table">
<object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -157,7 +157,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/dest2</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest2</string>
</void>
</object>
</void>
@@ -186,7 +186,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/53294104/1248659293.10002.insclause-2</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/147616301/869864491.10002.insclause-2</string>
</void>
<void property="table">
<object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -243,7 +243,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/dest3</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest3</string>
</void>
</object>
</void>
@@ -290,16 +290,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/53294104/1248659293.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/147616301/869864491.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
- <void property="id">
- <string>130</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -386,9 +383,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>129</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -518,9 +512,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>128</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -574,16 +565,13 @@
<int>2</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/53294104/1248659293.10001.insclause-1</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/147616301/869864491.10001.insclause-1</string>
</void>
<void property="tableInfo">
<object idref="tableDesc1"/>
</void>
</object>
</void>
- <void property="id">
- <string>133</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -663,9 +651,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>132</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -905,9 +890,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>131</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -940,16 +922,13 @@
<int>3</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/53294104/1248659293.10002.insclause-2</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/147616301/869864491.10002.insclause-2</string>
</void>
<void property="tableInfo">
<object idref="tableDesc2"/>
</void>
</object>
</void>
- <void property="id">
- <string>136</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1029,9 +1008,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>135</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1149,9 +1125,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>134</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1170,9 +1143,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>127</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -1187,7 +1157,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1199,7 +1169,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -1255,7 +1225,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml Fri Apr 24 01:20:17 2009
@@ -163,9 +163,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>158</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -266,9 +263,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>157</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -505,9 +499,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>156</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -565,9 +556,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>155</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -597,9 +585,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>147</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -641,7 +626,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>tmap:src</string>
@@ -653,7 +638,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -709,7 +694,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -739,7 +724,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/9754968.10001.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/681046781.10001.insclause-0</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -768,9 +753,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>162</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -867,9 +849,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>161</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -928,9 +907,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>160</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -984,9 +960,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>159</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml Fri Apr 24 01:20:17 2009
@@ -28,7 +28,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/119872364/534776089.10003.insclause-3</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/871256501/751609570.10003.insclause-3</string>
</void>
<void property="targetDir">
<string>../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out</string>
@@ -48,7 +48,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/119872364/534776089.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/871256501/751609570.10000.insclause-0</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -101,7 +101,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -121,7 +121,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/119872364/534776089.10001.insclause-1</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/871256501/751609570.10001.insclause-1</string>
</void>
<void property="table">
<object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -174,7 +174,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/dest2</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest2</string>
</void>
</object>
</void>
@@ -203,7 +203,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/119872364/534776089.10002.insclause-2</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/871256501/751609570.10002.insclause-2</string>
</void>
<void property="table">
<object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -260,7 +260,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/dest3</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest3</string>
</void>
</object>
</void>
@@ -307,16 +307,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/119872364/534776089.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/871256501/751609570.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
- <void property="id">
- <string>175</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -403,9 +400,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>174</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -535,9 +529,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>173</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -591,16 +582,13 @@
<int>2</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/119872364/534776089.10001.insclause-1</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/871256501/751609570.10001.insclause-1</string>
</void>
<void property="tableInfo">
<object idref="tableDesc1"/>
</void>
</object>
</void>
- <void property="id">
- <string>178</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -680,9 +668,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>177</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -922,9 +907,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>176</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -957,16 +939,13 @@
<int>3</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/119872364/534776089.10002.insclause-2</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/871256501/751609570.10002.insclause-2</string>
</void>
<void property="tableInfo">
<object idref="tableDesc2"/>
</void>
</object>
</void>
- <void property="id">
- <string>181</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1046,9 +1025,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>180</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1288,9 +1264,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>179</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1323,7 +1296,7 @@
<int>4</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/119872364/534776089.10003.insclause-3</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/871256501/751609570.10003.insclause-3</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -1352,9 +1325,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>184</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1410,9 +1380,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>183</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1530,9 +1497,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>182</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1551,9 +1515,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>172</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -1568,7 +1529,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1580,7 +1541,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -1636,7 +1597,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml Fri Apr 24 01:20:17 2009
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/4875894/1119092585.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/295555796/271523094.10000.insclause-0</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/hive/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -261,9 +261,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>201</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -360,9 +357,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>200</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -421,9 +415,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>199</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -463,9 +454,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>198</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -507,7 +495,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>tmap:src</string>
@@ -519,7 +507,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -575,7 +563,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -608,16 +596,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/4875894/1119092585.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/295555796/271523094.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
- <void property="id">
- <string>205</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -697,9 +682,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>204</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -829,9 +811,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>203</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -885,9 +864,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>202</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml?rev=768112&r1=768111&r2=768112&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml Fri Apr 24 01:20:17 2009
@@ -31,7 +31,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/10742163.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/173509724.10000.insclause-0</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/hive/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -265,9 +265,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>224</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -364,9 +361,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>223</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -437,9 +431,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>222</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -507,9 +498,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>221</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -549,9 +537,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>214</string>
- </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -644,7 +629,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src_thrift</string>
<object class="java.util.ArrayList">
<void method="add">
<string>tmap:src_thrift</string>
@@ -656,7 +641,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src_thrift</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object class="java.util.LinkedHashMap"/>
@@ -716,7 +701,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive2/hive/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src_thrift</string>
</void>
</object>
</void>
@@ -745,16 +730,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>/data/users/njain/hive2/hive/ql/../build/ql/tmp/10742163.10000.insclause-0</string>
+ <string>/data/users/zshao/tools/deploy-trunk-apache-hive/ql/../build/ql/tmp/173509724.10000.insclause-0</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
- <void property="id">
- <string>227</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -834,9 +816,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>226</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -869,9 +848,6 @@
</void>
</object>
</void>
- <void property="id">
- <string>225</string>
- </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">