You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2012/10/29 07:24:03 UTC
svn commit: r1403176 [5/5] - in /hive/trunk/ql/src/test:
results/compiler/plan/ templates/
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml Mon Oct 29 06:24:01 2012
@@ -159,21 +159,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_531_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_531_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_531_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_5_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_531_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_5_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_531</string>
+ <string>FS_5</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -227,21 +227,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_530_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_530_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_530_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_530_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>TS_530</string>
+ <string>TS_4</string>
</void>
<void property="schema">
<object idref="RowSchema0"/>
@@ -736,21 +736,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_529_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_529_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_529_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_529_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_529</string>
+ <string>FS_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -832,21 +832,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_528_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_528_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_528_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_528_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_528</string>
+ <string>SEL_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1035,21 +1035,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FIL_527_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_527_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_527_TIME_TAKEN</string>
+ <string>CNTR_NAME_FIL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_527_FATAL_ERROR</string>
+ <string>CNTR_NAME_FIL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FIL_527</string>
+ <string>FIL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1109,16 +1109,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_526_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_526_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_526_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_526_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -1133,7 +1133,7 @@
</object>
</void>
<void property="operatorId">
- <string>TS_526</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml Mon Oct 29 06:24:01 2012
@@ -159,21 +159,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_543_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_543_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_543_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_5_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_543_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_5_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_543</string>
+ <string>FS_5</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -227,21 +227,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_542_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_542_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_542_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_542_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>TS_542</string>
+ <string>TS_4</string>
</void>
<void property="schema">
<object idref="RowSchema0"/>
@@ -736,21 +736,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_541_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_541_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_541_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_541_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_541</string>
+ <string>FS_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -832,21 +832,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_540_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_540_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_540_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_540_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_540</string>
+ <string>SEL_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1045,21 +1045,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FIL_539_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_539_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_539_TIME_TAKEN</string>
+ <string>CNTR_NAME_FIL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_539_FATAL_ERROR</string>
+ <string>CNTR_NAME_FIL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FIL_539</string>
+ <string>FIL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1119,16 +1119,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_538_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_538_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_538_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_538_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -1143,7 +1143,7 @@
</object>
</void>
<void property="operatorId">
- <string>TS_538</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml Mon Oct 29 06:24:01 2012
@@ -159,21 +159,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_555_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_555_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_555_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_5_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_555_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_5_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_555</string>
+ <string>FS_5</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -227,21 +227,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_554_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_554_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_554_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_554_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>TS_554</string>
+ <string>TS_4</string>
</void>
<void property="schema">
<object idref="RowSchema0"/>
@@ -736,21 +736,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_553_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_553_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_553_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_553_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_553</string>
+ <string>FS_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -832,21 +832,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_552_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_552_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_552_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_552_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_552</string>
+ <string>SEL_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1035,21 +1035,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FIL_551_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_551_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_551_TIME_TAKEN</string>
+ <string>CNTR_NAME_FIL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_551_FATAL_ERROR</string>
+ <string>CNTR_NAME_FIL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FIL_551</string>
+ <string>FIL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1109,16 +1109,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_550_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_550_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_550_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_550_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -1133,7 +1133,7 @@
</object>
</void>
<void property="operatorId">
- <string>TS_550</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml Mon Oct 29 06:24:01 2012
@@ -159,21 +159,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_567_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_567_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_567_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_5_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_567_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_5_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_567</string>
+ <string>FS_5</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -227,21 +227,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_566_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_566_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_566_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_566_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>TS_566</string>
+ <string>TS_4</string>
</void>
<void property="schema">
<object idref="RowSchema0"/>
@@ -736,21 +736,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_565_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_565_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_565_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_565_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_565</string>
+ <string>FS_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -832,21 +832,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_564_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_564_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_564_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_564_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_564</string>
+ <string>SEL_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1032,21 +1032,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FIL_563_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_563_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_563_TIME_TAKEN</string>
+ <string>CNTR_NAME_FIL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_563_FATAL_ERROR</string>
+ <string>CNTR_NAME_FIL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FIL_563</string>
+ <string>FIL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1106,16 +1106,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_562_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_562_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_562_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_562_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -1130,7 +1130,7 @@
</object>
</void>
<void property="operatorId">
- <string>TS_562</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml Mon Oct 29 06:24:01 2012
@@ -159,21 +159,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_579_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_579_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_5_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_579_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_5_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_579_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_5_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_579</string>
+ <string>FS_5</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -227,21 +227,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_578_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_578_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_578_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_578_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>TS_578</string>
+ <string>TS_4</string>
</void>
<void property="schema">
<object idref="RowSchema0"/>
@@ -736,21 +736,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_577_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_577_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_577_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_577_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_577</string>
+ <string>FS_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -832,21 +832,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_576_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_576_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_576_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_576_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_576</string>
+ <string>SEL_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1035,21 +1035,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FIL_575_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_575_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_575_TIME_TAKEN</string>
+ <string>CNTR_NAME_FIL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_575_FATAL_ERROR</string>
+ <string>CNTR_NAME_FIL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FIL_575</string>
+ <string>FIL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1109,16 +1109,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_574_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_574_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_574_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_574_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -1133,7 +1133,7 @@
</object>
</void>
<void property="operatorId">
- <string>TS_574</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml Mon Oct 29 06:24:01 2012
@@ -159,21 +159,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_593_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_7_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_593_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_7_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_593_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_7_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_593_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_7_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_593</string>
+ <string>FS_7</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -227,21 +227,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_592_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_6_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_592_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_6_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_592_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_6_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_592_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_6_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>TS_592</string>
+ <string>TS_6</string>
</void>
<void property="schema">
<object idref="RowSchema0"/>
@@ -740,21 +740,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_590_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_590_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_590_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_590_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_590</string>
+ <string>FS_4</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -836,21 +836,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_589_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_589_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_589_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_589_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_589</string>
+ <string>SEL_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1039,21 +1039,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FIL_587_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_587_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_587_TIME_TAKEN</string>
+ <string>CNTR_NAME_FIL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_587_FATAL_ERROR</string>
+ <string>CNTR_NAME_FIL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FIL_587</string>
+ <string>FIL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1144,21 +1144,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FIL_591_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_5_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_591_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_5_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_591_TIME_TAKEN</string>
+ <string>CNTR_NAME_FIL_5_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_591_FATAL_ERROR</string>
+ <string>CNTR_NAME_FIL_5_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FIL_591</string>
+ <string>FIL_5</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1234,16 +1234,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_586_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_586_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_586_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_586_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -1258,7 +1258,7 @@
</object>
</void>
<void property="operatorId">
- <string>TS_586</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml Mon Oct 29 06:24:01 2012
@@ -92,21 +92,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_608_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_7_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_608_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_7_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_608_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_7_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_608_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_7_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_608</string>
+ <string>FS_7</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -160,21 +160,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_607_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_6_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_607_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_6_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_607_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_6_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_607_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_6_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>TS_607</string>
+ <string>TS_6</string>
</void>
<void property="schema">
<object idref="RowSchema0"/>
@@ -624,21 +624,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_605_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_605_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_605_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_605_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_605</string>
+ <string>FS_4</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -716,21 +716,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_604_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_604_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_604_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_604_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_604</string>
+ <string>SEL_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -845,21 +845,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_603_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_603_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_603_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_603_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_603</string>
+ <string>SEL_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -958,21 +958,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FIL_606_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_5_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_606_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_5_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_606_TIME_TAKEN</string>
+ <string>CNTR_NAME_FIL_5_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_606_FATAL_ERROR</string>
+ <string>CNTR_NAME_FIL_5_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FIL_606</string>
+ <string>FIL_5</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1068,16 +1068,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_601_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_601_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_601_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_601_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -1092,7 +1092,7 @@
</object>
</void>
<void property="operatorId">
- <string>TS_601</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml Mon Oct 29 06:24:01 2012
@@ -249,21 +249,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_619_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_619_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_619_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_619_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_619</string>
+ <string>FS_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1478,21 +1478,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_618_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_618_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_618_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_618_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_618</string>
+ <string>SEL_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1782,21 +1782,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FIL_620_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_620_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_620_TIME_TAKEN</string>
+ <string>CNTR_NAME_FIL_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FIL_620_FATAL_ERROR</string>
+ <string>CNTR_NAME_FIL_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FIL_620</string>
+ <string>FIL_4</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1892,16 +1892,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_616_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_616_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_616_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_616_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -1913,7 +1913,7 @@
</object>
</void>
<void property="operatorId">
- <string>TS_616</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml Mon Oct 29 06:24:01 2012
@@ -205,21 +205,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_627_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_627_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_627_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_627_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_627</string>
+ <string>FS_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1440,21 +1440,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_626_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_626_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_626_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_626_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_626</string>
+ <string>SEL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -1735,16 +1735,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_625_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_625_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_625_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_625_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -1752,7 +1752,7 @@
<object class="java.util.ArrayList"/>
</void>
<void property="operatorId">
- <string>TS_625</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml Mon Oct 29 06:24:01 2012
@@ -245,21 +245,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_633_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_633_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_633_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_633_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_633</string>
+ <string>FS_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -439,21 +439,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_632_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_632_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_632_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_632_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_632</string>
+ <string>SEL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -513,16 +513,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_631_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_631_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_631_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_631_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -530,7 +530,7 @@
<object class="java.util.ArrayList"/>
</void>
<void property="operatorId">
- <string>TS_631</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml Mon Oct 29 06:24:01 2012
@@ -249,21 +249,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_640_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_640_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_640_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_640_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_640</string>
+ <string>FS_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -324,21 +324,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_LIM_639_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_LIM_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_LIM_639_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_LIM_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_LIM_639_TIME_TAKEN</string>
+ <string>CNTR_NAME_LIM_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_LIM_639_FATAL_ERROR</string>
+ <string>CNTR_NAME_LIM_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>LIM_639</string>
+ <string>LIM_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -556,21 +556,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_638_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_638_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_638_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_638_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_638</string>
+ <string>SEL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -603,16 +603,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_637_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_637_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_637_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_637_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -620,7 +620,7 @@
<object class="java.util.ArrayList"/>
</void>
<void property="operatorId">
- <string>TS_637</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml Mon Oct 29 06:24:01 2012
@@ -249,21 +249,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_FS_648_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_648_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_3_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_648_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_3_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_FS_648_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_3_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>FS_648</string>
+ <string>FS_3</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -324,21 +324,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_LIM_647_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_LIM_2_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_LIM_647_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_LIM_2_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_LIM_647_TIME_TAKEN</string>
+ <string>CNTR_NAME_LIM_2_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_LIM_647_FATAL_ERROR</string>
+ <string>CNTR_NAME_LIM_2_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>LIM_647</string>
+ <string>LIM_2</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -636,21 +636,21 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_646_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_1_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_646_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_646_TIME_TAKEN</string>
+ <string>CNTR_NAME_SEL_1_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_646_FATAL_ERROR</string>
+ <string>CNTR_NAME_SEL_1_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_646</string>
+ <string>SEL_1</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -683,16 +683,16 @@
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_TS_645_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_645_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_TS_0_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_645_TIME_TAKEN</string>
+ <string>CNTR_NAME_TS_0_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_TS_645_FATAL_ERROR</string>
+ <string>CNTR_NAME_TS_0_FATAL_ERROR</string>
</void>
</object>
</void>
@@ -700,7 +700,7 @@
<object class="java.util.ArrayList"/>
</void>
<void property="operatorId">
- <string>TS_645</string>
+ <string>TS_0</string>
</void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
Modified: hive/trunk/ql/src/test/templates/TestParse.vm
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/templates/TestParse.vm?rev=1403176&r1=1403175&r2=1403176&view=diff
==============================================================================
--- hive/trunk/ql/src/test/templates/TestParse.vm (original)
+++ hive/trunk/ql/src/test/templates/TestParse.vm Mon Oct 29 06:24:01 2012
@@ -94,6 +94,7 @@ public class $className extends TestCase
#set ($eidx = $fname.indexOf('.'))
#set ($tname = $fname.substring(0, $eidx))
public void testParse_$tname() throws Exception {
+ org.apache.hadoop.hive.ql.exec.Operator.resetId();
long startTime = System.currentTimeMillis();
try {
System.out.println("Begin query: " + "$fname");