You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2010/01/25 19:49:05 UTC
svn commit: r902921 [10/26] - in /hadoop/hive/trunk: ./
contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/
contrib/src/java/org/apache/hadoop/hive/contrib/udtf/example/
ql/src/java/org/apache/hadoop/hive/ql/ ql/src/java/org/apache/hado...
Modified: hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java?rev=902921&r1=902920&r2=902921&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java (original)
+++ hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java Mon Jan 25 18:48:58 2010
@@ -29,15 +29,15 @@
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.parse.TypeCheckProcFactory;
import org.apache.hadoop.hive.ql.plan.PlanUtils;
-import org.apache.hadoop.hive.ql.plan.collectDesc;
-import org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc;
-import org.apache.hadoop.hive.ql.plan.exprNodeDesc;
-import org.apache.hadoop.hive.ql.plan.filterDesc;
-import org.apache.hadoop.hive.ql.plan.mapredWork;
-import org.apache.hadoop.hive.ql.plan.partitionDesc;
-import org.apache.hadoop.hive.ql.plan.scriptDesc;
-import org.apache.hadoop.hive.ql.plan.selectDesc;
-import org.apache.hadoop.hive.ql.plan.tableDesc;
+import org.apache.hadoop.hive.ql.plan.CollectDesc;
+import org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc;
+import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
+import org.apache.hadoop.hive.ql.plan.FilterDesc;
+import org.apache.hadoop.hive.ql.plan.MapredWork;
+import org.apache.hadoop.hive.ql.plan.PartitionDesc;
+import org.apache.hadoop.hive.ql.plan.ScriptDesc;
+import org.apache.hadoop.hive.ql.plan.SelectDesc;
+import org.apache.hadoop.hive.ql.plan.TableDesc;
import org.apache.hadoop.hive.serde2.objectinspector.InspectableObject;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
@@ -87,21 +87,21 @@
public void testBaseFilterOperator() throws Throwable {
try {
System.out.println("Testing Filter Operator");
- exprNodeDesc col0 = TestExecDriver.getStringColumn("col0");
- exprNodeDesc col1 = TestExecDriver.getStringColumn("col1");
- exprNodeDesc col2 = TestExecDriver.getStringColumn("col2");
- exprNodeDesc zero = new exprNodeConstantDesc("0");
- exprNodeDesc func1 = TypeCheckProcFactory.DefaultExprProcessor
+ ExprNodeDesc col0 = TestExecDriver.getStringColumn("col0");
+ ExprNodeDesc col1 = TestExecDriver.getStringColumn("col1");
+ ExprNodeDesc col2 = TestExecDriver.getStringColumn("col2");
+ ExprNodeDesc zero = new ExprNodeConstantDesc("0");
+ ExprNodeDesc func1 = TypeCheckProcFactory.DefaultExprProcessor
.getFuncExprNodeDesc(">", col2, col1);
- exprNodeDesc func2 = TypeCheckProcFactory.DefaultExprProcessor
+ ExprNodeDesc func2 = TypeCheckProcFactory.DefaultExprProcessor
.getFuncExprNodeDesc("==", col0, zero);
- exprNodeDesc func3 = TypeCheckProcFactory.DefaultExprProcessor
+ ExprNodeDesc func3 = TypeCheckProcFactory.DefaultExprProcessor
.getFuncExprNodeDesc("and", func1, func2);
assert (func3 != null);
- filterDesc filterCtx = new filterDesc(func3, false);
+ FilterDesc filterCtx = new FilterDesc(func3, false);
// Configuration
- Operator<filterDesc> op = OperatorFactory.get(filterDesc.class);
+ Operator<FilterDesc> op = OperatorFactory.get(FilterDesc.class);
op.setConf(filterCtx);
// runtime initialization
@@ -137,24 +137,24 @@
try {
System.out.println("Testing FileSink Operator");
// col1
- exprNodeDesc exprDesc1 = TestExecDriver.getStringColumn("col1");
+ ExprNodeDesc exprDesc1 = TestExecDriver.getStringColumn("col1");
// col2
- exprNodeDesc expr1 = TestExecDriver.getStringColumn("col0");
- exprNodeDesc expr2 = new exprNodeConstantDesc("1");
- exprNodeDesc exprDesc2 = TypeCheckProcFactory.DefaultExprProcessor
+ ExprNodeDesc expr1 = TestExecDriver.getStringColumn("col0");
+ ExprNodeDesc expr2 = new ExprNodeConstantDesc("1");
+ ExprNodeDesc exprDesc2 = TypeCheckProcFactory.DefaultExprProcessor
.getFuncExprNodeDesc("concat", expr1, expr2);
// select operator to project these two columns
- ArrayList<exprNodeDesc> earr = new ArrayList<exprNodeDesc>();
+ ArrayList<ExprNodeDesc> earr = new ArrayList<ExprNodeDesc>();
earr.add(exprDesc1);
earr.add(exprDesc2);
ArrayList<String> outputCols = new ArrayList<String>();
for (int i = 0; i < earr.size(); i++) {
outputCols.add("_col" + i);
}
- selectDesc selectCtx = new selectDesc(earr, outputCols);
- Operator<selectDesc> op = OperatorFactory.get(selectDesc.class);
+ SelectDesc selectCtx = new SelectDesc(earr, outputCols);
+ Operator<SelectDesc> op = OperatorFactory.get(SelectDesc.class);
op.setConf(selectCtx);
// fileSinkOperator to dump the output of the select
@@ -185,37 +185,37 @@
try {
System.out.println("Testing Script Operator");
// col1
- exprNodeDesc exprDesc1 = TestExecDriver.getStringColumn("col1");
+ ExprNodeDesc exprDesc1 = TestExecDriver.getStringColumn("col1");
// col2
- exprNodeDesc expr1 = TestExecDriver.getStringColumn("col0");
- exprNodeDesc expr2 = new exprNodeConstantDesc("1");
- exprNodeDesc exprDesc2 = TypeCheckProcFactory.DefaultExprProcessor
+ ExprNodeDesc expr1 = TestExecDriver.getStringColumn("col0");
+ ExprNodeDesc expr2 = new ExprNodeConstantDesc("1");
+ ExprNodeDesc exprDesc2 = TypeCheckProcFactory.DefaultExprProcessor
.getFuncExprNodeDesc("concat", expr1, expr2);
// select operator to project these two columns
- ArrayList<exprNodeDesc> earr = new ArrayList<exprNodeDesc>();
+ ArrayList<ExprNodeDesc> earr = new ArrayList<ExprNodeDesc>();
earr.add(exprDesc1);
earr.add(exprDesc2);
ArrayList<String> outputCols = new ArrayList<String>();
for (int i = 0; i < earr.size(); i++) {
outputCols.add("_col" + i);
}
- selectDesc selectCtx = new selectDesc(earr, outputCols);
- Operator<selectDesc> op = OperatorFactory.get(selectDesc.class);
+ SelectDesc selectCtx = new SelectDesc(earr, outputCols);
+ Operator<SelectDesc> op = OperatorFactory.get(SelectDesc.class);
op.setConf(selectCtx);
// scriptOperator to echo the output of the select
- tableDesc scriptOutput = PlanUtils.getDefaultTableDesc(""
+ TableDesc scriptOutput = PlanUtils.getDefaultTableDesc(""
+ Utilities.tabCode, "a,b");
- tableDesc scriptInput = PlanUtils.getDefaultTableDesc(""
+ TableDesc scriptInput = PlanUtils.getDefaultTableDesc(""
+ Utilities.tabCode, "a,b");
- scriptDesc sd = new scriptDesc("cat", scriptOutput,
+ ScriptDesc sd = new ScriptDesc("cat", scriptOutput,
TextRecordWriter.class, scriptInput, TextRecordReader.class);
- Operator<scriptDesc> sop = OperatorFactory.getAndMakeChild(sd, op);
+ Operator<ScriptDesc> sop = OperatorFactory.getAndMakeChild(sd, op);
// Collect operator to observe the output of the script
- collectDesc cd = new collectDesc(Integer.valueOf(10));
+ CollectDesc cd = new CollectDesc(Integer.valueOf(10));
CollectOperator cdop = (CollectOperator) OperatorFactory.getAndMakeChild(
cd, sop);
@@ -270,25 +270,25 @@
// initialize pathToTableInfo
// Default: treat the table as a single column "col"
- tableDesc td = Utilities.defaultTd;
- partitionDesc pd = new partitionDesc(td, null);
- LinkedHashMap<String, org.apache.hadoop.hive.ql.plan.partitionDesc> pathToPartitionInfo = new LinkedHashMap<String, org.apache.hadoop.hive.ql.plan.partitionDesc>();
+ TableDesc td = Utilities.defaultTd;
+ PartitionDesc pd = new PartitionDesc(td, null);
+ LinkedHashMap<String, org.apache.hadoop.hive.ql.plan.PartitionDesc> pathToPartitionInfo = new LinkedHashMap<String, org.apache.hadoop.hive.ql.plan.PartitionDesc>();
pathToPartitionInfo.put("/testDir", pd);
// initialize aliasToWork
- collectDesc cd = new collectDesc(Integer.valueOf(1));
+ CollectDesc cd = new CollectDesc(Integer.valueOf(1));
CollectOperator cdop1 = (CollectOperator) OperatorFactory
- .get(collectDesc.class);
+ .get(CollectDesc.class);
cdop1.setConf(cd);
CollectOperator cdop2 = (CollectOperator) OperatorFactory
- .get(collectDesc.class);
+ .get(CollectDesc.class);
cdop2.setConf(cd);
LinkedHashMap<String, Operator<? extends Serializable>> aliasToWork = new LinkedHashMap<String, Operator<? extends Serializable>>();
aliasToWork.put("a", cdop1);
aliasToWork.put("b", cdop2);
// initialize mapredWork
- mapredWork mrwork = new mapredWork();
+ MapredWork mrwork = new MapredWork();
mrwork.setPathToAliases(pathToAliases);
mrwork.setPathToPartitionInfo(pathToPartitionInfo);
mrwork.setAliasToWork(aliasToWork);
Modified: hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestPlan.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestPlan.java?rev=902921&r1=902920&r2=902921&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestPlan.java (original)
+++ hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestPlan.java Mon Jan 25 18:48:58 2010
@@ -26,12 +26,12 @@
import junit.framework.TestCase;
import org.apache.hadoop.hive.ql.parse.TypeCheckProcFactory;
-import org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc;
-import org.apache.hadoop.hive.ql.plan.exprNodeDesc;
-import org.apache.hadoop.hive.ql.plan.filterDesc;
-import org.apache.hadoop.hive.ql.plan.mapredWork;
-import org.apache.hadoop.hive.ql.plan.partitionDesc;
-import org.apache.hadoop.hive.ql.plan.tableDesc;
+import org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc;
+import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
+import org.apache.hadoop.hive.ql.plan.FilterDesc;
+import org.apache.hadoop.hive.ql.plan.MapredWork;
+import org.apache.hadoop.hive.ql.plan.PartitionDesc;
+import org.apache.hadoop.hive.ql.plan.TableDesc;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.hadoop.mapred.JobConf;
@@ -44,15 +44,15 @@
try {
// initialize a complete map reduce configuration
- exprNodeDesc expr1 = new exprNodeColumnDesc(
+ ExprNodeDesc expr1 = new ExprNodeColumnDesc(
TypeInfoFactory.stringTypeInfo, F1, "", false);
- exprNodeDesc expr2 = new exprNodeColumnDesc(
+ ExprNodeDesc expr2 = new ExprNodeColumnDesc(
TypeInfoFactory.stringTypeInfo, F2, "", false);
- exprNodeDesc filterExpr = TypeCheckProcFactory.DefaultExprProcessor
+ ExprNodeDesc filterExpr = TypeCheckProcFactory.DefaultExprProcessor
.getFuncExprNodeDesc("==", expr1, expr2);
- filterDesc filterCtx = new filterDesc(filterExpr, false);
- Operator<filterDesc> op = OperatorFactory.get(filterDesc.class);
+ FilterDesc filterCtx = new FilterDesc(filterExpr, false);
+ Operator<FilterDesc> op = OperatorFactory.get(FilterDesc.class);
op.setConf(filterCtx);
ArrayList<String> aliasList = new ArrayList<String>();
@@ -60,15 +60,15 @@
LinkedHashMap<String, ArrayList<String>> pa = new LinkedHashMap<String, ArrayList<String>>();
pa.put("/tmp/testfolder", aliasList);
- tableDesc tblDesc = Utilities.defaultTd;
- partitionDesc partDesc = new partitionDesc(tblDesc, null);
- LinkedHashMap<String, partitionDesc> pt = new LinkedHashMap<String, partitionDesc>();
+ TableDesc tblDesc = Utilities.defaultTd;
+ PartitionDesc partDesc = new PartitionDesc(tblDesc, null);
+ LinkedHashMap<String, PartitionDesc> pt = new LinkedHashMap<String, PartitionDesc>();
pt.put("/tmp/testfolder", partDesc);
LinkedHashMap<String, Operator<? extends Serializable>> ao = new LinkedHashMap<String, Operator<? extends Serializable>>();
ao.put("a", op);
- mapredWork mrwork = new mapredWork();
+ MapredWork mrwork = new MapredWork();
mrwork.setPathToAliases(pa);
mrwork.setPathToPartitionInfo(pt);
mrwork.setAliasToWork(ao);
@@ -83,7 +83,7 @@
JobConf job = new JobConf(TestPlan.class);
job.set("fs.default.name", "file:///");
Utilities.setMapRedWork(job, mrwork);
- mapredWork mrwork2 = Utilities.getMapRedWork(job);
+ MapredWork mrwork2 = Utilities.getMapRedWork(job);
Utilities.clearMapRedWork(job);
// over here we should have some checks of the deserialized object against
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=902921&r1=902920&r2=902921&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 Mon Jan 25 18:48:58 2010
@@ -37,23 +37,23 @@
<string>Stage-3</string>
</void>
<void property="work">
- <object id="mapredWork0" class="org.apache.hadoop.hive.ql.plan.mapredWork">
+ <object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/645287710/10002</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/211566611/10002</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator">
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc">
<void property="keyCols">
<object class="java.util.ArrayList"/>
</void>
<void property="keySerializeInfo">
- <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.binarysortable.BinarySortableSerDe</class>
</void>
@@ -100,7 +100,7 @@
<void property="partitionCols">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList"/>
</void>
@@ -131,7 +131,7 @@
<void property="valueCols">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -148,7 +148,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -163,7 +163,7 @@
</object>
</void>
<void property="valueSerializeInfo">
- <object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe</class>
</void>
@@ -278,7 +278,7 @@
</object>
</void>
<void property="keyDesc">
- <object idref="tableDesc0"/>
+ <object idref="TableDesc0"/>
</void>
<void property="numReduceTasks">
<int>-1</int>
@@ -286,10 +286,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/645287710/10002</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/211566611/10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/645287710/10002</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/211566611/10002</string>
</void>
</object>
</void>
@@ -298,8 +298,8 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/645287710/10002</string>
- <object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/211566611/10002</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -349,11 +349,11 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1263595071</string>
+ <string>1264444415</string>
</void>
</object>
</void>
@@ -361,7 +361,7 @@
<string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
</void>
<void property="tableDesc">
- <object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -390,12 +390,12 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/1971336023/10000</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1258309071/10000</string>
</void>
<void property="tableInfo">
- <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -441,7 +441,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>file.outputformat</string>
@@ -449,7 +449,7 @@
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1263595071</string>
+ <string>1264444415</string>
</void>
</object>
</void>
@@ -494,9 +494,9 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.extractDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExtractDesc">
<void property="col">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>VALUE</string>
</void>
@@ -566,7 +566,7 @@
<void property="tagToValueDesc">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="tableDesc1"/>
+ <object idref="TableDesc1"/>
</void>
</object>
</void>
@@ -577,9 +577,9 @@
</object>
</void>
<void property="work">
- <object class="org.apache.hadoop.hive.ql.plan.moveWork">
+ <object class="org.apache.hadoop.hive.ql.plan.MoveWork">
<void property="loadTableWork">
- <object class="org.apache.hadoop.hive.ql.plan.loadTableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.LoadTableDesc">
<void property="partitionSpec">
<object class="java.util.HashMap"/>
</void>
@@ -587,13 +587,13 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/1971336023/10000</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1258309071/10000</string>
</void>
<void property="table">
- <object idref="tableDesc2"/>
+ <object idref="TableDesc2"/>
</void>
<void property="tmpDir">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/1971336023/10001</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1258309071/10001</string>
</void>
</object>
</void>
@@ -607,17 +607,17 @@
<string>Stage-4</string>
</void>
<void property="work">
- <object id="moveWork0" class="org.apache.hadoop.hive.ql.plan.moveWork">
+ <object id="MoveWork0" class="org.apache.hadoop.hive.ql.plan.MoveWork">
<void property="loadFileWork">
- <object class="org.apache.hadoop.hive.ql.plan.loadFileDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.LoadFileDesc">
<void property="isDfsDir">
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/645287710/10002</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/211566611/10002</string>
</void>
<void property="targetDir">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/1971336023/10000</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1258309071/10000</string>
</void>
</object>
</void>
@@ -643,7 +643,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/645287710/10002</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/211566611/10002</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -655,10 +655,10 @@
<void property="listWorks">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="moveWork0"/>
+ <object idref="MoveWork0"/>
</void>
<void method="add">
- <object idref="mapredWork0"/>
+ <object idref="MapredWork0"/>
</void>
</object>
</void>
@@ -672,11 +672,11 @@
<string>Stage-2</string>
</void>
<void property="work">
- <object class="org.apache.hadoop.hive.ql.plan.mapredWork">
+ <object class="org.apache.hadoop.hive.ql.plan.MapredWork">
<void property="aliasToPartnInfo">
<void method="put">
<string>src_thrift</string>
- <object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class>
</void>
@@ -733,11 +733,11 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src_thrift</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1263595071</string>
+ <string>1264444414</string>
</void>
</object>
</void>
@@ -745,7 +745,7 @@
<string>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</string>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class>
</void>
@@ -788,15 +788,15 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="destTableId">
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/645287710/10002</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/211566611/10002</string>
</void>
<void property="tableInfo">
- <object idref="tableDesc2"/>
+ <object idref="TableDesc2"/>
</void>
</object>
</void>
@@ -837,13 +837,13 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col1</string>
- <object id="exprNodeFieldDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeFieldDesc">
+ <object id="ExprNodeFieldDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeFieldDesc">
<void property="desc">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>lintstring</string>
</void>
@@ -887,7 +887,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -919,11 +919,11 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="exprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>lint</string>
</void>
@@ -940,7 +940,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -962,14 +962,14 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.selectDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeGenericFuncDesc0"/>
+ <object idref="ExprNodeGenericFuncDesc0"/>
</void>
<void method="add">
- <object idref="exprNodeFieldDesc0"/>
+ <object idref="ExprNodeFieldDesc0"/>
</void>
</object>
</void>
@@ -1044,17 +1044,17 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.filterDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>lint</string>
</void>
@@ -1067,7 +1067,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -1087,7 +1087,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -1232,17 +1232,17 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.filterDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>lint</string>
</void>
@@ -1255,7 +1255,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -1275,7 +1275,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -1344,7 +1344,7 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.tableScanDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableScanDesc">
<void property="alias">
<string>src_thrift</string>
</void>
@@ -1393,7 +1393,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src_thrift</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src_thrift</string>
@@ -1405,8 +1405,8 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift</string>
- <object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src_thrift</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class>
</void>
@@ -1426,7 +1426,7 @@
<string>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</string>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class>
</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=902921&r1=902920&r2=902921&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 Mon Jan 25 18:48:58 2010
@@ -5,11 +5,11 @@
<string>Stage-2</string>
</void>
<void property="work">
- <object class="org.apache.hadoop.hive.ql.plan.mapredWork">
+ <object class="org.apache.hadoop.hive.ql.plan.MapredWork">
<void property="aliasToPartnInfo">
<void method="put">
<string>src</string>
- <object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1263415253</string>
+ <string>1264444419</string>
</void>
</object>
</void>
@@ -74,7 +74,7 @@
<string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -117,12 +117,12 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/260240987/10001</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/414198575/10001</string>
</void>
<void property="tableInfo">
- <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -276,11 +276,11 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col6</string>
- <object id="exprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo2"/>
</void>
@@ -308,11 +308,11 @@
</void>
<void method="put">
<string>_col5</string>
- <object id="exprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object id="ExprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -340,11 +340,11 @@
</void>
<void method="put">
<string>_col4</string>
- <object id="exprNodeGenericFuncDesc2" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object id="ExprNodeGenericFuncDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -354,11 +354,11 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -406,11 +406,11 @@
</void>
<void method="put">
<string>_col3</string>
- <object id="exprNodeGenericFuncDesc3" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object id="ExprNodeGenericFuncDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -420,7 +420,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -451,11 +451,11 @@
</void>
<void method="put">
<string>_col2</string>
- <object id="exprNodeGenericFuncDesc4" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object id="ExprNodeGenericFuncDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -465,7 +465,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -496,11 +496,11 @@
</void>
<void method="put">
<string>_col1</string>
- <object id="exprNodeGenericFuncDesc5" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object id="ExprNodeGenericFuncDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
@@ -510,7 +510,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -541,11 +541,11 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="exprNodeGenericFuncDesc6" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object id="ExprNodeGenericFuncDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -555,7 +555,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -587,29 +587,29 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.selectDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeGenericFuncDesc6"/>
+ <object idref="ExprNodeGenericFuncDesc6"/>
</void>
<void method="add">
- <object idref="exprNodeGenericFuncDesc5"/>
+ <object idref="ExprNodeGenericFuncDesc5"/>
</void>
<void method="add">
- <object idref="exprNodeGenericFuncDesc4"/>
+ <object idref="ExprNodeGenericFuncDesc4"/>
</void>
<void method="add">
- <object idref="exprNodeGenericFuncDesc3"/>
+ <object idref="ExprNodeGenericFuncDesc3"/>
</void>
<void method="add">
- <object idref="exprNodeGenericFuncDesc2"/>
+ <object idref="ExprNodeGenericFuncDesc2"/>
</void>
<void method="add">
- <object idref="exprNodeGenericFuncDesc1"/>
+ <object idref="ExprNodeGenericFuncDesc1"/>
</void>
<void method="add">
- <object idref="exprNodeGenericFuncDesc0"/>
+ <object idref="ExprNodeGenericFuncDesc0"/>
</void>
</object>
</void>
@@ -770,13 +770,13 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.filterDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -793,7 +793,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -883,13 +883,13 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.filterDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -902,7 +902,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
@@ -971,7 +971,7 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.tableScanDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableScanDesc">
<void property="alias">
<string>src</string>
</void>
@@ -1017,7 +1017,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1029,8 +1029,8 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src</string>
- <object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -1050,7 +1050,7 @@
<string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</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=902921&r1=902920&r2=902921&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 Mon Jan 25 18:48:58 2010
@@ -16,9 +16,9 @@
</object>
</void>
<void property="work">
- <object class="org.apache.hadoop.hive.ql.plan.moveWork">
+ <object class="org.apache.hadoop.hive.ql.plan.MoveWork">
<void property="loadTableWork">
- <object class="org.apache.hadoop.hive.ql.plan.loadTableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.LoadTableDesc">
<void property="partitionSpec">
<object class="java.util.HashMap"/>
</void>
@@ -26,10 +26,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/214974041/10000</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1364981018/10000</string>
</void>
<void property="table">
- <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -79,11 +79,11 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1263415257</string>
+ <string>1264444423</string>
</void>
</object>
</void>
@@ -93,7 +93,7 @@
</object>
</void>
<void property="tmpDir">
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/214974041/10001</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1364981018/10001</string>
</void>
</object>
</void>
@@ -107,11 +107,11 @@
<string>Stage-2</string>
</void>
<void property="work">
- <object class="org.apache.hadoop.hive.ql.plan.mapredWork">
+ <object class="org.apache.hadoop.hive.ql.plan.MapredWork">
<void property="aliasToPartnInfo">
<void method="put">
<string>src</string>
- <object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -164,11 +164,11 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1263415257</string>
+ <string>1264444422</string>
</void>
</object>
</void>
@@ -176,7 +176,7 @@
<string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -218,7 +218,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>KEY._col0</string>
- <object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -237,16 +237,16 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc">
<void property="keyCols">
<object id="ArrayList0" class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeColumnDesc0"/>
+ <object idref="ExprNodeColumnDesc0"/>
</void>
</object>
</void>
<void property="keySerializeInfo">
- <object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.binarysortable.BinarySortableSerDe</class>
</void>
@@ -300,7 +300,7 @@
<void property="valueCols">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col1</string>
</void>
@@ -319,7 +319,7 @@
</object>
</void>
<void property="valueSerializeInfo">
- <object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe</class>
</void>
@@ -411,7 +411,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -426,11 +426,11 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.groupByDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.GroupByDesc">
<void property="aggregators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.AggregationDesc">
<void property="genericUDAFEvaluator">
<object id="GenericUDAFSum$GenericUDAFSumDouble0" class="org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum$GenericUDAFSumDouble"/>
</void>
@@ -445,11 +445,11 @@
<void property="parameters">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -462,7 +462,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
@@ -501,12 +501,12 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeColumnDesc1"/>
+ <object idref="ExprNodeColumnDesc1"/>
</void>
</object>
</void>
<void property="mode">
- <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf">
+ <object class="org.apache.hadoop.hive.ql.plan.GroupByDesc$Mode" method="valueOf">
<string>HASH</string>
</object>
</void>
@@ -581,11 +581,11 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.selectDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -598,7 +598,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -686,7 +686,7 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.tableScanDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableScanDesc">
<void property="alias">
<string>src</string>
</void>
@@ -733,7 +733,7 @@
</object>
</void>
<void property="keyDesc">
- <object idref="tableDesc1"/>
+ <object idref="TableDesc1"/>
</void>
<void property="numReduceTasks">
<int>-1</int>
@@ -741,7 +741,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -753,8 +753,8 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src</string>
- <object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -774,7 +774,7 @@
<string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
<class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
</void>
@@ -807,15 +807,15 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="destTableId">
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/214974041/10000</string>
+ <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1364981018/10000</string>
</void>
<void property="tableInfo">
- <object idref="tableDesc0"/>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
@@ -881,7 +881,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col1</string>
- <object id="exprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col1</string>
</void>
@@ -895,7 +895,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="exprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -910,14 +910,14 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.selectDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeColumnDesc3"/>
+ <object idref="ExprNodeColumnDesc3"/>
</void>
<void method="add">
- <object idref="exprNodeColumnDesc2"/>
+ <object idref="ExprNodeColumnDesc2"/>
</void>
</object>
</void>
@@ -995,7 +995,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="exprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY._col0</string>
</void>
@@ -1007,11 +1007,11 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.groupByDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.GroupByDesc">
<void property="aggregators">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.aggregationDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.AggregationDesc">
<void property="genericUDAFEvaluator">
<object idref="GenericUDAFSum$GenericUDAFSumDouble0"/>
</void>
@@ -1026,7 +1026,7 @@
<void property="parameters">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>VALUE._col0</string>
</void>
@@ -1044,12 +1044,12 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="exprNodeColumnDesc4"/>
+ <object idref="ExprNodeColumnDesc4"/>
</void>
</object>
</void>
<void property="mode">
- <object class="org.apache.hadoop.hive.ql.plan.groupByDesc$Mode" method="valueOf">
+ <object class="org.apache.hadoop.hive.ql.plan.GroupByDesc$Mode" method="valueOf">
<string>MERGEPARTIAL</string>
</object>
</void>
@@ -1124,7 +1124,7 @@
<void property="tagToValueDesc">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="tableDesc2"/>
+ <object idref="TableDesc2"/>
</void>
</object>
</void>