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 2009/08/20 21:27:53 UTC
svn commit: r806318 [1/10] - in /hadoop/hive/trunk: ./
common/src/java/org/apache/hadoop/hive/conf/ data/conf/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/parse/
ql/src/test/results/compiler/plan/
Author: zshao
Date: Thu Aug 20 19:27:51 2009
New Revision: 806318
URL: http://svn.apache.org/viewvc?rev=806318&view=rev
Log:
HIVE-768. Add conf var to disable counters introduced by HIVE-713. (Namit Jain via zshao)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hadoop/hive/trunk/data/conf/hive-site.xml
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/exec/ReduceSinkOperator.java
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.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/udf_case.q.xml
hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_when.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=806318&r1=806317&r2=806318&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Thu Aug 20 19:27:51 2009
@@ -31,6 +31,9 @@
HIVE-732. Use LazyBinarySerDe (Zheng Shao via namit)
+ HIVE-768. Add conf var to disable counters introduced by HIVE-713.
+ (Namit Jain via zshao)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=806318&r1=806317&r2=806318&view=diff
==============================================================================
--- hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Thu Aug 20 19:27:51 2009
@@ -153,6 +153,8 @@
HIVESENDHEARTBEAT("hive.heartbeat.interval", 1000),
+ HIVEJOBPROGRESS("hive.task.progress", false),
+
// Optimizer
HIVEOPTCP("hive.optimize.cp", true), // column pruner
HIVEOPTPPD("hive.optimize.ppd", true), // predicate pushdown
Modified: hadoop/hive/trunk/data/conf/hive-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/data/conf/hive-site.xml?rev=806318&r1=806317&r2=806318&view=diff
==============================================================================
--- hadoop/hive/trunk/data/conf/hive-site.xml (original)
+++ hadoop/hive/trunk/data/conf/hive-site.xml Thu Aug 20 19:27:51 2009
@@ -124,4 +124,10 @@
<description>Pre Execute Hook for Tests</description>
</property>
+<property>
+ <name>hive.task.progress</name>
+ <value>false</value>
+ <description>Track progress of a task</description>
+</property>
+
</configuration>
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=806318&r1=806317&r2=806318&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 Thu Aug 20 19:27:51 2009
@@ -700,14 +700,16 @@
private void preProcessCounter()
{
inputRows++;
-
- if (((inputRows % 1000) == 0) && (counterNameToEnum != null)) {
- incrCounter(numInputRowsCntr, inputRows);
- incrCounter(timeTakenCntr, totalTime);
- inputRows = 0 ;
- totalTime = 0;
+
+ if (counterNameToEnum != null) {
+ if ((inputRows % 1000) == 0) {
+ incrCounter(numInputRowsCntr, inputRows);
+ incrCounter(timeTakenCntr, totalTime);
+ inputRows = 0 ;
+ totalTime = 0;
+ }
+ beginTime = System.currentTimeMillis();
}
- beginTime = System.currentTimeMillis();
}
/**
@@ -715,7 +717,8 @@
*/
private void postProcessCounter()
{
- totalTime += (System.currentTimeMillis() - beginTime);
+ if (counterNameToEnum != null)
+ totalTime += (System.currentTimeMillis() - beginTime);
}
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java?rev=806318&r1=806317&r2=806318&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java Thu Aug 20 19:27:51 2009
@@ -204,10 +204,12 @@
if (out != null) {
out.collect(keyWritable, value);
// Since this is a terminal operator, update counters explicitly - forward is not called
- ++this.outputRows;
- if (this.outputRows % 1000 == 0) {
- incrCounter(numOutputRowsCntr, outputRows);
- this.outputRows = 0;
+ if (counterNameToEnum != null) {
+ ++this.outputRows;
+ if (this.outputRows % 1000 == 0) {
+ incrCounter(numOutputRowsCntr, outputRows);
+ this.outputRows = 0;
+ }
}
}
} catch (IOException e) {
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=806318&r1=806317&r2=806318&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Thu Aug 20 19:27:51 2009
@@ -4318,9 +4318,10 @@
for (Task<? extends Serializable> rootTask: rootTasks)
setKeyDescTaskTree(rootTask);
- // For each operator, generate the counters
- for (Task<? extends Serializable> rootTask: rootTasks)
- generateCountersTask(rootTask);
+ // For each operator, generate the counters if needed
+ if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVEJOBPROGRESS))
+ for (Task<? extends Serializable> rootTask: rootTasks)
+ generateCountersTask(rootTask);
}
// loop over all the tasks recursviely
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=806318&r1=806317&r2=806318&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 Thu Aug 20 19:27:51 2009
@@ -30,7 +30,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1313856117/10000</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/945975537/10000</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -83,7 +83,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -93,7 +93,7 @@
</object>
</void>
<void property="tmpDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1313856117/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/945975537/10001</string>
</void>
</object>
</void>
@@ -121,10 +121,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1963047638/10002</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1818347999/10002</string>
</void>
<void property="targetDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1313856117/10000</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/945975537/10000</string>
</void>
</object>
</void>
@@ -142,7 +142,7 @@
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1963047638/10002</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1818347999/10002</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -294,28 +294,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_RS_6_NUM_INPUT_ROWS</string>
- <object id="Operator$ProgressCounter0" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C4</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_6_NUM_OUTPUT_ROWS</string>
- <object id="Operator$ProgressCounter1" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C5</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_6_TIME_TAKEN</string>
- <object id="Operator$ProgressCounter2" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C6</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -371,28 +349,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_TS_5_TIME_TAKEN</string>
- <object id="Operator$ProgressCounter3" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C3</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_5_NUM_INPUT_ROWS</string>
- <object id="Operator$ProgressCounter4" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C1</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_5_NUM_OUTPUT_ROWS</string>
- <object id="Operator$ProgressCounter5" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C2</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -425,10 +381,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1963047638/10002</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1818347999/10002</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1963047638/10002</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1818347999/10002</string>
</void>
</object>
</void>
@@ -437,7 +393,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1963047638/10002</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1818347999/10002</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="tableDesc">
<object idref="tableDesc0"/>
@@ -455,7 +411,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1313856117/10000</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/945975537/10000</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -504,7 +460,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>file.outputformat</string>
@@ -519,28 +475,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FS_8_NUM_INPUT_ROWS</string>
- <object id="Operator$ProgressCounter6" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C10</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_8_NUM_OUTPUT_ROWS</string>
- <object id="Operator$ProgressCounter7" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C11</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_8_TIME_TAKEN</string>
- <object id="Operator$ProgressCounter8" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C12</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -588,28 +522,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_OP_7_TIME_TAKEN</string>
- <object id="Operator$ProgressCounter9" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C9</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_OP_7_NUM_OUTPUT_ROWS</string>
- <object id="Operator$ProgressCounter10" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C8</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_OP_7_NUM_INPUT_ROWS</string>
- <object id="Operator$ProgressCounter11" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C7</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -686,7 +598,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1963047638/10002</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1818347999/10002</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -778,7 +690,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src_thrift</string>
</void>
</object>
</void>
@@ -817,35 +729,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1963047638/10002</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1818347999/10002</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FS_3_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C14</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_3_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C15</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_3_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C13</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1001,22 +891,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_2_TIME_TAKEN</string>
- <object idref="Operator$ProgressCounter8"/>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS</string>
- <object idref="Operator$ProgressCounter7"/>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_2_NUM_INPUT_ROWS</string>
- <object idref="Operator$ProgressCounter6"/>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1151,22 +1025,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FIL_1_TIME_TAKEN</string>
- <object idref="Operator$ProgressCounter9"/>
- </void>
- <void method="put">
- <string>CNTR_NAME_FIL_1_NUM_INPUT_ROWS</string>
- <object idref="Operator$ProgressCounter11"/>
- </void>
- <void method="put">
- <string>CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS</string>
- <object idref="Operator$ProgressCounter10"/>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1348,22 +1206,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS</string>
- <object idref="Operator$ProgressCounter1"/>
- </void>
- <void method="put">
- <string>CNTR_NAME_FIL_4_NUM_INPUT_ROWS</string>
- <object idref="Operator$ProgressCounter0"/>
- </void>
- <void method="put">
- <string>CNTR_NAME_FIL_4_TIME_TAKEN</string>
- <object idref="Operator$ProgressCounter2"/>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1405,22 +1247,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
- <object idref="Operator$ProgressCounter3"/>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
- <object idref="Operator$ProgressCounter4"/>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
- <object idref="Operator$ProgressCounter5"/>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1461,7 +1287,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src_thrift</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src_thrift</string>
@@ -1473,7 +1299,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src_thrift</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src_thrift</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml?rev=806318&r1=806317&r2=806318&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 Thu Aug 20 19:27:51 2009
@@ -64,7 +64,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -100,7 +100,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/836386347/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/2039536853/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -133,28 +133,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FS_21_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C15</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_21_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C14</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_21_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C13</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -640,28 +618,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_20_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C11</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_20_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C10</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_20_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C12</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -822,28 +778,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FIL_19_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C9</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FIL_19_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C8</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FIL_19_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C7</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -950,28 +884,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FIL_22_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C6</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FIL_22_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C5</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FIL_22_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C4</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1013,28 +925,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_TS_18_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C3</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_18_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C1</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_18_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C2</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1072,7 +962,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1084,7 +974,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=806318&r1=806317&r2=806318&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 Thu Aug 20 19:27:51 2009
@@ -26,7 +26,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/663204539/10000</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/40528806/10000</string>
</void>
<void property="table">
<object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -79,7 +79,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/dest1</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/dest1</string>
</void>
</object>
</void>
@@ -89,7 +89,7 @@
</object>
</void>
<void property="tmpDir">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/663204539/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/40528806/10001</string>
</void>
</object>
</void>
@@ -162,7 +162,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -326,28 +326,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_RS_31_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C10</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_31_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C11</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_31_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C12</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -518,28 +496,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_GBY_30_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C8</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_30_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C9</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_30_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C7</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -642,28 +598,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_29_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C6</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_29_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C5</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_29_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C4</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -726,28 +660,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_TS_28_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C1</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_28_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C2</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_28_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C3</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -794,7 +706,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -806,7 +718,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
@@ -850,35 +762,13 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/663204539/10000</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/40528806/10000</string>
</void>
<void property="tableInfo">
<object idref="tableDesc0"/>
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FS_34_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C19</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_34_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C21</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_34_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C20</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -990,28 +880,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_33_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C18</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_33_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C17</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_33_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C16</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1141,28 +1009,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_GBY_32_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C14</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_32_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C13</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_32_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C15</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<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=806318&r1=806317&r2=806318&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 Thu Aug 20 19:27:51 2009
@@ -64,7 +64,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -272,28 +272,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_RS_45_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C12</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_45_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C10</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_45_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C11</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -643,28 +621,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_GBY_44_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C8</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_44_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C9</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_44_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C7</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -787,28 +743,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_43_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C6</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_43_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C5</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_43_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C4</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -871,28 +805,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_TS_42_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C3</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_42_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C1</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_42_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C2</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -939,7 +851,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -951,7 +863,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
@@ -992,7 +904,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/689471429/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/265864502/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -1025,28 +937,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FS_48_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C20</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_48_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C19</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_48_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C21</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1222,28 +1112,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_47_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C17</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_47_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C16</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_47_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C18</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1418,28 +1286,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_GBY_46_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C14</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_46_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C13</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_46_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C15</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<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=806318&r1=806317&r2=806318&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 Thu Aug 20 19:27:51 2009
@@ -64,7 +64,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -292,28 +292,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_RS_59_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C12</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_59_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C11</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_59_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C10</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -822,28 +800,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_GBY_58_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C7</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_58_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C9</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_58_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C8</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -970,28 +926,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_57_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C4</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_57_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C6</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_57_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C5</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1044,28 +978,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_TS_56_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C3</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_56_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C1</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_56_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C2</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1123,7 +1035,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1135,7 +1047,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
@@ -1176,7 +1088,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/636122994/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/316288666/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -1209,28 +1121,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FS_62_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C20</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_62_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C21</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_62_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C19</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1432,28 +1322,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_61_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C17</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_61_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C18</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_61_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C16</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -1719,28 +1587,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_GBY_60_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C15</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_60_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C14</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_60_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C13</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<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=806318&r1=806317&r2=806318&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 Thu Aug 20 19:27:51 2009
@@ -64,7 +64,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -206,28 +206,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_RS_73_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C12</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_73_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C10</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_RS_73_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C11</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -362,28 +340,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_GBY_72_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C9</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_72_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C8</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_72_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C7</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -460,28 +416,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_71_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C6</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_71_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C4</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_71_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C5</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -534,28 +468,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_TS_70_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C2</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_70_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C3</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_TS_70_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C1</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -613,7 +525,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -625,7 +537,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
@@ -666,7 +578,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/1013994509/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1892370332/10001</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -699,28 +611,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_FS_76_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C20</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_76_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C19</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_FS_76_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C21</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -802,28 +692,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_SEL_75_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C17</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_75_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C16</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_SEL_75_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C18</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
@@ -910,28 +778,6 @@
</void>
</object>
</void>
- <void property="counterNameToEnum">
- <object class="java.util.HashMap">
- <void method="put">
- <string>CNTR_NAME_GBY_74_NUM_INPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C13</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_74_TIME_TAKEN</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C15</string>
- </object>
- </void>
- <void method="put">
- <string>CNTR_NAME_GBY_74_NUM_OUTPUT_ROWS</string>
- <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
- <string>C14</string>
- </object>
- </void>
- </object>
- </void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">