diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 7484a3d..90a5bc9 100644
--- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -538,8 +538,6 @@
HIVEDEBUGLOCALTASK("hive.debug.localtask",false),
- HIVEJOBPROGRESS("hive.task.progress", false),
-
HIVEINPUTFORMAT("hive.input.format", "org.apache.hadoop.hive.ql.io.CombineHiveInputFormat"),
HIVEENFORCEBUCKETING("hive.enforce.bucketing", false),
@@ -851,6 +849,8 @@
// none, idonly, traverse, execution
HIVESTAGEIDREARRANGE("hive.stageid.rearrange", "none"),
HIVEEXPLAINDEPENDENCYAPPENDTASKTYPES("hive.explain.dependency.append.tasktype", false),
+
+ HIVECOUNTERGROUP("hive.counters.group.name", "HIVE")
;
public final String varname;
diff --git conf/hive-default.xml.template conf/hive-default.xml.template
index 93e5922..5cd076b 100644
--- conf/hive-default.xml.template
+++ conf/hive-default.xml.template
@@ -716,12 +716,6 @@
- hive.task.progress
- false
- Whether Hive should periodically update task progress counters during execution. Enabling this allows task progress to be monitored more closely in the job tracker, but may impose a performance penalty. This flag is automatically set to true for jobs with hive.exec.dynamic.partition set to true.
-
-
-
hive.hwi.war.file
lib/hive-hwi-@VERSION@.war
This sets the path to the HWI war file, relative to ${HIVE_HOME}.
diff --git data/conf/hive-site.xml data/conf/hive-site.xml
index cf8ed15..eac1a3f 100644
--- data/conf/hive-site.xml
+++ data/conf/hive-site.xml
@@ -136,12 +136,6 @@
- hive.task.progress
- false
- Track progress of a task
-
-
-
hive.support.concurrency
true
Whether hive supports concurrency or not. A zookeeper instance must be up and running for the default hive lock manager to support read-write locks.
diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/OptrStatGroupByHook.java itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/OptrStatGroupByHook.java
deleted file mode 100644
index 828de5e..0000000
--- itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/OptrStatGroupByHook.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-package org.apache.hadoop.hive.ql.hooks;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
-import java.io.Serializable;
-
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.exec.Operator;
-import org.apache.hadoop.hive.ql.exec.Task;
-import org.apache.hadoop.hive.ql.exec.TaskRunner;
-import org.apache.hadoop.hive.ql.plan.api.OperatorType;
-import org.apache.hadoop.hive.ql.plan.OperatorDesc;
-import org.apache.hadoop.hive.ql.session.SessionState;
-import org.apache.hadoop.hive.ql.session.SessionState.LogHelper;
-
-public class OptrStatGroupByHook implements ExecuteWithHookContext {
-
- public void run(HookContext hookContext) {
- HiveConf conf = hookContext.getConf();
-
- List completedTasks = hookContext.getCompleteTaskList();
-
- boolean enableProgress = HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVEJOBPROGRESS);
-
- /** For each task visit the opeartor tree and and if the operator is GROUPBY
- * then print the HASH_OUT Optr level stat value.
- **/
- if (completedTasks != null) {
- for (TaskRunner taskRunner : completedTasks) {
- Task extends Serializable> task = taskRunner.getTask();
- if (task.isMapRedTask() && !task.isMapRedLocalTask()) {
- Set> optrSet = getOptrsForTask(task);
- for (Operator extends OperatorDesc> optr : optrSet) {
- if (optr.getType() == OperatorType.GROUPBY) {
- printCounterValue(optr.getCounters());
- }
- }
- }
- }
- }
- }
-
- private void printCounterValue(HashMap ctrs) {
- for (String ctrName : ctrs.keySet()) {
- if (ctrName.contains("HASH_OUT")) {
- SessionState.getConsole().printError(ctrName+"="+ctrs.get(ctrName));
- }
- }
- }
-
- private Set> getOptrsForTask(
- Task extends Serializable> task) {
-
- Collection> topOptrs = task.getTopOperators();
- Set> allOptrs =
- new HashSet>();
- Queue> opsToVisit =
- new LinkedList>();
- if(topOptrs != null) {
- opsToVisit.addAll(topOptrs);
- addChildOptrs(opsToVisit, allOptrs);
- }
-
- return allOptrs;
- }
-
- private void addChildOptrs(
- Queue> opsToVisit,
- Set> opsVisited) {
-
- if(opsToVisit == null || opsVisited == null) {
- return;
- }
-
- while (opsToVisit.peek() != null) {
- Operator extends OperatorDesc> op = opsToVisit.remove();
- opsVisited.add(op);
- if (op.getChildOperators() != null) {
- for (Operator extends OperatorDesc> childOp : op.getChildOperators()) {
- if (!opsVisited.contains(childOp)) {
- opsToVisit.add(childOp);
- }
- }
- }
- }
- }
-}
diff --git ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
index 27117cd..cbc3cd2 100644
--- ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
+++ ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
@@ -373,6 +373,9 @@
+ "running your custom script."),
SCRIPT_CLOSING_ERROR(20003, "An error occurred when trying to close the Operator " +
"running your custom script."),
+ DYNAMIC_PARTITIONS_TOO_MANY_PER_NODE_ERROR(20004, "Fatal error occurred when node " +
+ "tried to create too many dynamic partitions. The maximum number of dynamic partitions " +
+ "is controlled by hive.exec.max.dynamic.partitions and hive.exec.max.dynamic.partitions.pernode. "),
STATSPUBLISHER_NOT_OBTAINED(30000, "StatsPublisher cannot be obtained. " +
"There was a error to retrieve the StatsPublisher, and retrying " +
diff --git ql/src/java/org/apache/hadoop/hive/ql/QueryPlan.java ql/src/java/org/apache/hadoop/hive/ql/QueryPlan.java
index 2f69c8d..591cc58 100644
--- ql/src/java/org/apache/hadoop/hive/ql/QueryPlan.java
+++ ql/src/java/org/apache/hadoop/hive/ql/QueryPlan.java
@@ -333,7 +333,6 @@ private void updateCountersInQueryPlan() {
// if the task has started, all operators within the task have
// started
op.setStarted(started.contains(task.getTaskId()));
- op.setOperatorCounters(counters.get(op.getOperatorId()));
// if the task is done, all operators are done as well
op.setDone(done.contains(task.getTaskId()));
}
@@ -382,8 +381,6 @@ private void extractCounters() throws IOException {
}
if (task instanceof ExecDriver) {
ExecDriver mrTask = (ExecDriver) task;
- extractOperatorCounters(mrTask.getWork().getMapWork().getAliasToWork().values(),
- task.getId() + "_MAP");
if (mrTask.mapStarted()) {
started.add(task.getId() + "_MAP");
}
@@ -394,7 +391,6 @@ private void extractCounters() throws IOException {
Collection> reducerTopOps =
new ArrayList>();
reducerTopOps.add(mrTask.getWork().getReduceWork().getReducer());
- extractOperatorCounters(reducerTopOps, task.getId() + "_REDUCE");
if (mrTask.reduceStarted()) {
started.add(task.getId() + "_REDUCE");
}
@@ -413,34 +409,6 @@ private void extractCounters() throws IOException {
}
}
- private void extractOperatorCounters(
- Collection> topOps, String taskId) {
- Queue> opsToVisit =
- new LinkedList>();
- Set> opsVisited =
- new HashSet>();
- opsToVisit.addAll(topOps);
- while (opsToVisit.size() != 0) {
- Operator extends OperatorDesc> op = opsToVisit.remove();
- opsVisited.add(op);
- Map ctrs = op.getCounters();
- if (ctrs != null) {
- counters.put(op.getOperatorId(), op.getCounters());
- }
- if (op.getDone()) {
- done.add(op.getOperatorId());
- }
- if (op.getChildOperators() != null) {
- for (Operator extends OperatorDesc> childOp : op.getChildOperators()) {
- if (!opsVisited.contains(childOp)) {
- opsToVisit.add(childOp);
- }
- }
- }
- }
-
- }
-
public org.apache.hadoop.hive.ql.plan.api.Query getQueryPlan()
throws IOException {
if (query.getStageGraph() == null) {
diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
index c8d3d64..8815c39 100644
--- ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
+++ ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
@@ -57,12 +57,6 @@
transient int numMapRowsRead;
- private static final transient String[] FATAL_ERR_MSG = {
- null, // counter value 0 means no error
- "Mapside join exceeds available memory. "
- + "Please try removing the mapjoin hint."
- };
-
transient boolean firstRow;
@@ -122,13 +116,6 @@ protected void initializeOp(Configuration hconf) throws HiveException {
initializeChildren(hconf);
}
-
- @Override
- protected void fatalErrorMessage(StringBuilder errMsg, long counterCode) {
- errMsg.append("Operator " + getOperatorId() + " (id=" + id + "): "
- + FATAL_ERR_MSG[(int) counterCode]);
- }
-
@Override
public OperatorType getType() {
return OperatorType.MAPJOIN;
diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java
index 6786b2c..5ee16f7 100644
--- ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java
+++ ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java
@@ -131,8 +131,6 @@ public CommonJoinOperator(CommonJoinOperator clone) {
this.nextSz = clone.nextSz;
this.childOperators = clone.childOperators;
this.parentOperators = clone.parentOperators;
- this.counterNames = clone.counterNames;
- this.counterNameToEnum = clone.counterNameToEnum;
this.done = clone.done;
this.operatorId = clone.operatorId;
this.storage = clone.storage;
@@ -140,12 +138,9 @@ public CommonJoinOperator(CommonJoinOperator clone) {
this.conf = clone.getConf();
this.setSchema(clone.getSchema());
this.alias = clone.alias;
- this.beginTime = clone.beginTime;
- this.inputRows = clone.inputRows;
this.childOperatorsArray = clone.childOperatorsArray;
this.childOperatorsTag = clone.childOperatorsTag;
this.colExprMap = clone.colExprMap;
- this.counters = clone.counters;
this.dummyObj = clone.dummyObj;
this.dummyObjVectors = clone.dummyObjVectors;
this.forwardCache = clone.forwardCache;
@@ -154,7 +149,6 @@ public CommonJoinOperator(CommonJoinOperator clone) {
this.hconf = clone.hconf;
this.id = clone.id;
this.inputObjInspectors = clone.inputObjInspectors;
- this.inputRows = clone.inputRows;
this.noOuterJoin = clone.noOuterJoin;
this.numAliases = clone.numAliases;
this.operatorId = clone.operatorId;
diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/DemuxOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/DemuxOperator.java
index 945186d..b0b0925 100644
--- ql/src/java/org/apache/hadoop/hive/ql/exec/DemuxOperator.java
+++ ql/src/java/org/apache/hadoop/hive/ql/exec/DemuxOperator.java
@@ -266,7 +266,7 @@ public void processOp(Object row, int tag) throws HiveException {
if (child.getDone()) {
childrenDone++;
} else {
- child.process(row, oldTag);
+ child.processOp(row, oldTag);
}
// if all children are done, this operator is also done
@@ -330,10 +330,6 @@ public void endGroup() throws HiveException {
return;
}
- if (fatalError) {
- return;
- }
-
// We will start a new key group. We can call flush the buffer
// of children from lastChildIndex (inclusive) to the last child and
// propagate processGroup to those children.
diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
index 5abcfc1..d2b2526 100644
--- ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
+++ ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
@@ -500,7 +500,7 @@ public boolean doNext(WritableComparable key, Writable value) throws IOException
public boolean pushRow() throws IOException, HiveException {
if(work.getRowsComputedUsingStats() != null) {
for (List
-
-
-
FS_6
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_3
@@ -924,22 +876,6 @@
-
-
-
SEL_2
@@ -1057,22 +993,6 @@
-
-
-
FIL_4
@@ -1137,22 +1057,6 @@
-
-
-
-
-
-
FS_3
@@ -701,22 +685,6 @@
-
-
-
SEL_2
@@ -896,22 +864,6 @@
-
-
-
FIL_4
@@ -960,22 +912,6 @@
-
-
-
-
-
-
RS_3
@@ -652,25 +636,6 @@
-
-
-
GBY_2
@@ -842,22 +807,6 @@
-
-
-
SEL_1
@@ -922,22 +871,6 @@
-
-
-
-
-
-
FS_6
@@ -1376,22 +1293,6 @@
-
-
-
SEL_5
@@ -1526,25 +1427,6 @@
-
-
-
GBY_4
diff --git ql/src/test/results/compiler/plan/groupby2.q.xml ql/src/test/results/compiler/plan/groupby2.q.xml
index 736d775..e9fee6a 100755
--- ql/src/test/results/compiler/plan/groupby2.q.xml
+++ ql/src/test/results/compiler/plan/groupby2.q.xml
@@ -367,22 +367,6 @@
-
-
-
RS_3
@@ -746,25 +730,6 @@
-
-
-
GBY_2
@@ -964,22 +929,6 @@
-
-
-
SEL_1
@@ -1044,22 +993,6 @@
-
-
-
-
-
-
FS_6
@@ -1578,22 +1495,6 @@
-
-
-
SEL_5
@@ -1785,25 +1686,6 @@
-
-
-
GBY_4
diff --git ql/src/test/results/compiler/plan/groupby3.q.xml ql/src/test/results/compiler/plan/groupby3.q.xml
index eec8b82..18d7fc7 100644
--- ql/src/test/results/compiler/plan/groupby3.q.xml
+++ ql/src/test/results/compiler/plan/groupby3.q.xml
@@ -421,22 +421,6 @@
-
-
-
RS_3
@@ -954,25 +938,6 @@
-
-
-
GBY_2
@@ -1188,22 +1153,6 @@
-
-
-
SEL_1
@@ -1252,22 +1201,6 @@
-
-
-
-
-
-
FS_6
@@ -1838,22 +1755,6 @@
-
-
-
SEL_5
@@ -2148,25 +2049,6 @@
-
-
-
GBY_4
diff --git ql/src/test/results/compiler/plan/groupby4.q.xml ql/src/test/results/compiler/plan/groupby4.q.xml
index f9e59e4..f014ca7 100644
--- ql/src/test/results/compiler/plan/groupby4.q.xml
+++ ql/src/test/results/compiler/plan/groupby4.q.xml
@@ -285,22 +285,6 @@
-
-
-
RS_3
@@ -437,25 +421,6 @@
-
-
-
GBY_2
@@ -595,22 +560,6 @@
-
-
-
SEL_1
@@ -659,22 +608,6 @@
-
-
-
-
-
-
FS_6
@@ -1101,22 +1018,6 @@
-
-
-
SEL_5
@@ -1205,25 +1106,6 @@
-
-
-
GBY_4
diff --git ql/src/test/results/compiler/plan/groupby5.q.xml ql/src/test/results/compiler/plan/groupby5.q.xml
index c53af00..f247c05 100644
--- ql/src/test/results/compiler/plan/groupby5.q.xml
+++ ql/src/test/results/compiler/plan/groupby5.q.xml
@@ -311,22 +311,6 @@
-
-
-
RS_3
@@ -502,25 +486,6 @@
-
-
-
GBY_2
@@ -692,22 +657,6 @@
-
-
-
SEL_1
@@ -772,22 +721,6 @@
-
-
-
-
-
-
FS_6
@@ -1243,22 +1160,6 @@
-
-
-
SEL_5
@@ -1399,25 +1300,6 @@
-
-
-
GBY_4
diff --git ql/src/test/results/compiler/plan/groupby6.q.xml ql/src/test/results/compiler/plan/groupby6.q.xml
index 23c781d..51b65ee 100644
--- ql/src/test/results/compiler/plan/groupby6.q.xml
+++ ql/src/test/results/compiler/plan/groupby6.q.xml
@@ -285,22 +285,6 @@
-
-
-
RS_3
@@ -437,25 +421,6 @@
-
-
-
GBY_2
@@ -595,22 +560,6 @@
-
-
-
SEL_1
@@ -659,22 +608,6 @@
-
-
-
-
-
-
FS_6
@@ -1101,22 +1018,6 @@
-
-
-
SEL_5
@@ -1205,25 +1106,6 @@
-
-
-
GBY_4
diff --git ql/src/test/results/compiler/plan/input1.q.xml ql/src/test/results/compiler/plan/input1.q.xml
index 35549cd..28a2237 100755
--- ql/src/test/results/compiler/plan/input1.q.xml
+++ ql/src/test/results/compiler/plan/input1.q.xml
@@ -153,22 +153,6 @@
-
-
-
FS_6
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_3
@@ -816,22 +768,6 @@
-
-
-
SEL_2
@@ -935,22 +871,6 @@
-
-
-
FIL_4
@@ -1015,22 +935,6 @@
-
-
-
-
-
-
FS_11
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_13
@@ -751,22 +703,6 @@
-
-
-
-
-
-
FS_15
@@ -1276,22 +1196,6 @@
-
-
-
-
-
-
FS_3
@@ -1874,22 +1762,6 @@
-
-
-
SEL_2
@@ -1993,22 +1865,6 @@
-
-
-
FIL_1
@@ -2105,22 +1961,6 @@
-
-
-
FS_6
@@ -2194,22 +2034,6 @@
-
-
-
SEL_5
@@ -2356,22 +2180,6 @@
-
-
-
FIL_4
@@ -2445,22 +2253,6 @@
-
-
-
FS_9
@@ -2531,22 +2323,6 @@
-
-
-
SEL_8
@@ -2639,22 +2415,6 @@
-
-
-
FIL_7
@@ -2690,22 +2450,6 @@
-
-
-
-
-
-
RS_3
@@ -513,22 +497,6 @@
-
-
-
SCR_2
@@ -662,22 +630,6 @@
-
-
-
SEL_1
@@ -736,22 +688,6 @@
-
-
-
-
-
-
FS_7
@@ -1293,22 +1213,6 @@
-
-
-
SCR_6
@@ -1419,22 +1323,6 @@
-
-
-
SEL_5
@@ -1500,22 +1388,6 @@
-
-
-
EX_4
diff --git ql/src/test/results/compiler/plan/input3.q.xml ql/src/test/results/compiler/plan/input3.q.xml
index 0a7d781..46fe7f9 100755
--- ql/src/test/results/compiler/plan/input3.q.xml
+++ ql/src/test/results/compiler/plan/input3.q.xml
@@ -153,22 +153,6 @@
-
-
-
FS_14
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_16
@@ -751,22 +703,6 @@
-
-
-
-
-
-
FS_18
@@ -1276,22 +1196,6 @@
-
-
-
-
-
-
FS_20
@@ -1727,22 +1615,6 @@
-
-
-
-
-
-
FS_3
@@ -2260,22 +2116,6 @@
-
-
-
SEL_2
@@ -2379,22 +2219,6 @@
-
-
-
FIL_1
@@ -2491,22 +2315,6 @@
-
-
-
FS_6
@@ -2580,22 +2388,6 @@
-
-
-
SEL_5
@@ -2742,22 +2534,6 @@
-
-
-
FIL_4
@@ -2831,22 +2607,6 @@
-
-
-
FS_9
@@ -2917,22 +2677,6 @@
-
-
-
SEL_8
@@ -3076,22 +2820,6 @@
-
-
-
FIL_7
@@ -3150,22 +2878,6 @@
-
-
-
FS_12
@@ -3219,22 +2931,6 @@
-
-
-
SEL_11
@@ -3317,22 +3013,6 @@
-
-
-
FIL_10
@@ -3371,22 +3051,6 @@
-
-
-
-
-
-
RS_3
@@ -588,22 +572,6 @@
-
-
-
FIL_8
@@ -739,22 +707,6 @@
-
-
-
SCR_2
@@ -832,22 +784,6 @@
-
-
-
SEL_1
@@ -906,22 +842,6 @@
-
-
-
-
-
-
FS_7
@@ -1390,22 +1294,6 @@
-
-
-
SEL_6
@@ -1477,22 +1365,6 @@
-
-
-
EX_4
diff --git ql/src/test/results/compiler/plan/input5.q.xml ql/src/test/results/compiler/plan/input5.q.xml
index 5930925..806c3bf 100644
--- ql/src/test/results/compiler/plan/input5.q.xml
+++ ql/src/test/results/compiler/plan/input5.q.xml
@@ -483,22 +483,6 @@
-
-
-
RS_3
@@ -667,22 +651,6 @@
-
-
-
SCR_2
@@ -799,22 +767,6 @@
-
-
-
SEL_1
@@ -873,22 +825,6 @@
-
-
-
-
-
-
FS_6
@@ -1440,22 +1360,6 @@
-
-
-
SEL_5
@@ -1527,22 +1431,6 @@
-
-
-
EX_4
diff --git ql/src/test/results/compiler/plan/input6.q.xml ql/src/test/results/compiler/plan/input6.q.xml
index 97002a9..8b2e348 100644
--- ql/src/test/results/compiler/plan/input6.q.xml
+++ ql/src/test/results/compiler/plan/input6.q.xml
@@ -153,22 +153,6 @@
-
-
-
FS_6
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_3
@@ -816,22 +768,6 @@
-
-
-
SEL_2
@@ -921,22 +857,6 @@
-
-
-
FIL_4
@@ -1001,22 +921,6 @@
-
-
-
-
-
-
FS_4
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_2
@@ -806,22 +758,6 @@
-
-
-
SEL_1
@@ -887,22 +823,6 @@
-
-
-
-
-
-
FS_2
@@ -429,22 +413,6 @@
-
-
-
SEL_1
@@ -525,22 +493,6 @@
-
-
-
-
-
-
FS_6
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_3
@@ -810,22 +762,6 @@
-
-
-
SEL_2
@@ -909,22 +845,6 @@
-
-
-
FIL_4
@@ -973,22 +893,6 @@
-
-
-
-
-
-
FS_3
@@ -450,22 +434,6 @@
-
-
-
SEL_2
@@ -613,22 +581,6 @@
-
-
-
FIL_4
@@ -725,22 +677,6 @@
-
-
-
-
-
-
FS_4
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_2
@@ -812,22 +764,6 @@
-
-
-
SEL_1
@@ -892,22 +828,6 @@
-
-
-
-
-
-
FS_2
@@ -522,22 +506,6 @@
-
-
-
SEL_1
@@ -618,22 +586,6 @@
-
-
-
-
-
-
FS_3
@@ -483,22 +467,6 @@
-
-
-
SEL_2
@@ -659,22 +627,6 @@
-
-
-
FIL_4
@@ -755,22 +707,6 @@
-
-
-
-
-
-
src2
@@ -678,22 +662,6 @@
-
-
-
-
-
-
src1
@@ -1007,22 +959,6 @@
-
-
-
-
-
-
FS_6
@@ -1487,22 +1407,6 @@
-
-
-
SEL_5
@@ -1701,22 +1605,6 @@
-
-
-
JOIN_4
diff --git ql/src/test/results/compiler/plan/join2.q.xml ql/src/test/results/compiler/plan/join2.q.xml
index b542194..efcb865 100644
--- ql/src/test/results/compiler/plan/join2.q.xml
+++ ql/src/test/results/compiler/plan/join2.q.xml
@@ -484,22 +484,6 @@
-
-
-
RS_6
@@ -541,22 +525,6 @@
-
-
-
-
-
-
src3
@@ -852,22 +804,6 @@
-
-
-
-
-
-
FS_10
@@ -1394,22 +1314,6 @@
-
-
-
SEL_9
@@ -1624,22 +1528,6 @@
-
-
-
JOIN_8
@@ -2157,22 +2045,6 @@
-
-
-
src2
@@ -2224,22 +2096,6 @@
-
-
-
-
-
-
src1
@@ -2543,22 +2383,6 @@
-
-
-
-
-
-
FS_11
@@ -3046,22 +2854,6 @@
-
-
-
JOIN_5
diff --git ql/src/test/results/compiler/plan/join3.q.xml ql/src/test/results/compiler/plan/join3.q.xml
index 016da40..9bbe64f 100644
--- ql/src/test/results/compiler/plan/join3.q.xml
+++ ql/src/test/results/compiler/plan/join3.q.xml
@@ -709,22 +709,6 @@
-
-
-
src2
@@ -776,22 +760,6 @@
-
-
-
-
-
-
src3
@@ -1132,22 +1084,6 @@
-
-
-
-
-
-
src1
@@ -1457,22 +1377,6 @@
-
-
-
-
-
-
FS_8
@@ -1940,22 +1828,6 @@
-
-
-
SEL_7
@@ -2188,22 +2060,6 @@
-
-
-
JOIN_6
diff --git ql/src/test/results/compiler/plan/join4.q.xml ql/src/test/results/compiler/plan/join4.q.xml
index 2bff440..f8a8f10 100644
--- ql/src/test/results/compiler/plan/join4.q.xml
+++ ql/src/test/results/compiler/plan/join4.q.xml
@@ -447,22 +447,6 @@
-
-
-
a
@@ -576,22 +560,6 @@
-
-
-
SEL_5
@@ -740,22 +708,6 @@
-
-
-
FIL_12
@@ -820,22 +772,6 @@
-
-
-
-
-
-
b
@@ -1207,22 +1127,6 @@
-
-
-
SEL_2
@@ -1363,22 +1267,6 @@
-
-
-
FIL_13
@@ -1443,22 +1331,6 @@
-
-
-
-
-
-
FS_11
@@ -1992,22 +1848,6 @@
-
-
-
SEL_9
@@ -2282,22 +2122,6 @@
-
-
-
JOIN_8
diff --git ql/src/test/results/compiler/plan/join5.q.xml ql/src/test/results/compiler/plan/join5.q.xml
index be8c7ab..d43ce00 100644
--- ql/src/test/results/compiler/plan/join5.q.xml
+++ ql/src/test/results/compiler/plan/join5.q.xml
@@ -447,22 +447,6 @@
-
-
-
a
@@ -576,22 +560,6 @@
-
-
-
SEL_5
@@ -740,22 +708,6 @@
-
-
-
FIL_12
@@ -820,22 +772,6 @@
-
-
-
-
-
-
b
@@ -1207,22 +1127,6 @@
-
-
-
SEL_2
@@ -1363,22 +1267,6 @@
-
-
-
FIL_13
@@ -1443,22 +1331,6 @@
-
-
-
-
-
-
FS_11
@@ -1992,22 +1848,6 @@
-
-
-
SEL_9
@@ -2278,22 +2118,6 @@
-
-
-
JOIN_8
diff --git ql/src/test/results/compiler/plan/join6.q.xml ql/src/test/results/compiler/plan/join6.q.xml
index 0d5e90d..a354e4b 100644
--- ql/src/test/results/compiler/plan/join6.q.xml
+++ ql/src/test/results/compiler/plan/join6.q.xml
@@ -447,22 +447,6 @@
-
-
-
a
@@ -576,22 +560,6 @@
-
-
-
SEL_5
@@ -740,22 +708,6 @@
-
-
-
FIL_12
@@ -820,22 +772,6 @@
-
-
-
-
-
-
b
@@ -1207,22 +1127,6 @@
-
-
-
SEL_2
@@ -1363,22 +1267,6 @@
-
-
-
FIL_13
@@ -1443,22 +1331,6 @@
-
-
-
-
-
-
FS_11
@@ -1992,22 +1848,6 @@
-
-
-
SEL_9
@@ -2285,22 +2125,6 @@
-
-
-
JOIN_8
diff --git ql/src/test/results/compiler/plan/join7.q.xml ql/src/test/results/compiler/plan/join7.q.xml
index d74e0e2..ac41995 100644
--- ql/src/test/results/compiler/plan/join7.q.xml
+++ ql/src/test/results/compiler/plan/join7.q.xml
@@ -583,22 +583,6 @@
-
-
-
a
@@ -712,22 +696,6 @@
-
-
-
SEL_8
@@ -876,22 +844,6 @@
-
-
-
FIL_16
@@ -956,22 +908,6 @@
-
-
-
-
-
-
b
@@ -1343,22 +1263,6 @@
-
-
-
SEL_2
@@ -1499,22 +1403,6 @@
-
-
-
FIL_17
@@ -1579,22 +1467,6 @@
-
-
-
-
-
-
c
@@ -1962,22 +1818,6 @@
-
-
-
SEL_5
@@ -2118,22 +1958,6 @@
-
-
-
FIL_18
@@ -2198,22 +2022,6 @@
-
-
-
-
-
-
FS_15
@@ -2822,22 +2614,6 @@
-
-
-
SEL_13
@@ -3226,22 +3002,6 @@
-
-
-
JOIN_12
diff --git ql/src/test/results/compiler/plan/join8.q.xml ql/src/test/results/compiler/plan/join8.q.xml
index 638ae63..569cf6e 100644
--- ql/src/test/results/compiler/plan/join8.q.xml
+++ ql/src/test/results/compiler/plan/join8.q.xml
@@ -447,22 +447,6 @@
-
-
-
a
@@ -576,22 +560,6 @@
-
-
-
SEL_5
@@ -781,22 +749,6 @@
-
-
-
FIL_14
@@ -861,22 +813,6 @@
-
-
-
-
-
-
b
@@ -1248,22 +1168,6 @@
-
-
-
SEL_2
@@ -1445,22 +1349,6 @@
-
-
-
FIL_15
@@ -1525,22 +1413,6 @@
-
-
-
-
-
-
FS_12
@@ -2078,22 +1934,6 @@
-
-
-
SEL_9
@@ -2213,22 +2053,6 @@
-
-
-
FIL_13
@@ -2491,22 +2315,6 @@
-
-
-
JOIN_8
diff --git ql/src/test/results/compiler/plan/sample1.q.xml ql/src/test/results/compiler/plan/sample1.q.xml
index 88a8a95..57b109c 100644
--- ql/src/test/results/compiler/plan/sample1.q.xml
+++ ql/src/test/results/compiler/plan/sample1.q.xml
@@ -242,22 +242,6 @@
-
-
-
FS_4
@@ -453,22 +437,6 @@
-
-
-
SEL_3
@@ -702,22 +670,6 @@
-
-
-
FIL_1
@@ -814,22 +766,6 @@
-
-
-
-
-
-
FS_5
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_3
@@ -831,22 +783,6 @@
-
-
-
SEL_2
@@ -1024,22 +960,6 @@
-
-
-
FIL_1
@@ -1104,22 +1024,6 @@
-
-
-
-
-
-
FS_5
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_3
@@ -831,22 +783,6 @@
-
-
-
SEL_2
@@ -1034,22 +970,6 @@
-
-
-
FIL_1
@@ -1114,22 +1034,6 @@
-
-
-
-
-
-
FS_5
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_3
@@ -831,22 +783,6 @@
-
-
-
SEL_2
@@ -1024,22 +960,6 @@
-
-
-
FIL_1
@@ -1104,22 +1024,6 @@
-
-
-
-
-
-
FS_5
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_3
@@ -831,22 +783,6 @@
-
-
-
SEL_2
@@ -1021,22 +957,6 @@
-
-
-
FIL_1
@@ -1101,22 +1021,6 @@
-
-
-
-
-
-
FS_5
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_3
@@ -831,22 +783,6 @@
-
-
-
SEL_2
@@ -1024,22 +960,6 @@
-
-
-
FIL_1
@@ -1104,22 +1024,6 @@
-
-
-
-
-
-
FS_7
@@ -230,22 +214,6 @@
-
-
-
-
-
-
FS_4
@@ -831,22 +783,6 @@
-
-
-
SEL_3
@@ -1069,22 +1005,6 @@
-
-
-
FIL_5
@@ -1149,22 +1069,6 @@
-
-
-
-
-
-
FS_7
@@ -167,22 +151,6 @@
-
-
-
-
-
-
FS_4
@@ -697,22 +649,6 @@
-
-
-
SEL_2
@@ -822,22 +758,6 @@
-
-
-
FIL_5
@@ -902,22 +822,6 @@
-
-
-
-
-
-
FS_3
@@ -1450,22 +1434,6 @@
-
-
-
SEL_2
@@ -1805,22 +1773,6 @@
-
-
-
FIL_4
@@ -1869,22 +1821,6 @@
-
-
-
-
-
-
FS_2
@@ -1379,22 +1363,6 @@
-
-
-
SEL_1
@@ -1731,22 +1699,6 @@
-
-
-
diff --git ql/src/test/results/compiler/plan/udf6.q.xml ql/src/test/results/compiler/plan/udf6.q.xml
index 2ea603c..204b95d 100644
--- ql/src/test/results/compiler/plan/udf6.q.xml
+++ ql/src/test/results/compiler/plan/udf6.q.xml
@@ -217,22 +217,6 @@
-
-
-
FS_2
@@ -407,22 +391,6 @@
-
-
-
SEL_1
@@ -487,22 +455,6 @@
-
-
-
diff --git ql/src/test/results/compiler/plan/udf_case.q.xml ql/src/test/results/compiler/plan/udf_case.q.xml
index 8975afb..0fb8129 100644
--- ql/src/test/results/compiler/plan/udf_case.q.xml
+++ ql/src/test/results/compiler/plan/udf_case.q.xml
@@ -221,22 +221,6 @@
-
-
-
FS_3
@@ -302,22 +286,6 @@
-
-
-
LIM_2
@@ -540,22 +508,6 @@
-
-
-
SEL_1
@@ -587,22 +539,6 @@
-
-
-
diff --git ql/src/test/results/compiler/plan/udf_when.q.xml ql/src/test/results/compiler/plan/udf_when.q.xml
index 69e38ba..cc55f60 100644
--- ql/src/test/results/compiler/plan/udf_when.q.xml
+++ ql/src/test/results/compiler/plan/udf_when.q.xml
@@ -221,22 +221,6 @@
-
-
-
FS_3
@@ -302,22 +286,6 @@
-
-
-
LIM_2
@@ -620,22 +588,6 @@
-
-
-
SEL_1
@@ -667,22 +619,6 @@
-
-
-
diff --git ql/src/test/results/compiler/plan/union.q.xml ql/src/test/results/compiler/plan/union.q.xml
index 45e8a16..6cab061 100644
--- ql/src/test/results/compiler/plan/union.q.xml
+++ ql/src/test/results/compiler/plan/union.q.xml
@@ -90,22 +90,6 @@
-
-
-
FS_12
@@ -167,22 +151,6 @@
-
-
-
-
-
-
FS_8
@@ -841,22 +793,6 @@
-
-
-
SEL_7
@@ -920,22 +856,6 @@
-
-
-
UNION_6
@@ -1012,22 +932,6 @@
-
-
-
SEL_5
@@ -1091,22 +995,6 @@
-
-
-
FIL_10
@@ -1131,22 +1019,6 @@
-
-
-
-
-
-
SEL_2
@@ -1529,22 +1385,6 @@
-
-
-
FIL_9
@@ -1609,22 +1449,6 @@
-
-
-