diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 32ab3d8..05f084c 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), @@ -839,6 +837,10 @@ // none, idonly, traverse, execution HIVESTAGEIDREARRANGE("hive.stageid.rearrange", "none"), HIVEEXPLAINDEPENDENCYAPPENDTASKTYPES("hive.explain.dependency.append.tasktype", false), + + HIVECOUNTERGROUP("hive.counters.group.name", "HIVE"), + HIVECOUNTERCREATEDFILES("hive.counters.created.files", "CREATED_FILES"), + HIVECOUNTERFATAL("hive.counters.fatal", "FATAL_ERROR") ; public final String varname; diff --git conf/hive-default.xml.template conf/hive-default.xml.template index c574ab5..e6d41b4 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 8aefb3b..1a02b7b 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 ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java index bad4f48..ca8ec02 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 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 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 91db713..660498d 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 row : work.getRowsComputedUsingStats()) { - operator.process(row, 0); + operator.processOp(row, 0); } operator.flush(); return true; @@ -515,7 +515,7 @@ public boolean pushRow() throws IOException, HiveException { } protected void pushRow(InspectableObject row) throws HiveException { - operator.process(row.o, 0); + operator.processOp(row.o, 0); } private transient final InspectableObject inspectable = new InspectableObject(); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java index 22f32ba..afea5ed 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java @@ -30,15 +30,15 @@ import java.util.Stack; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.FileUtils; -import org.apache.hadoop.hive.common.HiveStatsUtils; import org.apache.hadoop.hive.common.StatsSetupConst; import org.apache.hadoop.hive.ql.ErrorMsg; import org.apache.hadoop.hive.ql.io.FSRecordWriter; import org.apache.hadoop.hive.ql.io.FSRecordWriter.StatsProvidingRecordWriter; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.ql.metadata.HiveFatalException; import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils; import org.apache.hadoop.hive.ql.io.HiveKey; import org.apache.hadoop.hive.ql.io.HiveOutputFormat; @@ -62,7 +62,6 @@ import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.SubStructObjectInspector; -import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Writable; @@ -95,11 +94,15 @@ private transient boolean[] statsFromRecordWriter; private transient boolean isCollectRWStats; + /** + * RecordWriter. + * + */ + public static interface RecordWriter { + void write(Writable w) throws IOException; - private static final transient String[] FATAL_ERR_MSG = { - null, // counter value 0 means no error - "Number of dynamic partitions exceeded hive.exec.max.dynamic.partitions.pernode." - }; + void close(boolean abort) throws IOException; + } public class FSPaths implements Cloneable { Path tmpPath; @@ -519,7 +522,9 @@ protected void createBucketFiles(FSPaths fsp) throws HiveException { statsFromRecordWriter[filesIdx] = fsp.outWriters[filesIdx] instanceof StatsProvidingRecordWriter; // increment the CREATED_FILES counter if (reporter != null) { - reporter.incrCounter(ProgressCounter.CREATED_FILES, 1); + reporter.incrCounter(HiveConf.getVar(hconf, HiveConf.ConfVars.HIVECOUNTERGROUP), + HiveConf.getVar(hconf, HiveConf.ConfVars.HIVECOUNTERCREATEDFILES), + 1); } filesIdx++; } @@ -574,16 +579,6 @@ public void processOp(Object row, int tag) throws HiveException { } } - // Since File Sink is a terminal operator, forward is not called - so, - // maintain the number of output rows explicitly - if (counterNameToEnum != null) { - ++outputRows; - if (outputRows % 1000 == 0) { - incrCounter(numOutputRowsCntr, outputRows); - outputRows = 0; - } - } - try { updateProgress(); @@ -771,12 +766,10 @@ protected FSPaths getDynOutPaths(List row, String lbDirName) throws Hive if (fsp2 == null) { // check # of dp if (valToPaths.size() > maxPartitions) { - // throw fatal error - if (counterNameToEnum != null) { - incrCounter(fatalErrorCntr, 1); - } - fatalError = true; - LOG.error("Fatal error was thrown due to exceeding number of dynamic partitions"); + // we cannot proceed and need to tell the hive client that retries won't succeed either + throw new HiveFatalException( + ErrorMsg.DYNAMIC_PARTITIONS_TOO_MANY_PER_NODE_ERROR.getErrorCodedMsg() + + "Maximum was set to: " + maxPartitions); } fsp2 = createNewPaths(dpDir); } @@ -809,54 +802,6 @@ private String getDynPartDirectory(List row, List dpColNames, in return FileUtils.makePartName(dpColNames, row); } - @Override - protected void fatalErrorMessage(StringBuilder errMsg, long counterCode) { - errMsg.append("Operator ").append(getOperatorId()).append(" (id=").append(id).append("): "); - errMsg.append(counterCode > FATAL_ERR_MSG.length - 1 ? - "fatal error." : - FATAL_ERR_MSG[(int) counterCode]); - // number of partitions exceeds limit, list all the partition names - if (counterCode > 0) { - errMsg.append(lsDir()); - } - } - - // sample the partitions that are generated so that users have a sense of what's causing the error - private String lsDir() { - String specPath = conf.getDirName(); - // need to get a JobConf here because it's not passed through at client side - JobConf jobConf = new JobConf(); - Path tmpPath = Utilities.toTempPath(specPath); - StringBuilder sb = new StringBuilder("\n"); - try { - DynamicPartitionCtx dpCtx = conf.getDynPartCtx(); - int numDP = dpCtx.getNumDPCols(); - FileSystem fs = tmpPath.getFileSystem(jobConf); - int level = numDP; - if (conf.isLinkedFileSink()) { - level++; - } - FileStatus[] status = HiveStatsUtils.getFileStatusRecurse(tmpPath, level, fs); - sb.append("Sample of ") - .append(Math.min(status.length, 100)) - .append(" partitions created under ") - .append(tmpPath.toString()) - .append(":\n"); - for (int i = 0; i < status.length; ++i) { - sb.append("\t.../"); - sb.append(getPartitionSpec(status[i].getPath(), numDP)) - .append("\n"); - } - sb.append("...\n"); - } catch (Exception e) { - // cannot get the subdirectories, just return the root directory - sb.append(tmpPath).append("...\n").append(e.getMessage()); - e.printStackTrace(); - } finally { - return sb.toString(); - } - } - private String getPartitionSpec(Path path, int level) { Stack st = new Stack(); Path p = path; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java index 7d05982..81b65b8 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java @@ -1112,12 +1112,6 @@ public void flush() throws HiveException{ public void closeOp(boolean abort) throws HiveException { if (!abort) { try { - // put the hash related stats in statsMap if applicable, so that they - // are sent to jt as counters - if (hashAggr && counterNameToEnum != null) { - incrCounter(counterNameHashOut, numRowsHashTbl); - } - // If there is no grouping key and no row came to this operator if (firstRow && (keyFields.length == 0)) { firstRow = false; @@ -1153,13 +1147,6 @@ public void closeOp(boolean abort) throws HiveException { } } - @Override - protected List getAdditionalCounters() { - List ctrList = new ArrayList(); - ctrList.add(getWrappedCounterName(counterNameHashOut)); - return ctrList; - } - // Group by contains the columns needed - no need to aggregate from children public List genColLists( HashMap, OpParseContext> opParseCtx) { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java index 4f35511..4b21f4c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java @@ -48,14 +48,10 @@ * Map side Join operator implementation. */ public class MapJoinOperator extends AbstractMapJoinOperator implements Serializable { + private static final long serialVersionUID = 1L; private static final Log LOG = LogFactory.getLog(MapJoinOperator.class.getName()); - 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."}; - protected transient MapJoinTableContainer[] mapJoinTables; private transient MapJoinTableContainerSerDe[] mapJoinTableSerdes; private transient boolean hashTblInitedOnce; @@ -77,12 +73,6 @@ protected void initializeOp(Configuration hconf) throws HiveException { hashTblInitedOnce = false; } - @Override - protected void fatalErrorMessage(StringBuilder errMsg, long counterCode) { - errMsg.append("Operator " + getOperatorId() + " (id=" + id + "): " - + FATAL_ERR_MSG[(int) counterCode]); - } - public void generateMapMetaData() throws HiveException, SerDeException { // generate the meta data for key // index for key is -1 diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/MuxOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/MuxOperator.java index d5989ef..6870342 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/MuxOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/MuxOperator.java @@ -243,11 +243,11 @@ public void processOp(Object row, int tag) throws HiveException { } else { if (forward[tag]) { // No need to evaluate, just forward it. - child.process(row, tag); + child.processOp(row, tag); } else { // Call the corresponding handler to evaluate this row and // forward the result - child.process(handlers[tag].process(row), handlers[tag].getTag()); + child.processOp(handlers[tag].process(row), handlers[tag].getTag()); } } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java index 3b9a653..258d9df 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; import org.apache.hadoop.io.LongWritable; -import org.apache.hadoop.mapred.Counters; +import org.apache.hadoop.mapred.OutputCollector; import org.apache.hadoop.mapred.Reporter; /** @@ -61,20 +61,6 @@ protected List> childOperators; protected List> parentOperators; protected String operatorId; - /** - * List of counter names associated with the operator. It contains the - * following default counters NUM_INPUT_ROWS NUM_OUTPUT_ROWS TIME_TAKEN - * Individual operators can add to this list via addToCounterNames methods. - */ - protected ArrayList counterNames; - - /** - * Each operator has its own map of its counter names to disjoint - * ProgressCounter - it is populated at compile time and is read in at - * run-time while extracting the operator specific counts. - */ - protected HashMap counterNameToEnum; - private transient ExecMapperContext execContext; private static AtomicInteger seqId; @@ -96,13 +82,10 @@ // to children. Note: close() being called and its state being CLOSE is // difference since close() could be called but state is not CLOSE if // one of its parent is not in state CLOSE.. - }; + } protected transient State state = State.UNINIT; - protected static transient boolean fatalError = false; // fatalError is shared acorss - // all operators - static { seqId = new AtomicInteger(0); } @@ -111,6 +94,7 @@ public Operator() { id = String.valueOf(seqId.getAndIncrement()); + initOperatorId(); } public static void resetId() { @@ -187,10 +171,30 @@ public T getConf() { } public boolean getDone() { - return done || fatalError; + return done; + } + + private void setChildIsDone(Operator op) { + removeChildFromProcessing(op); + if (childOperatorsArray.length == 0) { + setDone(true); + } } - public void setDone(boolean done) { + @SuppressWarnings("unchecked") + protected final void setDone(boolean done) { + if (done && !this.done) { + // no more forwarding + childOperatorsArray = new Operator[0]; + childOperatorsTag = new int[0]; + + // tell parents we're done + if (getParentOperators() != null) { + for (Operator op: getParentOperators()) { + op.setChildIsDone(this); + } + } + } this.done = done; } @@ -208,6 +212,8 @@ public RowSchema getSchema() { // non-bean .. protected transient HashMap, LongWritable> statsMap = new HashMap, LongWritable>(); + @SuppressWarnings("rawtypes") + protected transient OutputCollector out; protected transient Log LOG = LogFactory.getLog(this.getClass().getName()); protected transient boolean isLogInfoEnabled = LOG.isInfoEnabled(); protected transient String alias; @@ -253,6 +259,20 @@ public void setReporter(Reporter rep) { } } + @SuppressWarnings("rawtypes") + public void setOutputCollector(OutputCollector out) { + this.out = out; + + // the collector is same across all operators + if (childOperators == null) { + return; + } + + for (Operator op : childOperators) { + op.setOutputCollector(out); + } + } + /** * Store the alias this operator is working on behalf of. */ @@ -308,6 +328,7 @@ protected boolean areAllParentsInitialized() { * ignored. * @throws HiveException */ + @SuppressWarnings("unchecked") public void initialize(Configuration hconf, ObjectInspector[] inputOIs) throws HiveException { if (state == State.INIT) { @@ -347,6 +368,9 @@ public void initialize(Configuration hconf, ObjectInspector[] inputOIs) "Hive internal error: cannot find parent in the child operator!"); } } + } else { + childOperatorsArray = new Operator[0]; + childOperatorsTag = new int[0]; } if (inputObjInspectors.length == 0) { @@ -457,38 +481,6 @@ public void setInputObjInspectors(ObjectInspector[] inputObjInspectors) { */ public abstract void processOp(Object row, int tag) throws HiveException; - /** - * Process the row. - * - * @param row - * The object representing the row. - * @param tag - * The tag of the row usually means which parent this row comes from. - * Rows with the same tag should have exactly the same rowInspector - * all the time. - */ - public void process(Object row, int tag) throws HiveException { - if (fatalError) { - return; - } - - if (counterNameToEnum != null) { - inputRows++; - if ((inputRows % 1000) == 0) { - incrCounter(numInputRowsCntr, inputRows); - incrCounter(timeTakenCntr, totalTime); - inputRows = 0; - totalTime = 0; - } - - beginTime = System.currentTimeMillis(); - processOp(row, tag); - totalTime += (System.currentTimeMillis() - beginTime); - } else { - processOp(row, tag); - } - } - // If a operator wants to do some work at the beginning of a group public void startGroup() throws HiveException { LOG.debug("Starting group"); @@ -497,10 +489,6 @@ public void startGroup() throws HiveException { return; } - if (fatalError) { - return; - } - LOG.debug("Starting group for children:"); for (Operator op : childOperators) { op.startGroup(); @@ -517,10 +505,6 @@ public void endGroup() throws HiveException { return; } - if (fatalError) { - return; - } - LOG.debug("Ending group for children:"); for (Operator op : childOperators) { op.endGroup(); @@ -579,14 +563,6 @@ public void close(boolean abort) throws HiveException { // call the operator specific close routine closeOp(abort); - if (counterNameToEnum != null) { - incrCounter(numInputRowsCntr, inputRows); - incrCounter(numOutputRowsCntr, outputRows); - incrCounter(timeTakenCntr, totalTime); - } - - LOG.info(id + " forwarded " + cntr + " rows"); - try { logStats(); if (childOperators == null) { @@ -651,10 +627,6 @@ public void jobClose(Configuration conf, boolean success, JobCloseFeedBack feedB protected transient Operator[] childOperatorsArray = null; protected transient int[] childOperatorsTag; - // counters for debugging - private transient long cntr = 0; - private transient long nextCntr = 1; - /** * Replace one child with another at the same position. The parent of the * child is not changed @@ -671,6 +643,22 @@ public void replaceChild(Operator child, childOperators.set(childIndex, newChild); } + private void removeChildFromProcessing(Operator op) { + @SuppressWarnings("unchecked") + Operator[] processingArray = new Operator[childOperatorsArray.length-1]; + int[] processingTags = new int[childOperatorsArray.length-1]; + int p = 0, q = 0; + for (; p < childOperatorsArray.length; ++p) { + if (childOperatorsArray[p] != op) { + processingArray[q] = childOperatorsArray[p]; + processingTags[q] = childOperatorsTag[p]; + ++q; + } + } + childOperatorsArray = processingArray; + childOperatorsTag = processingTags; + } + public void removeChild(Operator child) { int childIndex = childOperators.indexOf(child); assert childIndex != -1; @@ -793,55 +781,8 @@ protected long getNextCntr(long cntr) { protected void forward(Object row, ObjectInspector rowInspector) throws HiveException { - if (counterNameToEnum != null) { - if ((++outputRows % 1000) == 0) { - incrCounter(numOutputRowsCntr, outputRows); - outputRows = 0; - } - } - - increaseForward(1); - - // For debugging purposes: - // System.out.println("" + this.getClass() + ": " + - // SerDeUtils.getJSONString(row, rowInspector)); - // System.out.println("" + this.getClass() + ">> " + - // ObjectInspectorUtils.getObjectInspectorName(rowInspector)); - - if (childOperatorsArray == null && childOperators != null) { - throw new HiveException( - "Internal Hive error during operator initialization."); - } - - if ((childOperatorsArray == null) || (getDone())) { - return; - } - - int childrenDone = 0; for (int i = 0; i < childOperatorsArray.length; i++) { - Operator o = childOperatorsArray[i]; - if (o.getDone()) { - childrenDone++; - } else { - o.process(row, childOperatorsTag[i]); - } - } - - // if all children are done, this operator is also done - if (childrenDone == childOperatorsArray.length) { - setDone(true); - } - } - - void increaseForward(long counter) { - if (isLogInfoEnabled) { - cntr += counter; - if (cntr >= nextCntr) { - LOG.info(id + " forwarding " + cntr + " rows"); - do { - nextCntr = getNextCntr(nextCntr); - } while(cntr >= nextCntr); - } + childOperatorsArray[i].processOp(row, childOperatorsTag[i]); } } @@ -1005,174 +946,12 @@ protected static StructObjectInspector initEvaluatorsAndReturnStruct( outputColName, Arrays.asList(fieldObjectInspectors)); } - /** - * All counter stuff below this - */ - - /** - * TODO This is a hack for hadoop 0.17 which only supports enum counters. - */ - public static enum ProgressCounter { - CREATED_FILES, - C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, - C11, C12, C13, C14, C15, C16, C17, C18, C19, C20, - C21, C22, C23, C24, C25, C26, C27, C28, C29, C30, - C31, C32, C33, C34, C35, C36, C37, C38, C39, C40, - C41, C42, C43, C44, C45, C46, C47, C48, C49, C50, - C51, C52, C53, C54, C55, C56, C57, C58, C59, C60, - C61, C62, C63, C64, C65, C66, C67, C68, C69, C70, - C71, C72, C73, C74, C75, C76, C77, C78, C79, C80, - C81, C82, C83, C84, C85, C86, C87, C88, C89, C90, - C91, C92, C93, C94, C95, C96, C97, C98, C99, C100, - C101, C102, C103, C104, C105, C106, C107, C108, C109, C110, - C111, C112, C113, C114, C115, C116, C117, C118, C119, C120, - C121, C122, C123, C124, C125, C126, C127, C128, C129, C130, - C131, C132, C133, C134, C135, C136, C137, C138, C139, C140, - C141, C142, C143, C144, C145, C146, C147, C148, C149, C150, - C151, C152, C153, C154, C155, C156, C157, C158, C159, C160, - C161, C162, C163, C164, C165, C166, C167, C168, C169, C170, - C171, C172, C173, C174, C175, C176, C177, C178, C179, C180, - C181, C182, C183, C184, C185, C186, C187, C188, C189, C190, - C191, C192, C193, C194, C195, C196, C197, C198, C199, C200, - C201, C202, C203, C204, C205, C206, C207, C208, C209, C210, - C211, C212, C213, C214, C215, C216, C217, C218, C219, C220, - C221, C222, C223, C224, C225, C226, C227, C228, C229, C230, - C231, C232, C233, C234, C235, C236, C237, C238, C239, C240, - C241, C242, C243, C244, C245, C246, C247, C248, C249, C250, - C251, C252, C253, C254, C255, C256, C257, C258, C259, C260, - C261, C262, C263, C264, C265, C266, C267, C268, C269, C270, - C271, C272, C273, C274, C275, C276, C277, C278, C279, C280, - C281, C282, C283, C284, C285, C286, C287, C288, C289, C290, - C291, C292, C293, C294, C295, C296, C297, C298, C299, C300, - C301, C302, C303, C304, C305, C306, C307, C308, C309, C310, - C311, C312, C313, C314, C315, C316, C317, C318, C319, C320, - C321, C322, C323, C324, C325, C326, C327, C328, C329, C330, - C331, C332, C333, C334, C335, C336, C337, C338, C339, C340, - C341, C342, C343, C344, C345, C346, C347, C348, C349, C350, - C351, C352, C353, C354, C355, C356, C357, C358, C359, C360, - C361, C362, C363, C364, C365, C366, C367, C368, C369, C370, - C371, C372, C373, C374, C375, C376, C377, C378, C379, C380, - C381, C382, C383, C384, C385, C386, C387, C388, C389, C390, - C391, C392, C393, C394, C395, C396, C397, C398, C399, C400, - C401, C402, C403, C404, C405, C406, C407, C408, C409, C410, - C411, C412, C413, C414, C415, C416, C417, C418, C419, C420, - C421, C422, C423, C424, C425, C426, C427, C428, C429, C430, - C431, C432, C433, C434, C435, C436, C437, C438, C439, C440, - C441, C442, C443, C444, C445, C446, C447, C448, C449, C450, - C451, C452, C453, C454, C455, C456, C457, C458, C459, C460, - C461, C462, C463, C464, C465, C466, C467, C468, C469, C470, - C471, C472, C473, C474, C475, C476, C477, C478, C479, C480, - C481, C482, C483, C484, C485, C486, C487, C488, C489, C490, - C491, C492, C493, C494, C495, C496, C497, C498, C499, C500, - C501, C502, C503, C504, C505, C506, C507, C508, C509, C510, - C511, C512, C513, C514, C515, C516, C517, C518, C519, C520, - C521, C522, C523, C524, C525, C526, C527, C528, C529, C530, - C531, C532, C533, C534, C535, C536, C537, C538, C539, C540, - C541, C542, C543, C544, C545, C546, C547, C548, C549, C550, - C551, C552, C553, C554, C555, C556, C557, C558, C559, C560, - C561, C562, C563, C564, C565, C566, C567, C568, C569, C570, - C571, C572, C573, C574, C575, C576, C577, C578, C579, C580, - C581, C582, C583, C584, C585, C586, C587, C588, C589, C590, - C591, C592, C593, C594, C595, C596, C597, C598, C599, C600, - C601, C602, C603, C604, C605, C606, C607, C608, C609, C610, - C611, C612, C613, C614, C615, C616, C617, C618, C619, C620, - C621, C622, C623, C624, C625, C626, C627, C628, C629, C630, - C631, C632, C633, C634, C635, C636, C637, C638, C639, C640, - C641, C642, C643, C644, C645, C646, C647, C648, C649, C650, - C651, C652, C653, C654, C655, C656, C657, C658, C659, C660, - C661, C662, C663, C664, C665, C666, C667, C668, C669, C670, - C671, C672, C673, C674, C675, C676, C677, C678, C679, C680, - C681, C682, C683, C684, C685, C686, C687, C688, C689, C690, - C691, C692, C693, C694, C695, C696, C697, C698, C699, C700, - C701, C702, C703, C704, C705, C706, C707, C708, C709, C710, - C711, C712, C713, C714, C715, C716, C717, C718, C719, C720, - C721, C722, C723, C724, C725, C726, C727, C728, C729, C730, - C731, C732, C733, C734, C735, C736, C737, C738, C739, C740, - C741, C742, C743, C744, C745, C746, C747, C748, C749, C750, - C751, C752, C753, C754, C755, C756, C757, C758, C759, C760, - C761, C762, C763, C764, C765, C766, C767, C768, C769, C770, - C771, C772, C773, C774, C775, C776, C777, C778, C779, C780, - C781, C782, C783, C784, C785, C786, C787, C788, C789, C790, - C791, C792, C793, C794, C795, C796, C797, C798, C799, C800, - C801, C802, C803, C804, C805, C806, C807, C808, C809, C810, - C811, C812, C813, C814, C815, C816, C817, C818, C819, C820, - C821, C822, C823, C824, C825, C826, C827, C828, C829, C830, - C831, C832, C833, C834, C835, C836, C837, C838, C839, C840, - C841, C842, C843, C844, C845, C846, C847, C848, C849, C850, - C851, C852, C853, C854, C855, C856, C857, C858, C859, C860, - C861, C862, C863, C864, C865, C866, C867, C868, C869, C870, - C871, C872, C873, C874, C875, C876, C877, C878, C879, C880, - C881, C882, C883, C884, C885, C886, C887, C888, C889, C890, - C891, C892, C893, C894, C895, C896, C897, C898, C899, C900, - C901, C902, C903, C904, C905, C906, C907, C908, C909, C910, - C911, C912, C913, C914, C915, C916, C917, C918, C919, C920, - C921, C922, C923, C924, C925, C926, C927, C928, C929, C930, - C931, C932, C933, C934, C935, C936, C937, C938, C939, C940, - C941, C942, C943, C944, C945, C946, C947, C948, C949, C950, - C951, C952, C953, C954, C955, C956, C957, C958, C959, C960, - C961, C962, C963, C964, C965, C966, C967, C968, C969, C970, - C971, C972, C973, C974, C975, C976, C977, C978, C979, C980, - C981, C982, C983, C984, C985, C986, C987, C988, C989, C990, - C991, C992, C993, C994, C995, C996, C997, C998, C999, C1000 - }; - - private static int totalNumCntrs = 1000; - - /** - * populated at runtime from hadoop counters at run time in the client. - */ - protected transient HashMap counters; - - /** - * keeps track of unique ProgressCounter enums used this value is used at - * compile time while assigning ProgressCounter enums to counter names. - */ - private static int lastEnumUsed; - - protected transient long inputRows = 0; - protected transient long outputRows = 0; - protected transient long beginTime = 0; - protected transient long totalTime = 0; - protected transient Object groupKeyObject; - /** - * this is called in operators in map or reduce tasks. - * - * @param name - * @param amount - */ - protected void incrCounter(String name, long amount) { - String counterName = getWrappedCounterName(name); - ProgressCounter pc = counterNameToEnum.get(counterName); - - // Currently, we maintain fixed number of counters per plan - in case of a - // bigger tree, we may run out of them - if (pc == null) { - LOG - .warn("Using too many counters. Increase the total number of counters for " - + counterName); - } else if (reporter != null) { - reporter.incrCounter(pc, amount); - } - } - - public ArrayList getCounterNames() { - return counterNames; - } - - public void setCounterNames(ArrayList counterNames) { - this.counterNames = counterNames; - } - public String getOperatorId() { return operatorId; } - public final String getWrappedCounterName(String ctrName) { - return String.format(counterNameFormat, getOperatorId(), ctrName); - } - public void initOperatorId() { setOperatorId(getName() + "_" + this.id); } @@ -1181,145 +960,6 @@ public void setOperatorId(String operatorId) { this.operatorId = operatorId; } - public HashMap getCounters() { - return counters; - } - - /** - * called in ExecDriver.progress periodically. - * - * @param ctrs - * counters from the running job - */ - @SuppressWarnings("unchecked") - public void updateCounters(Counters ctrs) { - if (counters == null) { - counters = new HashMap(); - } - - // For some old unit tests, the counters will not be populated. Eventually, - // the old tests should be removed - if (counterNameToEnum == null) { - return; - } - - for (Map.Entry counter : counterNameToEnum - .entrySet()) { - counters.put(counter.getKey(), ctrs.getCounter(counter.getValue())); - } - // update counters of child operators - // this wont be an infinite loop since the operator graph is acyclic - // but, some operators may be updated more than once and that's ok - if (getChildren() != null) { - for (Node op : getChildren()) { - ((Operator) op).updateCounters(ctrs); - } - } - } - - /** - * Recursively check this operator and its descendants to see if the fatal - * error counter is set to non-zero. - * - * @param ctrs - */ - public boolean checkFatalErrors(Counters ctrs, StringBuilder errMsg) { - if (counterNameToEnum == null) { - return false; - } - - String counterName = getWrappedCounterName(fatalErrorCntr); - ProgressCounter pc = counterNameToEnum.get(counterName); - - // Currently, we maintain fixed number of counters per plan - in case of a - // bigger tree, we may run out of them - if (pc == null) { - LOG - .warn("Using too many counters. Increase the total number of counters for " - + counterName); - } else { - long value = ctrs.getCounter(pc); - fatalErrorMessage(errMsg, value); - if (value != 0) { - return true; - } - } - - if (getChildren() != null) { - for (Node op : getChildren()) { - if (((Operator) op).checkFatalErrors(ctrs, - errMsg)) { - return true; - } - } - } - return false; - } - - /** - * Get the fatal error message based on counter's code. - * - * @param errMsg - * error message should be appended to this output parameter. - * @param counterValue - * input counter code. - */ - protected void fatalErrorMessage(StringBuilder errMsg, long counterValue) { - } - - // A given query can have multiple map-reduce jobs - public static void resetLastEnumUsed() { - lastEnumUsed = 0; - } - - /** - * Called only in SemanticAnalyzer after all operators have added their own - * set of counter names. - */ - public void assignCounterNameToEnum() { - if (counterNameToEnum != null) { - return; - } - counterNameToEnum = new HashMap(); - for (String counterName : getCounterNames()) { - ++lastEnumUsed; - - // TODO Hack for hadoop-0.17 - // Currently, only maximum number of 'totalNumCntrs' can be used. If you - // want - // to add more counters, increase the number of counters in - // ProgressCounter - if (lastEnumUsed > totalNumCntrs) { - LOG - .warn("Using too many counters. Increase the total number of counters"); - return; - } - String enumName = "C" + lastEnumUsed; - ProgressCounter ctr = ProgressCounter.valueOf(enumName); - counterNameToEnum.put(counterName, ctr); - } - } - - protected static String numInputRowsCntr = "NUM_INPUT_ROWS"; - protected static String numOutputRowsCntr = "NUM_OUTPUT_ROWS"; - protected static String timeTakenCntr = "TIME_TAKEN"; - protected static String fatalErrorCntr = "FATAL_ERROR"; - private static String counterNameFormat = "CNTR_NAME_%s_%s"; - - public void initializeCounters() { - initOperatorId(); - counterNames = new ArrayList(); - counterNames.add(getWrappedCounterName(numInputRowsCntr)); - counterNames.add(getWrappedCounterName(numOutputRowsCntr)); - counterNames.add(getWrappedCounterName(timeTakenCntr)); - counterNames.add(getWrappedCounterName(fatalErrorCntr)); - /* getAdditionalCounter should return Wrapped counters */ - List newCntrs = getAdditionalCounters(); - if (newCntrs != null) { - counterNames.addAll(newCntrs); - } - } - /* * By default, the list is empty - if an operator wants to add more counters, * it should override this method and provide the new list. Counter names returned @@ -1330,15 +970,6 @@ public void initializeCounters() { return null; } - public HashMap getCounterNameToEnum() { - return counterNameToEnum; - } - - public void setCounterNameToEnum( - HashMap counterNameToEnum) { - this.counterNameToEnum = counterNameToEnum; - } - /** * Return the type of the specific operator among the * types in OperatorType. @@ -1412,10 +1043,10 @@ public boolean supportSkewJoinOptimization() { } } + @SuppressWarnings("unchecked") T descClone = (T)conf.clone(); Operator ret = - (Operator) OperatorFactory.getAndMakeChild( - descClone, getSchema(), parentClones); + OperatorFactory.getAndMakeChild(descClone, getSchema(), parentClones); return ret; } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorFactory.java ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorFactory.java index 4da0ec3..24a812d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorFactory.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorFactory.java @@ -137,7 +137,6 @@ public OpTuple(Class descClass, Class> opClass) { Operator op = (Operator) o.opClass.getDeclaredConstructor( VectorizationContext.class, OperatorDesc.class).newInstance( vContext, conf); - op.initializeCounters(); return op; } catch (Exception e) { e.printStackTrace(); @@ -155,7 +154,6 @@ public OpTuple(Class descClass, Class> opClass) { if (o.descClass == opClass) { try { Operator op = (Operator) o.opClass.newInstance(); - op.initializeCounters(); return op; } catch (Exception e) { e.printStackTrace(); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java index 49e208a..c378dc7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java @@ -363,13 +363,6 @@ protected void collect(BytesWritable keyWritable, Writable valueWritable) throws if (null != out) { out.collect(keyWritable, valueWritable); } - if (++outputRows % 1000 == 0) { - if (counterNameToEnum != null) { - incrCounter(numOutputRowsCntr, outputRows); - } - increaseForward(outputRows); - outputRows = 0; - } } private BytesWritable makeValueWritable(Object row) throws Exception { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java index e7c9dd7..81a1232 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java @@ -550,7 +550,7 @@ private void fetchOneRow(byte tag) { fetchDone[tag] = true; return; } - forwardOp.process(row.o, tag); + forwardOp.processOp(row.o, tag); // check if any operator had a fatal error or early exit during // execution if (forwardOp.getDone()) { @@ -795,7 +795,7 @@ private boolean next(Integer current) throws IOException, HiveException { // Pass the row though the operator tree. It is guaranteed that not more than 1 row can // be produced from a input row. - forwardOp.process(nextRow.o, 0); + forwardOp.processOp(nextRow.o, 0); nextRow = sinkOp.getResult(); // It is possible that the row got absorbed in the operator tree. diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index 27c616f..ae0004e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -789,7 +789,6 @@ public void exceptionThrown(Exception e) { // workaround for java 1.5 e.setPersistenceDelegate(ExpressionTypes.class, new EnumDelegate()); e.setPersistenceDelegate(GroupByDesc.Mode.class, new EnumDelegate()); - e.setPersistenceDelegate(Operator.ProgressCounter.class, new EnumDelegate()); e.setPersistenceDelegate(java.sql.Date.class, new DatePersistenceDelegate()); e.setPersistenceDelegate(Timestamp.class, new TimestampPersistenceDelegate()); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java index 93c8141..27506de 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java @@ -185,17 +185,10 @@ public ExecDriver(MapredWork plan, JobConf job, boolean isSilent) throws HiveExc * @return true if fatal errors happened during job execution, false otherwise. */ public boolean checkFatalErrors(Counters ctrs, StringBuilder errMsg) { - for (Operator op : work.getMapWork().getAliasToWork().values()) { - if (op.checkFatalErrors(ctrs, errMsg)) { - return true; - } - } - if (work.getReduceWork() != null) { - if (work.getReduceWork().getReducer().checkFatalErrors(ctrs, errMsg)) { - return true; - } - } - return false; + Counters.Counter cntr = ctrs.findCounter( + HiveConf.getVar(job, HiveConf.ConfVars.HIVECOUNTERGROUP), + HiveConf.getVar(job, HiveConf.ConfVars.HIVECOUNTERFATAL)); + return cntr != null && cntr.getValue() > 0; } /** @@ -816,16 +809,6 @@ public String getName() { } @Override - public void updateCounters(Counters ctrs, RunningJob rj) throws IOException { - for (Operator op : work.getMapWork().getAliasToWork().values()) { - op.updateCounters(ctrs); - } - if (work.getReduceWork() != null) { - work.getReduceWork().getReducer().updateCounters(ctrs); - } - } - - @Override public void logPlanProgress(SessionState ss) throws IOException { ss.getHiveHistory().logPlanProgress(queryPlan); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java index 12be0d5..c1ad5c9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java @@ -245,7 +245,7 @@ public void reduce(Object key, Iterator values, OutputCollector output, } } try { - reducer.process(row, tag); + reducer.processOp(row, tag); } catch (Exception e) { String rowString = null; try { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java index 2868d0f..7942d98 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java @@ -34,8 +34,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.JavaUtils; import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.ql.MapRedStats; -import org.apache.hadoop.hive.ql.exec.Operator.ProgressCounter; import org.apache.hadoop.hive.ql.exec.Task; import org.apache.hadoop.hive.ql.exec.TaskHandle; import org.apache.hadoop.hive.ql.exec.Utilities; @@ -80,14 +80,6 @@ private void updateCounters(Counters ctrs, RunningJob rj) throws IOException { reduceProgress = reduceProgress == 100 ? (int)Math.floor(rj.reduceProgress() * 100) : reduceProgress; task.taskCounters.put("CNTR_NAME_" + task.getId() + "_MAP_PROGRESS", Long.valueOf(mapProgress)); task.taskCounters.put("CNTR_NAME_" + task.getId() + "_REDUCE_PROGRESS", Long.valueOf(reduceProgress)); - if (ctrs == null) { - // hadoop might return null if it cannot locate the job. - // we may still be able to retrieve the job status - so ignore - return; - } - if(callBackObj != null) { - callBackObj.updateCounters(ctrs, rj); - } } /** @@ -198,6 +190,7 @@ public static void killRunningJobs() { } } + @SuppressWarnings("deprecation") public boolean checkFatalErrors(Counters ctrs, StringBuilder errMsg) { if (ctrs == null) { // hadoop might return null if it cannot locate the job. @@ -205,7 +198,9 @@ public boolean checkFatalErrors(Counters ctrs, StringBuilder errMsg) { return false; } // check for number of created files - long numFiles = ctrs.getCounter(ProgressCounter.CREATED_FILES); + Counters.Counter cntr = ctrs.findCounter(HiveConf.getVar(job, ConfVars.HIVECOUNTERGROUP), + HiveConf.getVar(job, ConfVars.HIVECOUNTERCREATEDFILES)); + long numFiles = cntr != null ? cntr.getValue() : 0; long upperLimit = HiveConf.getLongVar(job, HiveConf.ConfVars.MAXCREATEDFILES); if (numFiles > upperLimit) { errMsg.append("total number of created files now is " + numFiles + ", which exceeds ").append(upperLimit); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHook.java ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHook.java index 02ff977..bb501c6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHook.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHook.java @@ -22,12 +22,10 @@ import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.mapred.Counters; -import org.apache.hadoop.mapred.RunningJob; @SuppressWarnings("deprecation") public interface HadoopJobExecHook { - public void updateCounters(Counters ctrs, RunningJob rj) throws IOException; public boolean checkFatalErrors(Counters ctrs, StringBuilder errMsg); public void logPlanProgress(SessionState ss) throws IOException; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java index 540a9a1..ec92753 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java @@ -359,7 +359,7 @@ private void startForward(boolean inputFileChangeSenstive, String bigTableBucket forwardOp.close(false); break; } - forwardOp.process(row.o, 0); + forwardOp.processOp(row.o, 0); // check if any operator had a fatal error or early exit during // execution if (forwardOp.getDone()) { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFileSinkOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFileSinkOperator.java index fb12c11..edbbbec 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFileSinkOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFileSinkOperator.java @@ -98,16 +98,6 @@ public void processOp(Object data, int tag) throws HiveException { } } - // Since File Sink is a terminal operator, forward is not called - so, - // maintain the number of output rows explicitly - if (counterNameToEnum != null) { - ++outputRows; - if (outputRows % 1000 == 0) { - incrCounter(numOutputRowsCntr, outputRows); - outputRows = 0; - } - } - try { updateProgress(); diff --git ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/BlockMergeTask.java ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/BlockMergeTask.java index ffffae6..07db524 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/BlockMergeTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/BlockMergeTask.java @@ -372,10 +372,5 @@ public boolean checkFatalErrors(Counters ctrs, StringBuilder errMsg) { @Override public void logPlanProgress(SessionState ss) throws IOException { // no op - } - - @Override - public void updateCounters(Counters ctrs, RunningJob rj) throws IOException { - // no op - } + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java index 403ee10..ca0ed75 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java @@ -377,9 +377,4 @@ public boolean checkFatalErrors(Counters ctrs, StringBuilder errMsg) { public void logPlanProgress(SessionState ss) throws IOException { // no op } - - @Override - public void updateCounters(Counters ctrs, RunningJob rj) throws IOException { - // no op - } } diff --git ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java index e192d7b..80f5baf 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java @@ -252,9 +252,4 @@ public boolean checkFatalErrors(Counters ctrs, StringBuilder errMsg) { public void logPlanProgress(SessionState ss) throws IOException { // no op } - - @Override - public void updateCounters(Counters ctrs, RunningJob rj) throws IOException { - // no op - } } diff --git ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveFatalException.java ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveFatalException.java new file mode 100644 index 0000000..e462199 --- /dev/null +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveFatalException.java @@ -0,0 +1,38 @@ +/** + * 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.metadata; + +public class HiveFatalException extends HiveException { + + public HiveFatalException() { + } + + public HiveFatalException(String message) { + super(message); + } + + public HiveFatalException(Throwable cause) { + super(cause); + } + + public HiveFatalException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java index e67d73d..aa9d555 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java @@ -299,13 +299,6 @@ public void compile(final ParseContext pCtx, final List rootTask : rootTasks) { - generateCountersTask(rootTask); - } - } - decideExecMode(rootTasks, ctx, globalLimitCtx); if (qb.isCTAS()) { @@ -396,55 +389,6 @@ private void setInputFormat(Task task) { } } - // loop over all the tasks recursively - private void generateCountersTask(Task task) { - if (task instanceof ExecDriver) { - HashMap> opMap = ((MapredWork) task - .getWork()).getMapWork().getAliasToWork(); - if (!opMap.isEmpty()) { - for (Operator op : opMap.values()) { - generateCountersOperator(op); - } - } - - if (((MapredWork)task.getWork()).getReduceWork() != null) { - Operator reducer = ((MapredWork) task.getWork()).getReduceWork() - .getReducer(); - LOG.info("Generating counters for operator " + reducer); - generateCountersOperator(reducer); - } - } else if (task instanceof ConditionalTask) { - List> listTasks = ((ConditionalTask) task) - .getListTasks(); - for (Task tsk : listTasks) { - generateCountersTask(tsk); - } - } - - // Start the counters from scratch - a hack for hadoop 17. - Operator.resetLastEnumUsed(); - - if (task.getChildTasks() == null) { - return; - } - - for (Task childTask : task.getChildTasks()) { - generateCountersTask(childTask); - } - } - - private void generateCountersOperator(Operator op) { - op.assignCounterNameToEnum(); - - if (op.getChildOperators() == null) { - return; - } - - for (Operator child : op.getChildOperators()) { - generateCountersOperator(child); - } - } - public ParseContext getParseContext(ParseContext pCtx, List> rootTasks) { return new ParseContext(conf, pCtx.getQB(), pCtx.getParseTree(), pCtx.getOpToPartPruner(), pCtx.getOpToPartList(), pCtx.getTopOps(), diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 67ad6cb..b630525 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -5166,11 +5166,7 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) qbm.setDPCtx(dest, dpCtx); } - if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.DYNAMICPARTITIONING)) { // allow DP - // turn on hive.task.progress to update # of partitions created to the JT - HiveConf.setBoolVar(conf, HiveConf.ConfVars.HIVEJOBPROGRESS, true); - - } else { // QBMetaData.DEST_PARTITION capture the all-SP case + if (!HiveConf.getBoolVar(conf, HiveConf.ConfVars.DYNAMICPARTITIONING)) { // allow DP throw new SemanticException(generateErrorMessage( qb.getParseInfo().getDestForClause(dest), ErrorMsg.DYNAMIC_PARTITION_DISABLED.getMsg())); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java index fac30bf..b36767c 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java @@ -116,7 +116,7 @@ public void testBaseFilterOperator() throws Throwable { new ObjectInspector[] {r[0].oi}); for (InspectableObject oner : r) { - op.process(oner.o, 0); + op.processOp(oner.o, 0); } Map, Long> results = op.getStats(); @@ -277,7 +277,7 @@ public void testScriptOperator() throws Throwable { // evaluate on row for (int i = 0; i < 5; i++) { - op.process(r[i].o, 0); + op.processOp(r[i].o, 0); } op.close(false); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java index d1d2ea9..831ddb5 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java @@ -1485,7 +1485,7 @@ public void inspectRow(Object row, int tag) throws HiveException { }.init(aggregateName, expected, keys)); for (VectorizedRowBatch unit: data) { - vgo.process(unit, 0); + vgo.processOp(unit, 0); } vgo.close(false); @@ -1595,7 +1595,7 @@ public void inspectRow(Object row, int tag) throws HiveException { }.init(aggregateName, expected, keys)); for (VectorizedRowBatch unit: data) { - vgo.process(unit, 0); + vgo.processOp(unit, 0); } vgo.close(false); @@ -1885,7 +1885,7 @@ public void testAggregateCountStarIterable ( vgo.initialize(null, null); for (VectorizedRowBatch unit: data) { - vgo.process(unit, 0); + vgo.processOp(unit, 0); } vgo.close(false); @@ -1916,7 +1916,7 @@ public void testAggregateStringIterable ( vgo.initialize(null, null); for (VectorizedRowBatch unit: data) { - vgo.process(unit, 0); + vgo.processOp(unit, 0); } vgo.close(false); @@ -1947,7 +1947,7 @@ public void testAggregateDoubleIterable ( vgo.initialize(null, null); for (VectorizedRowBatch unit: data) { - vgo.process(unit, 0); + vgo.processOp(unit, 0); } vgo.close(false); @@ -1977,7 +1977,7 @@ public void testAggregateLongIterable ( vgo.initialize(null, null); for (VectorizedRowBatch unit: data) { - vgo.process(unit, 0); + vgo.processOp(unit, 0); } vgo.close(false); @@ -2046,7 +2046,7 @@ public void inspectRow(Object row, int tag) throws HiveException { }.init(aggregateName, expected, keys)); for (VectorizedRowBatch unit: data) { - vgo.process(unit, 0); + vgo.processOp(unit, 0); } vgo.close(false); @@ -2113,7 +2113,7 @@ public void inspectRow(Object row, int tag) throws HiveException { }.init(aggregateName, expected, keys)); for (VectorizedRowBatch unit: data) { - vgo.process(unit, 0); + vgo.processOp(unit, 0); } vgo.close(false); diff --git ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java index f857765..f9cb796 100644 --- ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java +++ ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java @@ -49,7 +49,7 @@ public static void assertResults(Operator selectOp, CollectOperator InspectableObject [] sourceData, InspectableObject [] expected) throws HiveException { InspectableObject resultRef = new InspectableObject(); for (int i = 0; i < sourceData.length; i++) { - selectOp.process(sourceData[i].o, 0); + selectOp.processOp(sourceData[i].o, 0); collectOp.retrieve(resultRef); StructObjectInspector expectedOi = (StructObjectInspector) expected[i].oi; List expectedFields = expectedOi.getAllStructFieldRefs(); diff --git ql/src/test/queries/clientpositive/insert_into3.q ql/src/test/queries/clientpositive/insert_into3.q index e58b212..4ff0edc 100644 --- ql/src/test/queries/clientpositive/insert_into3.q +++ ql/src/test/queries/clientpositive/insert_into3.q @@ -4,10 +4,10 @@ DROP TABLE insert_into3b; CREATE TABLE insert_into3a (key int, value string); CREATE TABLE insert_into3b (key int, value string); -EXPLAIN FROM src INSERT INTO TABLE insert_into3a SELECT * LIMIT 50 - INSERT INTO TABLE insert_into3b SELECT * LIMIT 100; -FROM src INSERT INTO TABLE insert_into3a SELECT * LIMIT 50 - INSERT INTO TABLE insert_into3b SELECT * LIMIT 100; +EXPLAIN FROM src INSERT INTO TABLE insert_into3a SELECT * ORDER BY key, value LIMIT 50 + INSERT INTO TABLE insert_into3b SELECT * ORDER BY key, value LIMIT 100; +FROM src INSERT INTO TABLE insert_into3a SELECT * ORDER BY key, value LIMIT 50 + INSERT INTO TABLE insert_into3b SELECT * ORDER BY key, value LIMIT 100; SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into3a ) t; diff --git ql/src/test/queries/clientpositive/optrstat_groupby.q ql/src/test/queries/clientpositive/optrstat_groupby.q deleted file mode 100644 index 5993041..0000000 --- ql/src/test/queries/clientpositive/optrstat_groupby.q +++ /dev/null @@ -1,6 +0,0 @@ -SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.OptrStatGroupByHook; -SET hive.exec.mode.local.auto=false; -SET hive.task.progress=true; --- This test executes the OptrStatGroupBy hook which prints the optr level --- stats of GROUPBY optr present is the plan of below query -SELECT count(1) FROM src; diff --git ql/src/test/results/clientpositive/insert_into3.q.out ql/src/test/results/clientpositive/insert_into3.q.out index 2410911..93bd605 100644 --- ql/src/test/results/clientpositive/insert_into3.q.out +++ ql/src/test/results/clientpositive/insert_into3.q.out @@ -16,14 +16,14 @@ PREHOOK: type: CREATETABLE POSTHOOK: query: CREATE TABLE insert_into3b (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@insert_into3b -PREHOOK: query: EXPLAIN FROM src INSERT INTO TABLE insert_into3a SELECT * LIMIT 50 - INSERT INTO TABLE insert_into3b SELECT * LIMIT 100 +PREHOOK: query: EXPLAIN FROM src INSERT INTO TABLE insert_into3a SELECT * ORDER BY key, value LIMIT 50 + INSERT INTO TABLE insert_into3b SELECT * ORDER BY key, value LIMIT 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN FROM src INSERT INTO TABLE insert_into3a SELECT * LIMIT 50 - INSERT INTO TABLE insert_into3b SELECT * LIMIT 100 +POSTHOOK: query: EXPLAIN FROM src INSERT INTO TABLE insert_into3a SELECT * ORDER BY key, value LIMIT 50 + INSERT INTO TABLE insert_into3b SELECT * ORDER BY key, value LIMIT 100 POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: - (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_INSERT_INTO (TOK_TAB (TOK_TABNAME insert_into3a))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_LIMIT 50)) (TOK_INSERT (TOK_INSERT_INTO (TOK_TAB (TOK_TABNAME insert_into3b))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_LIMIT 100))) + (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_INSERT_INTO (TOK_TAB (TOK_TABNAME insert_into3a))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL key)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value))) (TOK_LIMIT 50)) (TOK_INSERT (TOK_INSERT_INTO (TOK_TAB (TOK_TABNAME insert_into3b))) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL key)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value))) (TOK_LIMIT 100))) STAGE DEPENDENCIES: Stage-2 is a root stage @@ -47,15 +47,19 @@ STAGE PLANS: expr: value type: string outputColumnNames: _col0, _col1 - Limit - Reduce Output Operator - sort order: - tag: -1 - value expressions: - expr: _col0 - type: string - expr: _col1 - type: string + Reduce Output Operator + key expressions: + expr: _col0 + type: string + expr: _col1 + type: string + sort order: ++ + tag: -1 + value expressions: + expr: _col0 + type: string + expr: _col1 + type: string Select Operator expressions: expr: key @@ -63,14 +67,13 @@ STAGE PLANS: expr: value type: string outputColumnNames: _col0, _col1 - Limit - File Output Operator - compressed: false - GlobalTableId: 0 - table: - input format: org.apache.hadoop.mapred.SequenceFileInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + File Output Operator + compressed: false + GlobalTableId: 0 + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Reduce Operator Tree: Extract Limit @@ -109,7 +112,12 @@ STAGE PLANS: #### A masked pattern was here #### TableScan Reduce Output Operator - sort order: + key expressions: + expr: _col0 + type: string + expr: _col1 + type: string + sort order: ++ tag: -1 value expressions: expr: _col0 @@ -149,14 +157,14 @@ STAGE PLANS: Stats-Aggr Operator -PREHOOK: query: FROM src INSERT INTO TABLE insert_into3a SELECT * LIMIT 50 - INSERT INTO TABLE insert_into3b SELECT * LIMIT 100 +PREHOOK: query: FROM src INSERT INTO TABLE insert_into3a SELECT * ORDER BY key, value LIMIT 50 + INSERT INTO TABLE insert_into3b SELECT * ORDER BY key, value LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into3a PREHOOK: Output: default@insert_into3b -POSTHOOK: query: FROM src INSERT INTO TABLE insert_into3a SELECT * LIMIT 50 - INSERT INTO TABLE insert_into3b SELECT * LIMIT 100 +POSTHOOK: query: FROM src INSERT INTO TABLE insert_into3a SELECT * ORDER BY key, value LIMIT 50 + INSERT INTO TABLE insert_into3b SELECT * ORDER BY key, value LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into3a @@ -181,7 +189,7 @@ POSTHOOK: Lineage: insert_into3a.key EXPRESSION [(src)src.FieldSchema(name:key, POSTHOOK: Lineage: insert_into3a.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: insert_into3b.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: insert_into3b.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -7813690682 +-1254133670 PREHOOK: query: SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into3b ) t @@ -198,7 +206,7 @@ POSTHOOK: Lineage: insert_into3a.key EXPRESSION [(src)src.FieldSchema(name:key, POSTHOOK: Lineage: insert_into3a.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: insert_into3b.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: insert_into3b.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -10226524244 +-1142373758 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE insert_into3a SELECT * LIMIT 10 INSERT INTO TABLE insert_into3b SELECT * LIMIT 10 PREHOOK: type: QUERY @@ -397,7 +405,7 @@ POSTHOOK: Lineage: insert_into3b.key EXPRESSION [(src)src.FieldSchema(name:key, POSTHOOK: Lineage: insert_into3b.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: insert_into3b.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: insert_into3b.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -9399898328 +-1968999674 PREHOOK: query: DROP TABLE insert_into3a PREHOOK: type: DROPTABLE PREHOOK: Input: default@insert_into3a diff --git ql/src/test/results/clientpositive/optrstat_groupby.q.out ql/src/test/results/clientpositive/optrstat_groupby.q.out deleted file mode 100644 index b80a03f..0000000 --- ql/src/test/results/clientpositive/optrstat_groupby.q.out +++ /dev/null @@ -1,8 +0,0 @@ -PREHOOK: query: -- This test executes the OptrStatGroupBy hook which prints the optr level --- stats of GROUPBY optr present is the plan of below query -SELECT count(1) FROM src -PREHOOK: type: QUERY -PREHOOK: Input: default@src -#### A masked pattern was here #### -CNTR_NAME_GBY_2_COUNT_HASH_OUT=1 -500 diff --git ql/src/test/results/compiler/plan/case_sensitivity.q.xml ql/src/test/results/compiler/plan/case_sensitivity.q.xml index d6b614d..5ae6932 100644 --- ql/src/test/results/compiler/plan/case_sensitivity.q.xml +++ ql/src/test/results/compiler/plan/case_sensitivity.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_5_NUM_INPUT_ROWS - - - CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_5_TIME_TAKEN - - - CNTR_NAME_TS_5_FATAL_ERROR - - - @@ -732,22 +700,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -921,22 +873,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1054,22 +990,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -1134,22 +1054,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/cast1.q.xml ql/src/test/results/compiler/plan/cast1.q.xml index 1d31be1..7eb1abb 100644 --- ql/src/test/results/compiler/plan/cast1.q.xml +++ ql/src/test/results/compiler/plan/cast1.q.xml @@ -221,22 +221,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -751,22 +735,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -946,22 +914,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -1010,22 +962,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/groupby1.q.xml ql/src/test/results/compiler/plan/groupby1.q.xml index 485c323..7381951 100755 --- ql/src/test/results/compiler/plan/groupby1.q.xml +++ ql/src/test/results/compiler/plan/groupby1.q.xml @@ -458,22 +458,6 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - RS_3 @@ -649,25 +633,6 @@ - - - - CNTR_NAME_GBY_2_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_2_TIME_TAKEN - - - CNTR_NAME_GBY_2_FATAL_ERROR - - - CNTR_NAME_GBY_2_COUNT_HASH_OUT - - - GBY_2 @@ -839,22 +804,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -919,22 +868,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1247,22 +1180,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -1373,22 +1290,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -1520,25 +1421,6 @@ - - - - CNTR_NAME_GBY_4_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_4_TIME_TAKEN - - - CNTR_NAME_GBY_4_FATAL_ERROR - - - CNTR_NAME_GBY_4_COUNT_HASH_OUT - - - 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 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - RS_3 @@ -746,25 +730,6 @@ - - - - CNTR_NAME_GBY_2_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_2_TIME_TAKEN - - - CNTR_NAME_GBY_2_FATAL_ERROR - - - CNTR_NAME_GBY_2_COUNT_HASH_OUT - - - GBY_2 @@ -964,22 +929,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -1044,22 +993,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1389,22 +1322,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -1578,22 +1495,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -1785,25 +1686,6 @@ - - - - CNTR_NAME_GBY_4_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_4_TIME_TAKEN - - - CNTR_NAME_GBY_4_FATAL_ERROR - - - CNTR_NAME_GBY_4_COUNT_HASH_OUT - - - 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 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - RS_3 @@ -954,25 +938,6 @@ - - - - CNTR_NAME_GBY_2_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_2_TIME_TAKEN - - - CNTR_NAME_GBY_2_FATAL_ERROR - - - CNTR_NAME_GBY_2_COUNT_HASH_OUT - - - GBY_2 @@ -1188,22 +1153,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -1252,22 +1201,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1604,22 +1537,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -1838,22 +1755,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -2148,25 +2049,6 @@ - - - - CNTR_NAME_GBY_4_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_4_TIME_TAKEN - - - CNTR_NAME_GBY_4_FATAL_ERROR - - - CNTR_NAME_GBY_4_COUNT_HASH_OUT - - - 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 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - RS_3 @@ -437,25 +421,6 @@ - - - - CNTR_NAME_GBY_2_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_2_TIME_TAKEN - - - CNTR_NAME_GBY_2_FATAL_ERROR - - - CNTR_NAME_GBY_2_COUNT_HASH_OUT - - - GBY_2 @@ -595,22 +560,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -659,22 +608,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1011,22 +944,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -1101,22 +1018,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -1205,25 +1106,6 @@ - - - - CNTR_NAME_GBY_4_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_4_TIME_TAKEN - - - CNTR_NAME_GBY_4_FATAL_ERROR - - - CNTR_NAME_GBY_4_COUNT_HASH_OUT - - - GBY_4 diff --git ql/src/test/results/compiler/plan/groupby5.q.xml ql/src/test/results/compiler/plan/groupby5.q.xml index abdbff0..03b55bc 100644 --- ql/src/test/results/compiler/plan/groupby5.q.xml +++ ql/src/test/results/compiler/plan/groupby5.q.xml @@ -311,22 +311,6 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - RS_3 @@ -502,25 +486,6 @@ - - - - CNTR_NAME_GBY_2_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_2_TIME_TAKEN - - - CNTR_NAME_GBY_2_FATAL_ERROR - - - CNTR_NAME_GBY_2_COUNT_HASH_OUT - - - GBY_2 @@ -692,22 +657,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -772,22 +721,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1117,22 +1050,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -1243,22 +1160,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -1396,25 +1297,6 @@ - - - - CNTR_NAME_GBY_4_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_4_TIME_TAKEN - - - CNTR_NAME_GBY_4_FATAL_ERROR - - - CNTR_NAME_GBY_4_COUNT_HASH_OUT - - - 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 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - RS_3 @@ -437,25 +421,6 @@ - - - - CNTR_NAME_GBY_2_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_2_TIME_TAKEN - - - CNTR_NAME_GBY_2_FATAL_ERROR - - - CNTR_NAME_GBY_2_COUNT_HASH_OUT - - - GBY_2 @@ -595,22 +560,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -659,22 +608,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1011,22 +944,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -1101,22 +1018,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -1205,25 +1106,6 @@ - - - - CNTR_NAME_GBY_4_NUM_INPUT_ROWS - - - CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_GBY_4_TIME_TAKEN - - - CNTR_NAME_GBY_4_FATAL_ERROR - - - CNTR_NAME_GBY_4_COUNT_HASH_OUT - - - GBY_4 diff --git ql/src/test/results/compiler/plan/input1.q.xml ql/src/test/results/compiler/plan/input1.q.xml index 00a06d6..ed37947 100755 --- ql/src/test/results/compiler/plan/input1.q.xml +++ ql/src/test/results/compiler/plan/input1.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_5_NUM_INPUT_ROWS - - - CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_5_TIME_TAKEN - - - CNTR_NAME_TS_5_FATAL_ERROR - - - @@ -724,22 +692,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -813,22 +765,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -932,22 +868,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -1012,22 +932,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input2.q.xml ql/src/test/results/compiler/plan/input2.q.xml index df0de6f..53c0bfd 100755 --- ql/src/test/results/compiler/plan/input2.q.xml +++ ql/src/test/results/compiler/plan/input2.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_11_NUM_INPUT_ROWS - - - CNTR_NAME_FS_11_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_11_TIME_TAKEN - - - CNTR_NAME_FS_11_FATAL_ERROR - - - FS_11 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_10_NUM_INPUT_ROWS - - - CNTR_NAME_TS_10_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_10_TIME_TAKEN - - - CNTR_NAME_TS_10_FATAL_ERROR - - - @@ -672,22 +640,6 @@ - - - - CNTR_NAME_FS_13_NUM_INPUT_ROWS - - - CNTR_NAME_FS_13_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_13_TIME_TAKEN - - - CNTR_NAME_FS_13_FATAL_ERROR - - - FS_13 @@ -745,22 +697,6 @@ - - - - CNTR_NAME_TS_12_NUM_INPUT_ROWS - - - CNTR_NAME_TS_12_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_12_TIME_TAKEN - - - CNTR_NAME_TS_12_FATAL_ERROR - - - @@ -1194,22 +1130,6 @@ - - - - CNTR_NAME_FS_15_NUM_INPUT_ROWS - - - CNTR_NAME_FS_15_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_15_TIME_TAKEN - - - CNTR_NAME_FS_15_FATAL_ERROR - - - FS_15 @@ -1267,22 +1187,6 @@ - - - - CNTR_NAME_TS_14_NUM_INPUT_ROWS - - - CNTR_NAME_TS_14_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_14_TIME_TAKEN - - - CNTR_NAME_TS_14_FATAL_ERROR - - - @@ -1773,22 +1677,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -1865,22 +1753,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1984,22 +1856,6 @@ - - - - CNTR_NAME_FIL_1_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_1_TIME_TAKEN - - - CNTR_NAME_FIL_1_FATAL_ERROR - - - FIL_1 @@ -2096,22 +1952,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -2185,22 +2025,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -2347,22 +2171,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -2436,22 +2244,6 @@ - - - - CNTR_NAME_FS_9_NUM_INPUT_ROWS - - - CNTR_NAME_FS_9_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_9_TIME_TAKEN - - - CNTR_NAME_FS_9_FATAL_ERROR - - - FS_9 @@ -2522,22 +2314,6 @@ - - - - CNTR_NAME_SEL_8_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_8_TIME_TAKEN - - - CNTR_NAME_SEL_8_FATAL_ERROR - - - SEL_8 @@ -2630,22 +2406,6 @@ - - - - CNTR_NAME_FIL_7_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_7_TIME_TAKEN - - - CNTR_NAME_FIL_7_FATAL_ERROR - - - FIL_7 @@ -2681,22 +2441,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input20.q.xml ql/src/test/results/compiler/plan/input20.q.xml index 346ed48..c06dc47 100644 --- ql/src/test/results/compiler/plan/input20.q.xml +++ ql/src/test/results/compiler/plan/input20.q.xml @@ -325,22 +325,6 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - RS_3 @@ -513,22 +497,6 @@ - - - - CNTR_NAME_SCR_2_NUM_INPUT_ROWS - - - CNTR_NAME_SCR_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SCR_2_TIME_TAKEN - - - CNTR_NAME_SCR_2_FATAL_ERROR - - - SCR_2 @@ -682,22 +650,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -756,22 +708,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1129,22 +1065,6 @@ - - - - CNTR_NAME_FS_7_NUM_INPUT_ROWS - - - CNTR_NAME_FS_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_7_TIME_TAKEN - - - CNTR_NAME_FS_7_FATAL_ERROR - - - FS_7 @@ -1313,22 +1233,6 @@ - - - - CNTR_NAME_SCR_6_NUM_INPUT_ROWS - - - CNTR_NAME_SCR_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_SCR_6_TIME_TAKEN - - - CNTR_NAME_SCR_6_FATAL_ERROR - - - SCR_6 @@ -1439,22 +1343,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -1520,22 +1408,6 @@ - - - - CNTR_NAME_EX_4_NUM_INPUT_ROWS - - - CNTR_NAME_EX_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_EX_4_TIME_TAKEN - - - CNTR_NAME_EX_4_FATAL_ERROR - - - EX_4 diff --git ql/src/test/results/compiler/plan/input3.q.xml ql/src/test/results/compiler/plan/input3.q.xml index 28a5ca8..77dd8d4 100755 --- ql/src/test/results/compiler/plan/input3.q.xml +++ ql/src/test/results/compiler/plan/input3.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_14_NUM_INPUT_ROWS - - - CNTR_NAME_FS_14_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_14_TIME_TAKEN - - - CNTR_NAME_FS_14_FATAL_ERROR - - - FS_14 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_13_NUM_INPUT_ROWS - - - CNTR_NAME_TS_13_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_13_TIME_TAKEN - - - CNTR_NAME_TS_13_FATAL_ERROR - - - @@ -672,22 +640,6 @@ - - - - CNTR_NAME_FS_16_NUM_INPUT_ROWS - - - CNTR_NAME_FS_16_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_16_TIME_TAKEN - - - CNTR_NAME_FS_16_FATAL_ERROR - - - FS_16 @@ -745,22 +697,6 @@ - - - - CNTR_NAME_TS_15_NUM_INPUT_ROWS - - - CNTR_NAME_TS_15_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_15_TIME_TAKEN - - - CNTR_NAME_TS_15_FATAL_ERROR - - - @@ -1194,22 +1130,6 @@ - - - - CNTR_NAME_FS_18_NUM_INPUT_ROWS - - - CNTR_NAME_FS_18_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_18_TIME_TAKEN - - - CNTR_NAME_FS_18_FATAL_ERROR - - - FS_18 @@ -1267,22 +1187,6 @@ - - - - CNTR_NAME_TS_17_NUM_INPUT_ROWS - - - CNTR_NAME_TS_17_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_17_TIME_TAKEN - - - CNTR_NAME_TS_17_FATAL_ERROR - - - @@ -1661,22 +1565,6 @@ - - - - CNTR_NAME_FS_20_NUM_INPUT_ROWS - - - CNTR_NAME_FS_20_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_20_TIME_TAKEN - - - CNTR_NAME_FS_20_FATAL_ERROR - - - FS_20 @@ -1718,22 +1606,6 @@ - - - - CNTR_NAME_TS_19_NUM_INPUT_ROWS - - - CNTR_NAME_TS_19_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_19_TIME_TAKEN - - - CNTR_NAME_TS_19_FATAL_ERROR - - - @@ -2159,22 +2031,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -2251,22 +2107,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -2370,22 +2210,6 @@ - - - - CNTR_NAME_FIL_1_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_1_TIME_TAKEN - - - CNTR_NAME_FIL_1_FATAL_ERROR - - - FIL_1 @@ -2482,22 +2306,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -2571,22 +2379,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -2733,22 +2525,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -2822,22 +2598,6 @@ - - - - CNTR_NAME_FS_9_NUM_INPUT_ROWS - - - CNTR_NAME_FS_9_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_9_TIME_TAKEN - - - CNTR_NAME_FS_9_FATAL_ERROR - - - FS_9 @@ -2908,22 +2668,6 @@ - - - - CNTR_NAME_SEL_8_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_8_TIME_TAKEN - - - CNTR_NAME_SEL_8_FATAL_ERROR - - - SEL_8 @@ -3067,22 +2811,6 @@ - - - - CNTR_NAME_FIL_7_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_7_TIME_TAKEN - - - CNTR_NAME_FIL_7_FATAL_ERROR - - - FIL_7 @@ -3141,22 +2869,6 @@ - - - - CNTR_NAME_FS_12_NUM_INPUT_ROWS - - - CNTR_NAME_FS_12_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_12_TIME_TAKEN - - - CNTR_NAME_FS_12_FATAL_ERROR - - - FS_12 @@ -3210,22 +2922,6 @@ - - - - CNTR_NAME_SEL_11_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_11_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_11_TIME_TAKEN - - - CNTR_NAME_SEL_11_FATAL_ERROR - - - SEL_11 @@ -3308,22 +3004,6 @@ - - - - CNTR_NAME_FIL_10_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_10_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_10_TIME_TAKEN - - - CNTR_NAME_FIL_10_FATAL_ERROR - - - FIL_10 @@ -3362,22 +3042,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input4.q.xml ql/src/test/results/compiler/plan/input4.q.xml index d37cf56..8dd6c06 100755 --- ql/src/test/results/compiler/plan/input4.q.xml +++ ql/src/test/results/compiler/plan/input4.q.xml @@ -476,22 +476,6 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - RS_3 @@ -585,22 +569,6 @@ - - - - CNTR_NAME_FIL_8_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_8_TIME_TAKEN - - - CNTR_NAME_FIL_8_FATAL_ERROR - - - FIL_8 @@ -736,22 +704,6 @@ - - - - CNTR_NAME_SCR_2_NUM_INPUT_ROWS - - - CNTR_NAME_SCR_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SCR_2_TIME_TAKEN - - - CNTR_NAME_SCR_2_FATAL_ERROR - - - SCR_2 @@ -829,22 +781,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -903,22 +839,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1261,22 +1181,6 @@ - - - - CNTR_NAME_FS_7_NUM_INPUT_ROWS - - - CNTR_NAME_FS_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_7_TIME_TAKEN - - - CNTR_NAME_FS_7_FATAL_ERROR - - - FS_7 @@ -1387,22 +1291,6 @@ - - - - CNTR_NAME_SEL_6_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_6_TIME_TAKEN - - - CNTR_NAME_SEL_6_FATAL_ERROR - - - SEL_6 @@ -1474,22 +1362,6 @@ - - - - CNTR_NAME_EX_4_NUM_INPUT_ROWS - - - CNTR_NAME_EX_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_EX_4_TIME_TAKEN - - - CNTR_NAME_EX_4_FATAL_ERROR - - - EX_4 diff --git ql/src/test/results/compiler/plan/input5.q.xml ql/src/test/results/compiler/plan/input5.q.xml index 1271d2a..cc91fc4 100644 --- ql/src/test/results/compiler/plan/input5.q.xml +++ ql/src/test/results/compiler/plan/input5.q.xml @@ -480,22 +480,6 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - RS_3 @@ -664,22 +648,6 @@ - - - - CNTR_NAME_SCR_2_NUM_INPUT_ROWS - - - CNTR_NAME_SCR_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SCR_2_TIME_TAKEN - - - CNTR_NAME_SCR_2_FATAL_ERROR - - - SCR_2 @@ -796,22 +764,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -870,22 +822,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1311,22 +1247,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -1437,22 +1357,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -1524,22 +1428,6 @@ - - - - CNTR_NAME_EX_4_NUM_INPUT_ROWS - - - CNTR_NAME_EX_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_EX_4_TIME_TAKEN - - - CNTR_NAME_EX_4_FATAL_ERROR - - - EX_4 diff --git ql/src/test/results/compiler/plan/input6.q.xml ql/src/test/results/compiler/plan/input6.q.xml index b5f27c9..3ced7a5 100644 --- ql/src/test/results/compiler/plan/input6.q.xml +++ ql/src/test/results/compiler/plan/input6.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_5_NUM_INPUT_ROWS - - - CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_5_TIME_TAKEN - - - CNTR_NAME_TS_5_FATAL_ERROR - - - @@ -724,22 +692,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -813,22 +765,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -918,22 +854,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -998,22 +918,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input7.q.xml ql/src/test/results/compiler/plan/input7.q.xml index 41c829e..7451750 100644 --- ql/src/test/results/compiler/plan/input7.q.xml +++ ql/src/test/results/compiler/plan/input7.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_4_NUM_INPUT_ROWS - - - CNTR_NAME_FS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_4_TIME_TAKEN - - - CNTR_NAME_FS_4_FATAL_ERROR - - - FS_4 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_3_NUM_INPUT_ROWS - - - CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_3_TIME_TAKEN - - - CNTR_NAME_TS_3_FATAL_ERROR - - - @@ -720,22 +688,6 @@ - - - - CNTR_NAME_FS_2_NUM_INPUT_ROWS - - - CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_2_TIME_TAKEN - - - CNTR_NAME_FS_2_FATAL_ERROR - - - FS_2 @@ -803,22 +755,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -884,22 +820,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input8.q.xml ql/src/test/results/compiler/plan/input8.q.xml index 5c07a5c..f978b2b 100644 --- ql/src/test/results/compiler/plan/input8.q.xml +++ ql/src/test/results/compiler/plan/input8.q.xml @@ -217,22 +217,6 @@ - - - - CNTR_NAME_FS_2_NUM_INPUT_ROWS - - - CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_2_TIME_TAKEN - - - CNTR_NAME_FS_2_FATAL_ERROR - - - FS_2 @@ -463,22 +447,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -559,22 +527,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input9.q.xml ql/src/test/results/compiler/plan/input9.q.xml index 72d9ec4..8048951 100644 --- ql/src/test/results/compiler/plan/input9.q.xml +++ ql/src/test/results/compiler/plan/input9.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_5_NUM_INPUT_ROWS - - - CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_5_TIME_TAKEN - - - CNTR_NAME_TS_5_FATAL_ERROR - - - @@ -724,22 +692,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -807,22 +759,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -906,22 +842,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -970,22 +890,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input_part1.q.xml ql/src/test/results/compiler/plan/input_part1.q.xml index de88d54..61c8c83 100644 --- ql/src/test/results/compiler/plan/input_part1.q.xml +++ ql/src/test/results/compiler/plan/input_part1.q.xml @@ -242,22 +242,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -450,22 +434,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -613,22 +581,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -725,22 +677,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input_testsequencefile.q.xml ql/src/test/results/compiler/plan/input_testsequencefile.q.xml index 165fde8..4b334bd 100644 --- ql/src/test/results/compiler/plan/input_testsequencefile.q.xml +++ ql/src/test/results/compiler/plan/input_testsequencefile.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_4_NUM_INPUT_ROWS - - - CNTR_NAME_FS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_4_TIME_TAKEN - - - CNTR_NAME_FS_4_FATAL_ERROR - - - FS_4 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_3_NUM_INPUT_ROWS - - - CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_3_TIME_TAKEN - - - CNTR_NAME_TS_3_FATAL_ERROR - - - @@ -720,22 +688,6 @@ - - - - CNTR_NAME_FS_2_NUM_INPUT_ROWS - - - CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_2_TIME_TAKEN - - - CNTR_NAME_FS_2_FATAL_ERROR - - - FS_2 @@ -809,22 +761,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -889,22 +825,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input_testxpath.q.xml ql/src/test/results/compiler/plan/input_testxpath.q.xml index 4747345..ab0e183 100644 --- ql/src/test/results/compiler/plan/input_testxpath.q.xml +++ ql/src/test/results/compiler/plan/input_testxpath.q.xml @@ -225,22 +225,6 @@ - - - - CNTR_NAME_FS_2_NUM_INPUT_ROWS - - - CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_2_TIME_TAKEN - - - CNTR_NAME_FS_2_FATAL_ERROR - - - FS_2 @@ -522,22 +506,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -618,22 +586,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/input_testxpath2.q.xml ql/src/test/results/compiler/plan/input_testxpath2.q.xml index e25facd..c2a8100 100644 --- ql/src/test/results/compiler/plan/input_testxpath2.q.xml +++ ql/src/test/results/compiler/plan/input_testxpath2.q.xml @@ -229,22 +229,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -483,22 +467,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -659,22 +627,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -755,22 +707,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/join1.q.xml ql/src/test/results/compiler/plan/join1.q.xml index 01c58a9..a72caef 100644 --- ql/src/test/results/compiler/plan/join1.q.xml +++ ql/src/test/results/compiler/plan/join1.q.xml @@ -592,22 +592,6 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - src2 @@ -675,22 +659,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -937,22 +905,6 @@ - - - - CNTR_NAME_RS_2_NUM_INPUT_ROWS - - - CNTR_NAME_RS_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_2_TIME_TAKEN - - - CNTR_NAME_RS_2_FATAL_ERROR - - - src1 @@ -1004,22 +956,6 @@ - - - - CNTR_NAME_TS_1_NUM_INPUT_ROWS - - - CNTR_NAME_TS_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_1_TIME_TAKEN - - - CNTR_NAME_TS_1_FATAL_ERROR - - - @@ -1358,22 +1294,6 @@ - - - - CNTR_NAME_FS_6_NUM_INPUT_ROWS - - - CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_6_TIME_TAKEN - - - CNTR_NAME_FS_6_FATAL_ERROR - - - FS_6 @@ -1484,22 +1404,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -1698,22 +1602,6 @@ - - - - CNTR_NAME_JOIN_4_NUM_INPUT_ROWS - - - CNTR_NAME_JOIN_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_JOIN_4_TIME_TAKEN - - - CNTR_NAME_JOIN_4_FATAL_ERROR - - - JOIN_4 diff --git ql/src/test/results/compiler/plan/join2.q.xml ql/src/test/results/compiler/plan/join2.q.xml index c769ea3..1863e77 100644 --- ql/src/test/results/compiler/plan/join2.q.xml +++ ql/src/test/results/compiler/plan/join2.q.xml @@ -491,22 +491,6 @@ - - - - CNTR_NAME_RS_6_NUM_INPUT_ROWS - - - CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_6_TIME_TAKEN - - - CNTR_NAME_RS_6_FATAL_ERROR - - - RS_6 @@ -548,22 +532,6 @@ - - - - CNTR_NAME_TS_12_NUM_INPUT_ROWS - - - CNTR_NAME_TS_12_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_12_TIME_TAKEN - - - CNTR_NAME_TS_12_FATAL_ERROR - - - @@ -792,22 +760,6 @@ - - - - CNTR_NAME_RS_7_NUM_INPUT_ROWS - - - CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_7_TIME_TAKEN - - - CNTR_NAME_RS_7_FATAL_ERROR - - - src3 @@ -859,22 +811,6 @@ - - - - CNTR_NAME_TS_1_NUM_INPUT_ROWS - - - CNTR_NAME_TS_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_1_TIME_TAKEN - - - CNTR_NAME_TS_1_FATAL_ERROR - - - @@ -1275,22 +1211,6 @@ - - - - CNTR_NAME_FS_10_NUM_INPUT_ROWS - - - CNTR_NAME_FS_10_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_10_TIME_TAKEN - - - CNTR_NAME_FS_10_FATAL_ERROR - - - FS_10 @@ -1401,22 +1321,6 @@ - - - - CNTR_NAME_SEL_9_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_9_TIME_TAKEN - - - CNTR_NAME_SEL_9_FATAL_ERROR - - - SEL_9 @@ -1631,22 +1535,6 @@ - - - - CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - - - CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_JOIN_8_TIME_TAKEN - - - CNTR_NAME_JOIN_8_FATAL_ERROR - - - JOIN_8 @@ -2164,22 +2052,6 @@ - - - - CNTR_NAME_RS_4_NUM_INPUT_ROWS - - - CNTR_NAME_RS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_4_TIME_TAKEN - - - CNTR_NAME_RS_4_FATAL_ERROR - - - src2 @@ -2231,22 +2103,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -2483,22 +2339,6 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - src1 @@ -2550,22 +2390,6 @@ - - - - CNTR_NAME_TS_2_NUM_INPUT_ROWS - - - CNTR_NAME_TS_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_2_TIME_TAKEN - - - CNTR_NAME_TS_2_FATAL_ERROR - - - @@ -2876,22 +2700,6 @@ - - - - CNTR_NAME_FS_11_NUM_INPUT_ROWS - - - CNTR_NAME_FS_11_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_11_TIME_TAKEN - - - CNTR_NAME_FS_11_FATAL_ERROR - - - FS_11 @@ -3053,22 +2861,6 @@ - - - - CNTR_NAME_JOIN_5_NUM_INPUT_ROWS - - - CNTR_NAME_JOIN_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_JOIN_5_TIME_TAKEN - - - CNTR_NAME_JOIN_5_FATAL_ERROR - - - JOIN_5 diff --git ql/src/test/results/compiler/plan/join3.q.xml ql/src/test/results/compiler/plan/join3.q.xml index eac6a09..3a04431 100644 --- ql/src/test/results/compiler/plan/join3.q.xml +++ ql/src/test/results/compiler/plan/join3.q.xml @@ -706,22 +706,6 @@ - - - - CNTR_NAME_RS_4_NUM_INPUT_ROWS - - - CNTR_NAME_RS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_4_TIME_TAKEN - - - CNTR_NAME_RS_4_FATAL_ERROR - - - src2 @@ -773,22 +757,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1046,22 +1014,6 @@ - - - - CNTR_NAME_RS_5_NUM_INPUT_ROWS - - - CNTR_NAME_RS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_5_TIME_TAKEN - - - CNTR_NAME_RS_5_FATAL_ERROR - - - src3 @@ -1129,22 +1081,6 @@ - - - - CNTR_NAME_TS_1_NUM_INPUT_ROWS - - - CNTR_NAME_TS_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_1_TIME_TAKEN - - - CNTR_NAME_TS_1_FATAL_ERROR - - - @@ -1387,22 +1323,6 @@ - - - - CNTR_NAME_RS_3_NUM_INPUT_ROWS - - - CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_3_TIME_TAKEN - - - CNTR_NAME_RS_3_FATAL_ERROR - - - src1 @@ -1454,22 +1374,6 @@ - - - - CNTR_NAME_TS_2_NUM_INPUT_ROWS - - - CNTR_NAME_TS_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_2_TIME_TAKEN - - - CNTR_NAME_TS_2_FATAL_ERROR - - - @@ -1811,22 +1715,6 @@ - - - - CNTR_NAME_FS_8_NUM_INPUT_ROWS - - - CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_8_TIME_TAKEN - - - CNTR_NAME_FS_8_FATAL_ERROR - - - FS_8 @@ -1937,22 +1825,6 @@ - - - - CNTR_NAME_SEL_7_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_7_TIME_TAKEN - - - CNTR_NAME_SEL_7_FATAL_ERROR - - - SEL_7 @@ -2185,22 +2057,6 @@ - - - - CNTR_NAME_JOIN_6_NUM_INPUT_ROWS - - - CNTR_NAME_JOIN_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_JOIN_6_TIME_TAKEN - - - CNTR_NAME_JOIN_6_FATAL_ERROR - - - 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 @@ - - - - CNTR_NAME_RS_6_NUM_INPUT_ROWS - - - CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_6_TIME_TAKEN - - - CNTR_NAME_RS_6_FATAL_ERROR - - - a @@ -576,22 +560,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -740,22 +708,6 @@ - - - - CNTR_NAME_FIL_12_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_12_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_12_TIME_TAKEN - - - CNTR_NAME_FIL_12_FATAL_ERROR - - - FIL_12 @@ -820,22 +772,6 @@ - - - - CNTR_NAME_TS_3_NUM_INPUT_ROWS - - - CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_3_TIME_TAKEN - - - CNTR_NAME_TS_3_FATAL_ERROR - - - @@ -1078,22 +1014,6 @@ - - - - CNTR_NAME_RS_7_NUM_INPUT_ROWS - - - CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_7_TIME_TAKEN - - - CNTR_NAME_RS_7_FATAL_ERROR - - - b @@ -1207,22 +1127,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1363,22 +1267,6 @@ - - - - CNTR_NAME_FIL_13_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_13_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_13_TIME_TAKEN - - - CNTR_NAME_FIL_13_FATAL_ERROR - - - FIL_13 @@ -1443,22 +1331,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1794,22 +1666,6 @@ - - - - CNTR_NAME_FS_11_NUM_INPUT_ROWS - - - CNTR_NAME_FS_11_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_11_TIME_TAKEN - - - CNTR_NAME_FS_11_FATAL_ERROR - - - FS_11 @@ -1992,22 +1848,6 @@ - - - - CNTR_NAME_SEL_9_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_9_TIME_TAKEN - - - CNTR_NAME_SEL_9_FATAL_ERROR - - - SEL_9 @@ -2282,22 +2122,6 @@ - - - - CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - - - CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_JOIN_8_TIME_TAKEN - - - CNTR_NAME_JOIN_8_FATAL_ERROR - - - 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 @@ - - - - CNTR_NAME_RS_6_NUM_INPUT_ROWS - - - CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_6_TIME_TAKEN - - - CNTR_NAME_RS_6_FATAL_ERROR - - - a @@ -576,22 +560,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -740,22 +708,6 @@ - - - - CNTR_NAME_FIL_12_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_12_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_12_TIME_TAKEN - - - CNTR_NAME_FIL_12_FATAL_ERROR - - - FIL_12 @@ -820,22 +772,6 @@ - - - - CNTR_NAME_TS_3_NUM_INPUT_ROWS - - - CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_3_TIME_TAKEN - - - CNTR_NAME_TS_3_FATAL_ERROR - - - @@ -1078,22 +1014,6 @@ - - - - CNTR_NAME_RS_7_NUM_INPUT_ROWS - - - CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_7_TIME_TAKEN - - - CNTR_NAME_RS_7_FATAL_ERROR - - - b @@ -1207,22 +1127,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1363,22 +1267,6 @@ - - - - CNTR_NAME_FIL_13_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_13_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_13_TIME_TAKEN - - - CNTR_NAME_FIL_13_FATAL_ERROR - - - FIL_13 @@ -1443,22 +1331,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1794,22 +1666,6 @@ - - - - CNTR_NAME_FS_11_NUM_INPUT_ROWS - - - CNTR_NAME_FS_11_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_11_TIME_TAKEN - - - CNTR_NAME_FS_11_FATAL_ERROR - - - FS_11 @@ -1992,22 +1848,6 @@ - - - - CNTR_NAME_SEL_9_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_9_TIME_TAKEN - - - CNTR_NAME_SEL_9_FATAL_ERROR - - - SEL_9 @@ -2278,22 +2118,6 @@ - - - - CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - - - CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_JOIN_8_TIME_TAKEN - - - CNTR_NAME_JOIN_8_FATAL_ERROR - - - 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 @@ - - - - CNTR_NAME_RS_6_NUM_INPUT_ROWS - - - CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_6_TIME_TAKEN - - - CNTR_NAME_RS_6_FATAL_ERROR - - - a @@ -576,22 +560,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -740,22 +708,6 @@ - - - - CNTR_NAME_FIL_12_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_12_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_12_TIME_TAKEN - - - CNTR_NAME_FIL_12_FATAL_ERROR - - - FIL_12 @@ -820,22 +772,6 @@ - - - - CNTR_NAME_TS_3_NUM_INPUT_ROWS - - - CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_3_TIME_TAKEN - - - CNTR_NAME_TS_3_FATAL_ERROR - - - @@ -1078,22 +1014,6 @@ - - - - CNTR_NAME_RS_7_NUM_INPUT_ROWS - - - CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_7_TIME_TAKEN - - - CNTR_NAME_RS_7_FATAL_ERROR - - - b @@ -1207,22 +1127,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1363,22 +1267,6 @@ - - - - CNTR_NAME_FIL_13_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_13_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_13_TIME_TAKEN - - - CNTR_NAME_FIL_13_FATAL_ERROR - - - FIL_13 @@ -1443,22 +1331,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1794,22 +1666,6 @@ - - - - CNTR_NAME_FS_11_NUM_INPUT_ROWS - - - CNTR_NAME_FS_11_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_11_TIME_TAKEN - - - CNTR_NAME_FS_11_FATAL_ERROR - - - FS_11 @@ -1992,22 +1848,6 @@ - - - - CNTR_NAME_SEL_9_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_9_TIME_TAKEN - - - CNTR_NAME_SEL_9_FATAL_ERROR - - - SEL_9 @@ -2285,22 +2125,6 @@ - - - - CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - - - CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_JOIN_8_TIME_TAKEN - - - CNTR_NAME_JOIN_8_FATAL_ERROR - - - 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 @@ - - - - CNTR_NAME_RS_9_NUM_INPUT_ROWS - - - CNTR_NAME_RS_9_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_9_TIME_TAKEN - - - CNTR_NAME_RS_9_FATAL_ERROR - - - a @@ -712,22 +696,6 @@ - - - - CNTR_NAME_SEL_8_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_8_TIME_TAKEN - - - CNTR_NAME_SEL_8_FATAL_ERROR - - - SEL_8 @@ -876,22 +844,6 @@ - - - - CNTR_NAME_FIL_16_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_16_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_16_TIME_TAKEN - - - CNTR_NAME_FIL_16_FATAL_ERROR - - - FIL_16 @@ -956,22 +908,6 @@ - - - - CNTR_NAME_TS_6_NUM_INPUT_ROWS - - - CNTR_NAME_TS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_6_TIME_TAKEN - - - CNTR_NAME_TS_6_FATAL_ERROR - - - @@ -1214,22 +1150,6 @@ - - - - CNTR_NAME_RS_10_NUM_INPUT_ROWS - - - CNTR_NAME_RS_10_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_10_TIME_TAKEN - - - CNTR_NAME_RS_10_FATAL_ERROR - - - b @@ -1343,22 +1263,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1499,22 +1403,6 @@ - - - - CNTR_NAME_FIL_17_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_17_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_17_TIME_TAKEN - - - CNTR_NAME_FIL_17_FATAL_ERROR - - - FIL_17 @@ -1579,22 +1467,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1833,22 +1705,6 @@ - - - - CNTR_NAME_RS_11_NUM_INPUT_ROWS - - - CNTR_NAME_RS_11_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_11_TIME_TAKEN - - - CNTR_NAME_RS_11_FATAL_ERROR - - - c @@ -1962,22 +1818,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -2118,22 +1958,6 @@ - - - - CNTR_NAME_FIL_18_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_18_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_18_TIME_TAKEN - - - CNTR_NAME_FIL_18_FATAL_ERROR - - - FIL_18 @@ -2198,22 +2022,6 @@ - - - - CNTR_NAME_TS_3_NUM_INPUT_ROWS - - - CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_3_TIME_TAKEN - - - CNTR_NAME_TS_3_FATAL_ERROR - - - @@ -2552,22 +2360,6 @@ - - - - CNTR_NAME_FS_15_NUM_INPUT_ROWS - - - CNTR_NAME_FS_15_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_15_TIME_TAKEN - - - CNTR_NAME_FS_15_FATAL_ERROR - - - FS_15 @@ -2822,22 +2614,6 @@ - - - - CNTR_NAME_SEL_13_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_13_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_13_TIME_TAKEN - - - CNTR_NAME_SEL_13_FATAL_ERROR - - - SEL_13 @@ -3226,22 +3002,6 @@ - - - - CNTR_NAME_JOIN_12_NUM_INPUT_ROWS - - - CNTR_NAME_JOIN_12_NUM_OUTPUT_ROWS - - - CNTR_NAME_JOIN_12_TIME_TAKEN - - - CNTR_NAME_JOIN_12_FATAL_ERROR - - - 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 @@ - - - - CNTR_NAME_RS_6_NUM_INPUT_ROWS - - - CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_6_TIME_TAKEN - - - CNTR_NAME_RS_6_FATAL_ERROR - - - a @@ -576,22 +560,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -781,22 +749,6 @@ - - - - CNTR_NAME_FIL_14_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_14_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_14_TIME_TAKEN - - - CNTR_NAME_FIL_14_FATAL_ERROR - - - FIL_14 @@ -861,22 +813,6 @@ - - - - CNTR_NAME_TS_3_NUM_INPUT_ROWS - - - CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_3_TIME_TAKEN - - - CNTR_NAME_TS_3_FATAL_ERROR - - - @@ -1119,22 +1055,6 @@ - - - - CNTR_NAME_RS_7_NUM_INPUT_ROWS - - - CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_RS_7_TIME_TAKEN - - - CNTR_NAME_RS_7_FATAL_ERROR - - - b @@ -1248,22 +1168,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1445,22 +1349,6 @@ - - - - CNTR_NAME_FIL_15_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_15_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_15_TIME_TAKEN - - - CNTR_NAME_FIL_15_FATAL_ERROR - - - FIL_15 @@ -1525,22 +1413,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - @@ -1880,22 +1752,6 @@ - - - - CNTR_NAME_FS_12_NUM_INPUT_ROWS - - - CNTR_NAME_FS_12_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_12_TIME_TAKEN - - - CNTR_NAME_FS_12_FATAL_ERROR - - - FS_12 @@ -2078,22 +1934,6 @@ - - - - CNTR_NAME_SEL_9_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_9_TIME_TAKEN - - - CNTR_NAME_SEL_9_FATAL_ERROR - - - SEL_9 @@ -2213,22 +2053,6 @@ - - - - CNTR_NAME_FIL_13_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_13_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_13_TIME_TAKEN - - - CNTR_NAME_FIL_13_FATAL_ERROR - - - FIL_13 @@ -2491,22 +2315,6 @@ - - - - CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - - - CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_JOIN_8_TIME_TAKEN - - - CNTR_NAME_JOIN_8_FATAL_ERROR - - - JOIN_8 diff --git ql/src/test/results/compiler/plan/sample1.q.xml ql/src/test/results/compiler/plan/sample1.q.xml index 77aec1c..c1fe499 100644 --- ql/src/test/results/compiler/plan/sample1.q.xml +++ ql/src/test/results/compiler/plan/sample1.q.xml @@ -242,22 +242,6 @@ - - - - CNTR_NAME_FS_4_NUM_INPUT_ROWS - - - CNTR_NAME_FS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_4_TIME_TAKEN - - - CNTR_NAME_FS_4_FATAL_ERROR - - - FS_4 @@ -453,22 +437,6 @@ - - - - CNTR_NAME_SEL_3_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_3_TIME_TAKEN - - - CNTR_NAME_SEL_3_FATAL_ERROR - - - SEL_3 @@ -712,22 +680,6 @@ - - - - CNTR_NAME_FIL_1_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_1_TIME_TAKEN - - - CNTR_NAME_FIL_1_FATAL_ERROR - - - FIL_1 @@ -824,22 +776,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/sample2.q.xml ql/src/test/results/compiler/plan/sample2.q.xml index 8f5e16f..46f3327 100644 --- ql/src/test/results/compiler/plan/sample2.q.xml +++ ql/src/test/results/compiler/plan/sample2.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_5_NUM_INPUT_ROWS - - - CNTR_NAME_FS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_5_TIME_TAKEN - - - CNTR_NAME_FS_5_FATAL_ERROR - - - FS_5 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_4_NUM_INPUT_ROWS - - - CNTR_NAME_TS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_4_TIME_TAKEN - - - CNTR_NAME_TS_4_FATAL_ERROR - - - @@ -732,22 +700,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -828,22 +780,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1031,22 +967,6 @@ - - - - CNTR_NAME_FIL_1_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_1_TIME_TAKEN - - - CNTR_NAME_FIL_1_FATAL_ERROR - - - FIL_1 @@ -1111,22 +1031,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/sample3.q.xml ql/src/test/results/compiler/plan/sample3.q.xml index cd9a6fb..ccc51a8 100644 --- ql/src/test/results/compiler/plan/sample3.q.xml +++ ql/src/test/results/compiler/plan/sample3.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_5_NUM_INPUT_ROWS - - - CNTR_NAME_FS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_5_TIME_TAKEN - - - CNTR_NAME_FS_5_FATAL_ERROR - - - FS_5 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_4_NUM_INPUT_ROWS - - - CNTR_NAME_TS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_4_TIME_TAKEN - - - CNTR_NAME_TS_4_FATAL_ERROR - - - @@ -732,22 +700,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -828,22 +780,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1041,22 +977,6 @@ - - - - CNTR_NAME_FIL_1_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_1_TIME_TAKEN - - - CNTR_NAME_FIL_1_FATAL_ERROR - - - FIL_1 @@ -1121,22 +1041,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/sample4.q.xml ql/src/test/results/compiler/plan/sample4.q.xml index 8f5e16f..46f3327 100644 --- ql/src/test/results/compiler/plan/sample4.q.xml +++ ql/src/test/results/compiler/plan/sample4.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_5_NUM_INPUT_ROWS - - - CNTR_NAME_FS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_5_TIME_TAKEN - - - CNTR_NAME_FS_5_FATAL_ERROR - - - FS_5 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_4_NUM_INPUT_ROWS - - - CNTR_NAME_TS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_4_TIME_TAKEN - - - CNTR_NAME_TS_4_FATAL_ERROR - - - @@ -732,22 +700,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -828,22 +780,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1031,22 +967,6 @@ - - - - CNTR_NAME_FIL_1_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_1_TIME_TAKEN - - - CNTR_NAME_FIL_1_FATAL_ERROR - - - FIL_1 @@ -1111,22 +1031,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/sample5.q.xml ql/src/test/results/compiler/plan/sample5.q.xml index a10b8a5..83c80eb 100644 --- ql/src/test/results/compiler/plan/sample5.q.xml +++ ql/src/test/results/compiler/plan/sample5.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_5_NUM_INPUT_ROWS - - - CNTR_NAME_FS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_5_TIME_TAKEN - - - CNTR_NAME_FS_5_FATAL_ERROR - - - FS_5 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_4_NUM_INPUT_ROWS - - - CNTR_NAME_TS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_4_TIME_TAKEN - - - CNTR_NAME_TS_4_FATAL_ERROR - - - @@ -732,22 +700,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -828,22 +780,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1028,22 +964,6 @@ - - - - CNTR_NAME_FIL_1_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_1_TIME_TAKEN - - - CNTR_NAME_FIL_1_FATAL_ERROR - - - FIL_1 @@ -1108,22 +1028,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/sample6.q.xml ql/src/test/results/compiler/plan/sample6.q.xml index aaf60b9..2c40176 100644 --- ql/src/test/results/compiler/plan/sample6.q.xml +++ ql/src/test/results/compiler/plan/sample6.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_5_NUM_INPUT_ROWS - - - CNTR_NAME_FS_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_5_TIME_TAKEN - - - CNTR_NAME_FS_5_FATAL_ERROR - - - FS_5 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_4_NUM_INPUT_ROWS - - - CNTR_NAME_TS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_4_TIME_TAKEN - - - CNTR_NAME_TS_4_FATAL_ERROR - - - @@ -732,22 +700,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -828,22 +780,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1031,22 +967,6 @@ - - - - CNTR_NAME_FIL_1_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_1_TIME_TAKEN - - - CNTR_NAME_FIL_1_FATAL_ERROR - - - FIL_1 @@ -1111,22 +1031,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/sample7.q.xml ql/src/test/results/compiler/plan/sample7.q.xml index a82bbce..287feaa 100644 --- ql/src/test/results/compiler/plan/sample7.q.xml +++ ql/src/test/results/compiler/plan/sample7.q.xml @@ -150,22 +150,6 @@ - - - - CNTR_NAME_FS_7_NUM_INPUT_ROWS - - - CNTR_NAME_FS_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_7_TIME_TAKEN - - - CNTR_NAME_FS_7_FATAL_ERROR - - - FS_7 @@ -227,22 +211,6 @@ - - - - CNTR_NAME_TS_6_NUM_INPUT_ROWS - - - CNTR_NAME_TS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_6_TIME_TAKEN - - - CNTR_NAME_TS_6_FATAL_ERROR - - - @@ -732,22 +700,6 @@ - - - - CNTR_NAME_FS_4_NUM_INPUT_ROWS - - - CNTR_NAME_FS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_4_TIME_TAKEN - - - CNTR_NAME_FS_4_FATAL_ERROR - - - FS_4 @@ -828,22 +780,6 @@ - - - - CNTR_NAME_SEL_3_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_3_TIME_TAKEN - - - CNTR_NAME_SEL_3_FATAL_ERROR - - - SEL_3 @@ -1076,22 +1012,6 @@ - - - - CNTR_NAME_FIL_5_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_5_TIME_TAKEN - - - CNTR_NAME_FIL_5_FATAL_ERROR - - - FIL_5 @@ -1156,22 +1076,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/subq.q.xml ql/src/test/results/compiler/plan/subq.q.xml index 185b100..8990b76 100644 --- ql/src/test/results/compiler/plan/subq.q.xml +++ ql/src/test/results/compiler/plan/subq.q.xml @@ -90,22 +90,6 @@ - - - - CNTR_NAME_FS_7_NUM_INPUT_ROWS - - - CNTR_NAME_FS_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_7_TIME_TAKEN - - - CNTR_NAME_FS_7_FATAL_ERROR - - - FS_7 @@ -167,22 +151,6 @@ - - - - CNTR_NAME_TS_6_NUM_INPUT_ROWS - - - CNTR_NAME_TS_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_6_TIME_TAKEN - - - CNTR_NAME_TS_6_FATAL_ERROR - - - @@ -605,22 +573,6 @@ - - - - CNTR_NAME_FS_4_NUM_INPUT_ROWS - - - CNTR_NAME_FS_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_4_TIME_TAKEN - - - CNTR_NAME_FS_4_FATAL_ERROR - - - FS_4 @@ -697,22 +649,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -822,22 +758,6 @@ - - - - CNTR_NAME_FIL_5_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_5_TIME_TAKEN - - - CNTR_NAME_FIL_5_FATAL_ERROR - - - FIL_5 @@ -902,22 +822,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/udf1.q.xml ql/src/test/results/compiler/plan/udf1.q.xml index 765e972..954655b 100644 --- ql/src/test/results/compiler/plan/udf1.q.xml +++ ql/src/test/results/compiler/plan/udf1.q.xml @@ -221,22 +221,6 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -1450,22 +1434,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1805,22 +1773,6 @@ - - - - CNTR_NAME_FIL_4_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_4_TIME_TAKEN - - - CNTR_NAME_FIL_4_FATAL_ERROR - - - FIL_4 @@ -1869,22 +1821,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - diff --git ql/src/test/results/compiler/plan/udf4.q.xml ql/src/test/results/compiler/plan/udf4.q.xml index 4346478..806a8be 100644 --- ql/src/test/results/compiler/plan/udf4.q.xml +++ ql/src/test/results/compiler/plan/udf4.q.xml @@ -197,22 +197,6 @@ - - - - CNTR_NAME_FS_2_NUM_INPUT_ROWS - - - CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_2_TIME_TAKEN - - - CNTR_NAME_FS_2_FATAL_ERROR - - - FS_2 @@ -1399,22 +1383,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -1751,22 +1719,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - 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 @@ - - - - CNTR_NAME_FS_2_NUM_INPUT_ROWS - - - CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_2_TIME_TAKEN - - - CNTR_NAME_FS_2_FATAL_ERROR - - - FS_2 @@ -407,22 +391,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -487,22 +455,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - 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 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -302,22 +286,6 @@ - - - - CNTR_NAME_LIM_2_NUM_INPUT_ROWS - - - CNTR_NAME_LIM_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_LIM_2_TIME_TAKEN - - - CNTR_NAME_LIM_2_FATAL_ERROR - - - LIM_2 @@ -540,22 +508,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -587,22 +539,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - 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 @@ - - - - CNTR_NAME_FS_3_NUM_INPUT_ROWS - - - CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_3_TIME_TAKEN - - - CNTR_NAME_FS_3_FATAL_ERROR - - - FS_3 @@ -302,22 +286,6 @@ - - - - CNTR_NAME_LIM_2_NUM_INPUT_ROWS - - - CNTR_NAME_LIM_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_LIM_2_TIME_TAKEN - - - CNTR_NAME_LIM_2_FATAL_ERROR - - - LIM_2 @@ -620,22 +588,6 @@ - - - - CNTR_NAME_SEL_1_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_1_TIME_TAKEN - - - CNTR_NAME_SEL_1_FATAL_ERROR - - - SEL_1 @@ -667,22 +619,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - - 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 @@ - - - - CNTR_NAME_FS_12_NUM_INPUT_ROWS - - - CNTR_NAME_FS_12_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_12_TIME_TAKEN - - - CNTR_NAME_FS_12_FATAL_ERROR - - - FS_12 @@ -167,22 +151,6 @@ - - - - CNTR_NAME_TS_11_NUM_INPUT_ROWS - - - CNTR_NAME_TS_11_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_11_TIME_TAKEN - - - CNTR_NAME_TS_11_FATAL_ERROR - - - @@ -749,22 +717,6 @@ - - - - CNTR_NAME_FS_8_NUM_INPUT_ROWS - - - CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - - - CNTR_NAME_FS_8_TIME_TAKEN - - - CNTR_NAME_FS_8_FATAL_ERROR - - - FS_8 @@ -841,22 +793,6 @@ - - - - CNTR_NAME_SEL_7_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_7_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_7_TIME_TAKEN - - - CNTR_NAME_SEL_7_FATAL_ERROR - - - SEL_7 @@ -920,22 +856,6 @@ - - - - CNTR_NAME_UNION_6_NUM_INPUT_ROWS - - - CNTR_NAME_UNION_6_NUM_OUTPUT_ROWS - - - CNTR_NAME_UNION_6_TIME_TAKEN - - - CNTR_NAME_UNION_6_FATAL_ERROR - - - UNION_6 @@ -1012,22 +932,6 @@ - - - - CNTR_NAME_SEL_5_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_5_TIME_TAKEN - - - CNTR_NAME_SEL_5_FATAL_ERROR - - - SEL_5 @@ -1091,22 +995,6 @@ - - - - CNTR_NAME_FIL_10_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_10_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_10_TIME_TAKEN - - - CNTR_NAME_FIL_10_FATAL_ERROR - - - FIL_10 @@ -1131,22 +1019,6 @@ - - - - CNTR_NAME_TS_3_NUM_INPUT_ROWS - - - CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_3_TIME_TAKEN - - - CNTR_NAME_TS_3_FATAL_ERROR - - - @@ -1418,22 +1290,6 @@ - - - - CNTR_NAME_SEL_2_NUM_INPUT_ROWS - - - CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - - - CNTR_NAME_SEL_2_TIME_TAKEN - - - CNTR_NAME_SEL_2_FATAL_ERROR - - - SEL_2 @@ -1529,22 +1385,6 @@ - - - - CNTR_NAME_FIL_9_NUM_INPUT_ROWS - - - CNTR_NAME_FIL_9_NUM_OUTPUT_ROWS - - - CNTR_NAME_FIL_9_TIME_TAKEN - - - CNTR_NAME_FIL_9_FATAL_ERROR - - - FIL_9 @@ -1609,22 +1449,6 @@ - - - - CNTR_NAME_TS_0_NUM_INPUT_ROWS - - - CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - - - CNTR_NAME_TS_0_TIME_TAKEN - - - CNTR_NAME_TS_0_FATAL_ERROR - - -