You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2015/02/23 19:23:32 UTC
[01/25] vxquery git commit: Consolidated changes for November.
Repository: vxquery
Updated Branches:
refs/heads/master da09ce8b8 -> 9abe3e9f0
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
index 5c2867f..d17a1a9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java
@@ -113,4 +113,8 @@ public class VXQueryCollectionDataSource implements IDataSource<String> {
return childSeq;
}
+ @Override
+ public String toString() {
+ return "VXQueryCollectionDataSource [collectionName=" + collectionName + ", childSeq=" + childSeq + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
index bc92ffc..0599ea9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
@@ -130,14 +130,6 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
}
@Override
- public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getInsertRuntime(IDataSource<String> dataSource,
- IOperatorSchema propagatedSchema, IVariableTypeEnvironment typeEnv, List<LogicalVariable> keys,
- LogicalVariable payLoadVar, List<LogicalVariable> additionalNonKeyFields, RecordDescriptor recordDesc,
- JobGenContext context, JobSpecification jobSpec) throws AlgebricksException {
- return null;
- }
-
- @Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getDeleteRuntime(IDataSource<String> dataSource,
IOperatorSchema propagatedSchema, IVariableTypeEnvironment typeEnv, List<LogicalVariable> keys,
LogicalVariable payLoadVar, List<LogicalVariable> additionalNonKeyFields, RecordDescriptor recordDesc,
@@ -146,16 +138,6 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
}
@Override
- public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getIndexInsertRuntime(
- IDataSourceIndex<String, String> dataSource, IOperatorSchema propagatedSchema,
- IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv, List<LogicalVariable> primaryKeys,
- List<LogicalVariable> secondaryKeys, List<LogicalVariable> additionalNonKeyFields,
- ILogicalExpression filterExpr, RecordDescriptor recordDesc, JobGenContext context, JobSpecification spec)
- throws AlgebricksException {
- return null;
- }
-
- @Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getIndexDeleteRuntime(
IDataSourceIndex<String, String> dataSource, IOperatorSchema propagatedSchema,
IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv, List<LogicalVariable> primaryKeys,
@@ -208,4 +190,31 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
return new Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>(resultWriter, null);
}
+ @Override
+ public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getInsertRuntime(IDataSource<String> dataSource,
+ IOperatorSchema propagatedSchema, IVariableTypeEnvironment typeEnv, List<LogicalVariable> keys,
+ LogicalVariable payLoadVar, List<LogicalVariable> additionalNonKeyFields, RecordDescriptor recordDesc,
+ JobGenContext context, JobSpecification jobSpec, boolean bulkload) throws AlgebricksException {
+ return null;
+ }
+
+ @Override
+ public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getIndexInsertRuntime(
+ IDataSourceIndex<String, String> dataSource, IOperatorSchema propagatedSchema,
+ IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv, List<LogicalVariable> primaryKeys,
+ List<LogicalVariable> secondaryKeys, List<LogicalVariable> additionalNonKeyFields,
+ ILogicalExpression filterExpr, RecordDescriptor recordDesc, JobGenContext context, JobSpecification spec,
+ boolean bulkload) throws AlgebricksException {
+ return null;
+ }
+
+ @Override
+ public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getTokenizerRuntime(
+ IDataSourceIndex<String, String> dataSource, IOperatorSchema propagatedSchema,
+ IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv, List<LogicalVariable> primaryKeys,
+ List<LogicalVariable> secondaryKeys, ILogicalExpression filterExpr, RecordDescriptor recordDesc,
+ JobGenContext context, JobSpecification spec, boolean bulkload) throws AlgebricksException {
+ return null;
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractChildPathStep.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractChildPathStep.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractChildPathStep.java
deleted file mode 100644
index 2668719..0000000
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractChildPathStep.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.runtime.functions.step;
-
-import java.io.IOException;
-
-import org.apache.vxquery.context.DynamicContext;
-import org.apache.vxquery.datamodel.accessors.PointablePool;
-import org.apache.vxquery.datamodel.accessors.SequencePointable;
-import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.accessors.nodes.DocumentNodePointable;
-import org.apache.vxquery.datamodel.accessors.nodes.ElementNodePointable;
-import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
-import org.apache.vxquery.datamodel.builders.nodes.NodeSubTreeBuilder;
-import org.apache.vxquery.datamodel.values.ValueTag;
-import org.apache.vxquery.datamodel.values.XDMConstants;
-
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-
-public abstract class AbstractChildPathStep {
- protected final DynamicContext dCtx;
- protected final PointablePool pp;
- private final ArrayBackedValueStorage nodeAbvs = new ArrayBackedValueStorage();
- protected final NodeTreePointable ntp = (NodeTreePointable) NodeTreePointable.FACTORY.createPointable();
- private final DocumentNodePointable dnp = (DocumentNodePointable) DocumentNodePointable.FACTORY.createPointable();
- private final ElementNodePointable enp = (ElementNodePointable) ElementNodePointable.FACTORY.createPointable();
- private final NodeSubTreeBuilder nstb = new NodeSubTreeBuilder();
-
- public AbstractChildPathStep(IHyracksTaskContext ctx, PointablePool pp) {
- dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
- this.pp = pp;
- }
-
- protected void getSequence(TaggedValuePointable tvp, SequencePointable seqp) {
- switch (tvp.getTag()) {
- case ValueTag.DOCUMENT_NODE_TAG:
- tvp.getValue(dnp);
- dnp.getContent(ntp, seqp);
- return;
-
- case ValueTag.ELEMENT_NODE_TAG:
- tvp.getValue(enp);
- if (enp.childrenChunkExists()) {
- enp.getChildrenSequence(ntp, seqp);
- return;
- }
- }
- XDMConstants.setEmptySequence(seqp);
- }
-
- protected void setNodeToResult(TaggedValuePointable tvpItem, IPointable result) throws IOException {
- nodeAbvs.reset();
- nstb.reset(nodeAbvs);
- nstb.setChildNode(ntp, tvpItem);
- nstb.finish();
- result.set(nodeAbvs.getByteArray(), nodeAbvs.getStartOffset(), nodeAbvs.getLength());
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
index 6c5f18f..3322f90 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractDescendantPathStepScalarEvaluator.java
@@ -23,7 +23,6 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.nodes.DocumentNodePointable;
import org.apache.vxquery.datamodel.accessors.nodes.ElementNodePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
-import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
@@ -79,9 +78,7 @@ public abstract class AbstractDescendantPathStepScalarEvaluator extends Abstract
seqp.getEntry(i, itemTvp);
// Only search element nodes.
if (itemTvp.getTag() == ValueTag.ELEMENT_NODE_TAG) {
- if (matches()) {
- appendNodeToResult();
- }
+ appendNodeToResult();
// Now check this elements children.
TaggedValuePointable tvpTemp = (TaggedValuePointable) TaggedValuePointable.FACTORY
.createPointable();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractForwardAxisPathStep.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractForwardAxisPathStep.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractForwardAxisPathStep.java
new file mode 100644
index 0000000..e4d25cf
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractForwardAxisPathStep.java
@@ -0,0 +1,74 @@
+/*
+ * 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.vxquery.runtime.functions.step;
+
+import java.io.IOException;
+
+import org.apache.vxquery.context.DynamicContext;
+import org.apache.vxquery.datamodel.accessors.PointablePool;
+import org.apache.vxquery.datamodel.accessors.SequencePointable;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.accessors.nodes.DocumentNodePointable;
+import org.apache.vxquery.datamodel.accessors.nodes.ElementNodePointable;
+import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
+import org.apache.vxquery.datamodel.builders.nodes.NodeSubTreeBuilder;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.datamodel.values.XDMConstants;
+
+import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import edu.uci.ics.hyracks.data.std.api.IPointable;
+import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+
+public abstract class AbstractForwardAxisPathStep {
+ protected final DynamicContext dCtx;
+ protected final PointablePool pp;
+ protected final NodeTreePointable ntp = (NodeTreePointable) NodeTreePointable.FACTORY.createPointable();
+ private final ArrayBackedValueStorage nodeAbvs = new ArrayBackedValueStorage();
+ private final DocumentNodePointable dnp = (DocumentNodePointable) DocumentNodePointable.FACTORY.createPointable();
+ private final ElementNodePointable enp = (ElementNodePointable) ElementNodePointable.FACTORY.createPointable();
+ private final NodeSubTreeBuilder nstb = new NodeSubTreeBuilder();
+
+ public AbstractForwardAxisPathStep(IHyracksTaskContext ctx, PointablePool pp) {
+ dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
+ this.pp = pp;
+ }
+
+ protected void getSequence(TaggedValuePointable tvp, SequencePointable seqp) {
+ switch (tvp.getTag()) {
+ case ValueTag.DOCUMENT_NODE_TAG:
+ tvp.getValue(dnp);
+ dnp.getContent(ntp, seqp);
+ return;
+
+ case ValueTag.ELEMENT_NODE_TAG:
+ tvp.getValue(enp);
+ if (enp.childrenChunkExists()) {
+ enp.getChildrenSequence(ntp, seqp);
+ return;
+ }
+ }
+ XDMConstants.setEmptySequence(seqp);
+ }
+
+ protected void setNodeToResult(TaggedValuePointable tvpItem, IPointable result) throws IOException {
+ nodeAbvs.reset();
+ nstb.reset(nodeAbvs);
+ nstb.setChildNode(ntp, tvpItem);
+ nstb.finish();
+ result.set(nodeAbvs.getByteArray(), nodeAbvs.getStartOffset(), nodeAbvs.getLength());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
index 1edf0f5..125623c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepOperatorDescriptor.java
@@ -23,12 +23,7 @@ import java.util.List;
import org.apache.vxquery.datamodel.accessors.PointablePool;
import org.apache.vxquery.datamodel.accessors.SequencePointable;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.accessors.nodes.DocumentNodePointable;
-import org.apache.vxquery.datamodel.accessors.nodes.ElementNodePointable;
-import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
-import org.apache.vxquery.datamodel.builders.nodes.NodeSubTreeBuilder;
import org.apache.vxquery.datamodel.values.ValueTag;
-import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.step.NodeTestFilter.INodeFilter;
@@ -37,40 +32,17 @@ import org.apache.vxquery.types.SequenceType;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-public class ChildPathStepOperatorDescriptor extends AbstractChildPathStep {
+public class ChildPathStepOperatorDescriptor extends AbstractForwardAxisPathStep {
private List<INodeFilter> filter = new ArrayList<INodeFilter>();
private int[] indexSequence;
- private final ArrayBackedValueStorage nodeAbvs = new ArrayBackedValueStorage();
- protected final NodeTreePointable ntp = (NodeTreePointable) NodeTreePointable.FACTORY.createPointable();
private final TaggedValuePointable tvpItem = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
- private final DocumentNodePointable dnp = (DocumentNodePointable) DocumentNodePointable.FACTORY.createPointable();
- private final ElementNodePointable enp = (ElementNodePointable) ElementNodePointable.FACTORY.createPointable();
private final TaggedValuePointable tvpStep = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
- private final NodeSubTreeBuilder nstb = new NodeSubTreeBuilder();
public ChildPathStepOperatorDescriptor(IHyracksTaskContext ctx, PointablePool pp) {
super(ctx, pp);
}
- protected void getSequence(TaggedValuePointable tvp, SequencePointable seqp) {
- switch (tvp.getTag()) {
- case ValueTag.DOCUMENT_NODE_TAG:
- tvp.getValue(dnp);
- dnp.getContent(ntp, seqp);
- return;
-
- case ValueTag.ELEMENT_NODE_TAG:
- tvp.getValue(enp);
- if (enp.childrenChunkExists()) {
- enp.getChildrenSequence(ntp, seqp);
- return;
- }
- }
- XDMConstants.setEmptySequence(seqp);
- }
-
public void init(TaggedValuePointable tvp, List<Integer> typeCodes) throws SystemException {
indexSequence = new int[typeCodes.size()];
for (int i = 0; i < typeCodes.size(); ++i) {
@@ -91,14 +63,6 @@ public class ChildPathStepOperatorDescriptor extends AbstractChildPathStep {
}
}
- protected void setNodeToResult(TaggedValuePointable tvpItem, IPointable result) throws IOException {
- nodeAbvs.reset();
- nstb.reset(nodeAbvs);
- nstb.setChildNode(ntp, tvpItem);
- nstb.finish();
- result.set(nodeAbvs.getByteArray(), nodeAbvs.getStartOffset(), nodeAbvs.getLength());
- }
-
/**
* Single node tree input.
* Requirement: "ntp" must be the node tree.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
index 1e93ce3..ea65066 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
@@ -32,7 +32,7 @@ import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
import edu.uci.ics.hyracks.data.std.api.IPointable;
import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-public class ChildPathStepUnnesting extends AbstractChildPathStep {
+public class ChildPathStepUnnesting extends AbstractForwardAxisPathStep {
private int indexSeqArgs;
private int seqArgsLength;
private int indexSequence;
@@ -83,6 +83,7 @@ public class ChildPathStepUnnesting extends AbstractChildPathStep {
if (stepNodeTree(tvpStep, 0, result)) {
return true;
}
+ indexSeqArgs++;
}
} else {
// Single node tree input.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java
index 203877a..5572166 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepScalarEvaluator.java
@@ -95,16 +95,13 @@ public class DescendantOrSelfPathStepScalarEvaluator extends AbstractDescendantP
throw new SystemException(ErrorCode.SYSE0001);
}
itemTvp.set(rootTVP);
- if (matches()) {
- try {
- appendNodeToResult();
- } catch (IOException e) {
- throw new SystemException(ErrorCode.SYSE0001, e);
- }
+ try {
+ appendNodeToResult();
+ } catch (IOException e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
}
// Solve for descendants.
- setNodeTest(SequenceType.create(ElementType.ANYELEMENT, Quantifier.QUANT_ONE));
searchSubtree(rootTVP);
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
new file mode 100644
index 0000000..57ab9e7
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java
@@ -0,0 +1,167 @@
+/*
+ * 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.vxquery.runtime.functions.step;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.vxquery.datamodel.accessors.PointablePool;
+import org.apache.vxquery.datamodel.accessors.SequencePointable;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.exceptions.ErrorCode;
+import org.apache.vxquery.exceptions.SystemException;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import edu.uci.ics.hyracks.data.std.api.IPointable;
+
+public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathStep {
+ private boolean testSelf;
+ private int indexSeqArgs;
+ private int seqArgsLength;
+ private List<Integer> indexSequence = new ArrayList<Integer>();
+ private List<Boolean> checkSelf = new ArrayList<Boolean>();
+
+ private final SequencePointable seqNtp = (SequencePointable) SequencePointable.FACTORY.createPointable();
+ private final TaggedValuePointable tvpItem = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
+ private final TaggedValuePointable tvpNtp = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
+ private final TaggedValuePointable tvpStep = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
+
+ public DescendantOrSelfPathStepUnnesting(IHyracksTaskContext ctx, PointablePool pp, boolean testSelf) {
+ super(ctx, pp);
+ this.testSelf = testSelf;
+ }
+
+ protected void init(TaggedValuePointable[] args) throws SystemException {
+ checkSelf.add(true);
+ indexSeqArgs = 0;
+ indexSequence.add(0);
+
+ // Check the argument passed in as sequence or node tree.
+ if (args[0].getTag() == ValueTag.SEQUENCE_TAG) {
+ args[0].getValue(seqNtp);
+ seqArgsLength = seqNtp.getEntryCount();
+ } else if (args[0].getTag() == ValueTag.NODE_TREE_TAG) {
+ args[0].getValue(ntp);
+ seqArgsLength = -1;
+ } else {
+ throw new SystemException(ErrorCode.SYSE0001);
+ }
+ }
+
+ public boolean step(IPointable result) throws AlgebricksException {
+ if (seqArgsLength > 0) {
+ while (indexSeqArgs < seqArgsLength) {
+ seqNtp.getEntry(indexSeqArgs, tvpNtp);
+ if (tvpNtp.getTag() != ValueTag.NODE_TREE_TAG) {
+ String description = ErrorCode.SYSE0001 + ": " + ErrorCode.SYSE0001.getDescription();
+ throw new AlgebricksException(description);
+ }
+ tvpNtp.getValue(ntp);
+ ntp.getRootNode(tvpStep);
+ if (processNodeTree(tvpStep, result)) {
+ return true;
+ }
+ // Next node tree in sequence.
+ indexSeqArgs++;
+ checkSelf.set(0, true);
+ }
+ } else {
+ // Single node tree input.
+ ntp.getRootNode(tvpStep);
+ if (processNodeTree(tvpStep, result)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean processNodeTree(TaggedValuePointable rootTVP, IPointable result) throws AlgebricksException {
+ if (testSelf && checkSelf.get(0)) {
+ checkSelf.set(0, false);
+ tvpItem.set(rootTVP);
+ try {
+ setNodeToResult(tvpItem, result);
+ return true;
+ } catch (IOException e) {
+ String description = ErrorCode.SYSE0001 + ": " + ErrorCode.SYSE0001.getDescription();
+ throw new AlgebricksException(description);
+ }
+ }
+
+ // Solve for descendants.
+ return stepNodeTree(rootTVP, 0, result);
+ }
+
+ /**
+ * Search through all tree children and children's children.
+ *
+ * @param nodePointable
+ * @throws SystemException
+ */
+ protected boolean stepNodeTree(TaggedValuePointable tvpInput, int level, IPointable result)
+ throws AlgebricksException {
+ // Set up next level tracking.
+ if (level + 1 >= indexSequence.size()) {
+ indexSequence.add(0);
+ }
+ if (level + 1 >= checkSelf.size()) {
+ checkSelf.add(true);
+ }
+
+ SequencePointable seqItem = pp.takeOne(SequencePointable.class);
+ try {
+ getSequence(tvpInput, seqItem);
+ int seqLength = seqItem.getEntryCount();
+ while (indexSequence.get(level) < seqLength) {
+ // Get the next item
+ seqItem.getEntry(indexSequence.get(level), tvpItem);
+
+ // Check current node
+ if (checkSelf.get(level)) {
+ checkSelf.set(level, false);
+ setNodeToResult(tvpItem, result);
+ return true;
+ }
+ // Check children nodes
+ if (level + 1 < indexSequence.size()) {
+ if (level + 1 < checkSelf.size()) {
+ checkSelf.set(level + 1, true);
+ }
+ if (stepNodeTree(tvpItem, level + 1, result)) {
+ return true;
+ }
+ }
+ indexSequence.set(level, indexSequence.get(level) + 1);
+ }
+ // Reset for next node tree.
+ if (level == 0) {
+ indexSequence.set(level, 0);
+ } else {
+ indexSequence.remove(level);
+ }
+ return false;
+ } catch (IOException e) {
+ String description = ErrorCode.SYSE0001 + ": " + ErrorCode.SYSE0001.getDescription();
+ throw new AlgebricksException(description);
+ } finally {
+ pp.giveBack(seqItem);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluator.java
new file mode 100644
index 0000000..9c0eb40
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluator.java
@@ -0,0 +1,44 @@
+/*
+ * 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.vxquery.runtime.functions.step;
+
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluator;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import edu.uci.ics.hyracks.data.std.api.IPointable;
+
+public class DescendantOrSelfPathStepUnnestingEvaluator extends AbstractTaggedValueArgumentUnnestingEvaluator {
+ final DescendantOrSelfPathStepUnnesting descendantOrSelfPathStep;
+
+ public DescendantOrSelfPathStepUnnestingEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args) {
+ super(args);
+ descendantOrSelfPathStep = new DescendantOrSelfPathStepUnnesting(ctx, ppool, true);
+ }
+
+ public boolean step(IPointable result) throws AlgebricksException {
+ return descendantOrSelfPathStep.step(result);
+ }
+
+ @Override
+ protected void init(TaggedValuePointable[] args) throws SystemException {
+ descendantOrSelfPathStep.init(args);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluatorFactory.java
new file mode 100644
index 0000000..10e2f3d
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnestingEvaluatorFactory.java
@@ -0,0 +1,40 @@
+/*
+ * 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.vxquery.runtime.functions.step;
+
+import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluatorFactory;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
+import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+
+public class DescendantOrSelfPathStepUnnestingEvaluatorFactory extends
+ AbstractTaggedValueArgumentUnnestingEvaluatorFactory {
+ private static final long serialVersionUID = 1L;
+
+ public DescendantOrSelfPathStepUnnestingEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected IUnnestingEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
+ throws AlgebricksException {
+ return new DescendantOrSelfPathStepUnnestingEvaluator(ctx, args);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java
index c2876f8..c415f33 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepScalarEvaluator.java
@@ -22,9 +22,6 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
-import org.apache.vxquery.types.ElementType;
-import org.apache.vxquery.types.Quantifier;
-import org.apache.vxquery.types.SequenceType;
import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
@@ -56,7 +53,6 @@ public class DescendantPathStepScalarEvaluator extends AbstractDescendantPathSte
ntp.getRootNode(rootTVP);
// Solve for descendants.
- setNodeTest(SequenceType.create(ElementType.ANYELEMENT, Quantifier.QUANT_ONE));
searchSubtree(rootTVP);
seqb.finish();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluator.java
new file mode 100644
index 0000000..25455e8
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluator.java
@@ -0,0 +1,44 @@
+/*
+ * 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.vxquery.runtime.functions.step;
+
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluator;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+import edu.uci.ics.hyracks.data.std.api.IPointable;
+
+public class DescendantPathStepUnnestingEvaluator extends AbstractTaggedValueArgumentUnnestingEvaluator {
+ final DescendantOrSelfPathStepUnnesting descendantPathStep;
+
+ public DescendantPathStepUnnestingEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args) {
+ super(args);
+ descendantPathStep = new DescendantOrSelfPathStepUnnesting(ctx, ppool, false);
+ }
+
+ public boolean step(IPointable result) throws AlgebricksException {
+ return descendantPathStep.step(result);
+ }
+
+ @Override
+ protected void init(TaggedValuePointable[] args) throws SystemException {
+ descendantPathStep.init(args);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluatorFactory.java
new file mode 100644
index 0000000..357ab42
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantPathStepUnnestingEvaluatorFactory.java
@@ -0,0 +1,39 @@
+/*
+ * 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.vxquery.runtime.functions.step;
+
+import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentUnnestingEvaluatorFactory;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluator;
+import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
+
+public class DescendantPathStepUnnestingEvaluatorFactory extends AbstractTaggedValueArgumentUnnestingEvaluatorFactory {
+ private static final long serialVersionUID = 1L;
+
+ public DescendantPathStepUnnestingEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected IUnnestingEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
+ throws AlgebricksException {
+ return new DescendantPathStepUnnestingEvaluator(ctx, args);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java
index 4cce5db..7e93469 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java
@@ -42,7 +42,7 @@ public class UTF8StringCharacterIterator implements ICharacterIterator {
if (byteOffset < stringp.getLength()) {
c = stringp.charAt(byteOffset);
if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine(" UTF8StringCharacterIterator char[" + byteOffset + "] = " + c);
+ LOGGER.finer(" UTF8StringCharacterIterator char[" + byteOffset + "] = " + c);
}
// Increment cursor
if ((c >= 0x0001) && (c <= 0x007F)) {
@@ -54,7 +54,7 @@ public class UTF8StringCharacterIterator implements ICharacterIterator {
}
}
if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine(" END UTF8StringCharacterIterator char[" + byteOffset + "] = " + c);
+ LOGGER.finer(" END UTF8StringCharacterIterator char[" + byteOffset + "] = " + c);
}
return (char) c;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index 3cdc492..44f2179 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -113,7 +113,7 @@ public class XMLQueryCompiler {
});
builder.getPhysicalOptimizationConfig().setFrameSize(this.frameSize);
if (joinHashSize > 0) {
- builder.getPhysicalOptimizationConfig().setMaxFramesHybridHash(joinHashSize);
+ builder.getPhysicalOptimizationConfig().setMaxFramesHybridHash(joinHashSize/this.frameSize);
}
builder.setLogicalRewrites(buildDefaultLogicalRewrites());
builder.setPhysicalRewrites(buildDefaultPhysicalRewrites());
[12/25] vxquery git commit: Feedback from review and maven now runs
the previous passing XQTS with maven test. (Saving work)
Posted by pr...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
index 77400e9..31e45d7 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
@@ -14,10 +14,16 @@
*/
package org.apache.vxquery.xtest;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.net.URL;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
import java.util.regex.Pattern;
import javax.xml.namespace.QName;
@@ -38,6 +44,7 @@ public abstract class AbstractTestCaseFactory {
public TestCase tc;
public Pattern include;
public Pattern exclude;
+ public Set<String> previousTestResults;
public XTestOptions opts;
public String nextVariable;
public boolean expectedError;
@@ -45,6 +52,11 @@ public abstract class AbstractTestCaseFactory {
public int currPathLen;
public int count;
+ static int TEST_NAME_INDEX = 0;
+ static int TEST_RESULT_INDEX = 1;
+ static List<String> PASSING_TESTS = Arrays.asList("EXPECTED_RESULT_GOT_SAME_RESULT",
+ "EXPECTED_ERROR_GOT_SAME_ERROR");
+
public AbstractTestCaseFactory(XTestOptions opts) {
System.err.println("opts.catalog: " + opts.catalog);
this.catalog = new File(opts.catalog);
@@ -58,6 +70,11 @@ public abstract class AbstractTestCaseFactory {
if (opts.exclude != null) {
this.exclude = Pattern.compile(opts.exclude);
}
+ if (opts.previousTestResults != null) {
+ this.previousTestResults = getPreviousTests(opts.previousTestResults);
+ } else {
+ this.previousTestResults = null;
+ }
try {
currPathLen = new File(".").getCanonicalPath().length();
} catch (IOException e) {
@@ -65,6 +82,27 @@ public abstract class AbstractTestCaseFactory {
}
}
+ private static Set<String> getPreviousTests(String previousTestResults) {
+ Set<String> tests = new LinkedHashSet<String>();
+ try {
+ BufferedReader br = new BufferedReader(new FileReader(previousTestResults));
+ String line;
+ String[] resultRow;
+ while ((line = br.readLine()) != null) {
+ resultRow = line.split(",");
+ if (PASSING_TESTS.contains(resultRow[TEST_RESULT_INDEX].trim())) {
+ tests.add(resultRow[TEST_NAME_INDEX].trim());
+ }
+ }
+ br.close();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return tests;
+ }
+
public int process() throws Exception {
count = 0;
XMLReader parser = XMLReaderFactory.createXMLReader();
@@ -79,10 +117,21 @@ public abstract class AbstractTestCaseFactory {
+ new File(url.getFile()).getCanonicalPath().substring(currPathLen));
}
});
- parser.parse(new InputSource(new FileReader(catalog)));
+ FileReader characterStream = new FileReader(catalog);
+ parser.parse(new InputSource(characterStream));
+ characterStream.close();
return count;
}
+ protected boolean submitTestCase(TestCase tc) {
+ boolean toSubmit = include == null || include.matcher(tc.getXQueryDisplayName()).find();
+ toSubmit = toSubmit && (exclude == null || !exclude.matcher(tc.getXQueryDisplayName()).find());
+ if (previousTestResults != null) {
+ toSubmit = previousTestResults.contains(tc.getXQueryDisplayName());
+ }
+ return toSubmit;
+ }
+
protected abstract void submit(TestCase tc);
protected class Handler implements ContentHandler {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java
index 758a219..bc17bba 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/HTMLFileReporterImpl.java
@@ -101,7 +101,6 @@ public class HTMLFileReporterImpl implements ResultReporter {
writeHTML(out, createResultDir(reportFile));
out.flush();
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java
index 96fdc0e..df18b53 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ServletReporterImpl.java
@@ -51,6 +51,6 @@ public class ServletReporterImpl extends AbstractHandler implements ResultReport
@Override
public void close() {
-
+ reporter.close();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java
index f3980db..d168185 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseFactory.java
@@ -26,11 +26,9 @@ public class TestCaseFactory extends AbstractTestCaseFactory {
this.trf = trf;
this.eSvc = eSvc;
}
-
+
protected void submit(TestCase tc) {
- boolean toSubmit = include == null || include.matcher(tc.getXQueryDisplayName()).find();
- toSubmit = toSubmit && (exclude == null || !exclude.matcher(tc.getXQueryDisplayName()).find());
- if (toSubmit) {
+ if (submitTestCase(tc)) {
if (opts.verbose) {
System.err.println(tc);
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
index 9c0bc64..146f277 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
@@ -111,6 +111,7 @@ public class TestRunner {
testCase.getSourceFileMap());
compiler.compile(testCase.getXQueryDisplayName(), in, ccb, opts.optimizationLevel);
JobSpecification spec = compiler.getModule().getHyracksJobSpecification();
+ in.close();
DynamicContext dCtx = new DynamicContextImpl(compiler.getModule().getModuleContext());
spec.setGlobalJobDataFactory(new VXQueryGlobalDataFactory(dCtx.createFactory()));
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
index 4788b6e..2b7b508 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
@@ -35,6 +35,9 @@ public class XTestOptions {
@Option(name = "-exclude", required = false, usage = "Exclude filter regular expression")
String exclude;
+ @Option(name = "-previous-test-results", required = false, usage = "File path to previous test results (text report output file)")
+ String previousTestResults;
+
@Option(name = "-v", required = false, usage = "Verbose")
boolean verbose;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java
index 337fbd2..e1ea215 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/JUnitTestCaseFactory.java
@@ -26,9 +26,10 @@ public class JUnitTestCaseFactory extends AbstractTestCaseFactory {
}
protected void submit(TestCase tc) {
- boolean toSubmit = include == null || include.matcher(tc.getXQueryDisplayName()).find();
- toSubmit = toSubmit && (exclude == null || !exclude.matcher(tc.getXQueryDisplayName()).find());
- if (toSubmit) {
+ if (submitTestCase(tc)) {
+ if (opts.verbose) {
+ System.err.println(tc);
+ }
testCases.add(new Object[] { tc });
++count;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
index 28d7735..f772dc8 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
@@ -32,11 +32,27 @@ public class VXQueryTest {
private TestCase tc;
private TestRunner tr;
- private static String CATALOG = "VXQueryCatalog.xml";
+ private static String VXQUERY_CATALOG = StringUtils.join(new String[] { "src", "test", "resources",
+ "VXQueryCatalog.xml" }, File.separator);
+ private static String XQTS_CATALOG = StringUtils.join(new String[] { "test-suites", "xqts", "XQTSCatalog.xml" },
+ File.separator);
- private static XTestOptions getOptions() {
+ private static boolean includeXqtsTests() {
+ return new File(XQTS_CATALOG).isFile();
+ }
+
+ private static XTestOptions getVXQueryOptions() {
+ XTestOptions opts = new XTestOptions();
+ opts.catalog = VXQUERY_CATALOG;
+ opts.verbose = false;
+ opts.threads = 1;
+ return opts;
+ }
+
+ private static XTestOptions getPreviousTestOptions() {
XTestOptions opts = new XTestOptions();
- opts.catalog = StringUtils.join(new String[] { "src", "test", "resources", CATALOG }, File.separator);
+ opts.catalog = XQTS_CATALOG;
+ opts.previousTestResults = StringUtils.join(new String[] { "results", "xqts.txt" }, File.separator);
opts.verbose = false;
opts.threads = 1;
return opts;
@@ -44,13 +60,19 @@ public class VXQueryTest {
@Parameters
public static Collection<Object[]> tests() throws Exception {
- JUnitTestCaseFactory jtcf = new JUnitTestCaseFactory(getOptions());
- return jtcf.getList();
+ JUnitTestCaseFactory jtcf_vxquery = new JUnitTestCaseFactory(getVXQueryOptions());
+ Collection<Object[]> tests = jtcf_vxquery.getList();
+ if (includeXqtsTests()) {
+ JUnitTestCaseFactory jtcf_previous = new JUnitTestCaseFactory(getPreviousTestOptions());
+ tests.addAll(jtcf_previous.getList());
+ }
+
+ return tests;
}
public VXQueryTest(TestCase tc) throws Exception {
this.tc = tc;
- tr = new TestRunner(getOptions());
+ tr = new TestRunner(getVXQueryOptions());
}
@Test
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:abs.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:abs.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:abs.txt
deleted file mode 100644
index 77fbb52..0000000
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:abs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-5.5
-5
-5.5
-5.5
-5.5
-5
-5.5
-5.5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:ceiling.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:ceiling.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:ceiling.txt
deleted file mode 100644
index 1c95747..0000000
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:ceiling.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-6
-5
-6
-6
--5
--5
--5
--5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_abs.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_abs.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_abs.txt
new file mode 100644
index 0000000..77fbb52
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_abs.txt
@@ -0,0 +1,8 @@
+5.5
+5
+5.5
+5.5
+5.5
+5
+5.5
+5.5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_ceiling.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_ceiling.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_ceiling.txt
new file mode 100644
index 0000000..1c95747
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_ceiling.txt
@@ -0,0 +1,8 @@
+6
+5
+6
+6
+-5
+-5
+-5
+-5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:abs.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:abs.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:abs.xq
deleted file mode 100644
index 44bd08e..0000000
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:abs.xq
+++ /dev/null
@@ -1,22 +0,0 @@
-(: Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License. :)
-
-(: XQuery fn:abs :)
-(
- fn:abs(xs:decimal(5.5)), fn:abs(xs:integer(5)), fn:abs(xs:float(5.5)), fn:abs(xs:double(5.5)),
- fn:abs(xs:decimal(-5.5)), fn:abs(xs:integer(-5)), fn:abs(xs:float(-5.5)), fn:abs(xs:double(-5.5))
-)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:ceiling.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:ceiling.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:ceiling.xq
deleted file mode 100644
index 6a14197..0000000
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:ceiling.xq
+++ /dev/null
@@ -1,22 +0,0 @@
-(: Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License. :)
-
-(: XQuery fn:ceiling :)
-(
- fn:ceiling(xs:decimal(5.5)), fn:ceiling(xs:integer(5)), fn:ceiling(xs:float(5.5)), fn:ceiling(xs:double(5.5)),
- fn:ceiling(xs:decimal(-5.5)), fn:ceiling(xs:integer(-5)), fn:ceiling(xs:float(-5.5)), fn:ceiling(xs:double(-5.5))
-)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_abs.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_abs.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_abs.xq
new file mode 100644
index 0000000..44bd08e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_abs.xq
@@ -0,0 +1,22 @@
+(: 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. :)
+
+(: XQuery fn:abs :)
+(
+ fn:abs(xs:decimal(5.5)), fn:abs(xs:integer(5)), fn:abs(xs:float(5.5)), fn:abs(xs:double(5.5)),
+ fn:abs(xs:decimal(-5.5)), fn:abs(xs:integer(-5)), fn:abs(xs:float(-5.5)), fn:abs(xs:double(-5.5))
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_ceiling.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_ceiling.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_ceiling.xq
new file mode 100644
index 0000000..6a14197
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_ceiling.xq
@@ -0,0 +1,22 @@
+(: 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. :)
+
+(: XQuery fn:ceiling :)
+(
+ fn:ceiling(xs:decimal(5.5)), fn:ceiling(xs:integer(5)), fn:ceiling(xs:float(5.5)), fn:ceiling(xs:double(5.5)),
+ fn:ceiling(xs:decimal(-5.5)), fn:ceiling(xs:integer(-5)), fn:ceiling(xs:float(-5.5)), fn:ceiling(xs:double(-5.5))
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml b/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
index e79c514..4b6555d 100644
--- a/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
+++ b/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
@@ -20,14 +20,14 @@
<title>Function and Operators on Numerics</title>
<description/>
</GroupInfo>
- <test-case name="functions-and-operators-on-numerics-fn:abs" FilePath="Numerics/" Creator="Preston Carman">
+ <test-case name="functions-and-operators-on-numerics-fn_abs" FilePath="Numerics/" Creator="Preston Carman">
<description>Query for fn:abs with all numeric types.</description>
- <query name="fn:abs" date="2015-01-05"/>
- <output-file compare="Text">fn:abs.txt</output-file>
+ <query name="fn_abs" date="2015-01-05"/>
+ <output-file compare="Text">fn_abs.txt</output-file>
</test-case>
- <test-case name="functions-and-operators-on-numerics-fn:ceiling" FilePath="Numerics/" Creator="Preston Carman">
+ <test-case name="functions-and-operators-on-numerics-fn_ceiling" FilePath="Numerics/" Creator="Preston Carman">
<description>Query for fn:ceiling with all numeric types.</description>
- <query name="fn:ceiling" date="2015-01-05"/>
- <output-file compare="Text">fn:ceiling.txt</output-file>
+ <query name="fn_ceiling" date="2015-01-05"/>
+ <output-file compare="Text">fn_ceiling.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
[23/25] vxquery git commit: Updated XQTS results and included fix for
Algebricks upgrade.
Posted by pr...@apache.org.
Updated XQTS results and included fix for Algebricks upgrade.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d33315f2
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d33315f2
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d33315f2
Branch: refs/heads/master
Commit: d33315f2e2871d4f73443e80809c8adfe782f4d8
Parents: d68e725
Author: Preston Carman <pr...@apache.org>
Authored: Thu Feb 19 12:55:40 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Feb 19 12:55:40 2015 -0800
----------------------------------------------------------------------
.../xmlquery/query/XMLQueryCompiler.java | 2 +-
vxquery-xtest/results/xqts.txt | 4350 +++++++++---------
2 files changed, 2176 insertions(+), 2176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d33315f2/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index c15e324..3055c64 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -169,7 +169,7 @@ public class XMLQueryCompiler {
@Override
public boolean canBeNull(Object type) {
- throw new NotImplementedException("NullableTypeComputer is not implented (canBeNull)");
+ return false;
}
@Override
[05/25] vxquery git commit: Log output settings have been refined for
testing.
Posted by pr...@apache.org.
Log output settings have been refined for testing.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/9ba58f87
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/9ba58f87
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/9ba58f87
Branch: refs/heads/master
Commit: 9ba58f877bcfe780e35894fb563714629047aec2
Parents: b665db7
Author: Preston Carman <pr...@apache.org>
Authored: Thu Dec 18 10:51:06 2014 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Dec 18 10:51:06 2014 -0800
----------------------------------------------------------------------
.../resources/noaa-ghcn-daily/scripts/testing_logging.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/9ba58f87/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
index 672e456..ec85207 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
@@ -62,7 +62,7 @@ handlers= java.util.logging.ConsoleHandler
# Limit the message that are printed on the console to FINE and above.
-java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.level = INFO
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
@@ -76,4 +76,4 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
# edu.uci.ics.asterix.level = FINE
# edu.uci.ics.hyracks.algebricks.level = FINE
-edu.uci.ics.hyracks.level = FINE
+edu.uci.ics.hyracks.level = SEVERE
[21/25] vxquery git commit: Added rat exclusion for folder manually
created for XQTS.
Posted by pr...@apache.org.
Added rat exclusion for folder manually created for XQTS.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d68e7255
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d68e7255
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d68e7255
Branch: refs/heads/master
Commit: d68e7255f796d4f9091fc0593430467c73cd5ce9
Parents: 2e68da4
Author: Preston Carman <pr...@apache.org>
Authored: Thu Feb 19 12:10:39 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Feb 19 12:10:39 2015 -0800
----------------------------------------------------------------------
.../org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java | 6 +++---
vxquery-xtest/pom.xml | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d68e7255/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index 4f082aa..c15e324 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -164,17 +164,17 @@ public class XMLQueryCompiler {
builder.setNullableTypeComputer(new INullableTypeComputer() {
@Override
public Object makeNullableType(Object type) throws AlgebricksException {
- throw new NotImplementedException("NullableTypeComputer is not implented");
+ throw new NotImplementedException("NullableTypeComputer is not implented (makeNullableType)");
}
@Override
public boolean canBeNull(Object type) {
- throw new NotImplementedException("NullableTypeComputer is not implented");
+ throw new NotImplementedException("NullableTypeComputer is not implented (canBeNull)");
}
@Override
public Object getNonOptionalType(Object type) {
- throw new NotImplementedException("NullableTypeComputer is not implented");
+ throw new NotImplementedException("NullableTypeComputer is not implented (getNonOptionalType)");
}
});
builder.setNullWriterFactory(new VXQueryNullWriterFactory());
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d68e7255/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 483f289..a34bcee 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -188,6 +188,7 @@
<excludes>
<exclude>**/ExpectedTestResults/**/*</exclude>
<exclude>**/xqts.txt</exclude>
+ <exclude>test-suites/**/*</exclude>
</excludes>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
<maxmemory>2g</maxmemory>
[06/25] vxquery git commit: Switched arithmetic from a static call to
an object created at the beginning of processing.
Posted by pr...@apache.org.
Switched arithmetic from a static call to an object created at the beginning of processing.
- Helps with reusing array backed value stores.
- Added option for max data size.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d5101a17
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d5101a17
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d5101a17
Branch: refs/heads/master
Commit: d5101a176d7b9124db5621dee228644124ac50f6
Parents: 9ba58f8
Author: Preston Carman <pr...@apache.org>
Authored: Fri Dec 19 09:24:06 2014 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Dec 19 09:24:06 2014 -0800
----------------------------------------------------------------------
.../java/org/apache/vxquery/cli/VXQuery.java | 5 +-
.../builders/atomic/UTF8StringBuilder.java | 54 ++
.../builders/base/AbstractBuilder.java | 27 +
.../builders/nodes/UTF8StringBuilder.java | 53 --
.../AvgGlobalAggregateEvaluatorFactory.java | 14 +-
.../AvgLocalAggregateEvaluatorFactory.java | 8 +-
.../FnAvgAggregateEvaluatorFactory.java | 9 +-
.../aggregate/FnAvgScalarEvaluatorFactory.java | 11 +-
.../FnSumAggregateEvaluatorFactory.java | 8 +-
.../aggregate/FnSumScalarEvaluatorFactory.java | 8 +-
...bstractArithmeticScalarEvaluatorFactory.java | 13 +-
.../functions/util/ArithmeticHelper.java | 511 +++++++++++++++++++
.../vxquery/xmlparser/SAXContentHandler.java | 2 +-
.../xmlquery/query/XMLQueryCompiler.java | 12 +-
.../src/main/resources/conf/cluster.properties | 3 +-
15 files changed, 636 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 1e083df..866edd1 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -261,7 +261,7 @@ public class VXQuery {
start = opts.timing ? new Date() : null;
XMLQueryCompiler compiler = new XMLQueryCompiler(listener, getNodeList(), opts.frameSize,
- opts.availableProcessors, opts.joinHashSize);
+ opts.availableProcessors, opts.joinHashSize, opts.maximumDataSize);
resultSetId = createResultSetId();
CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(RootStaticContextImpl.INSTANCE),
resultSetId, null);
@@ -453,6 +453,9 @@ public class VXQuery {
@Option(name = "-join-hash-size", usage = "Join hash size in bytes. (default 67,108,864)")
private long joinHashSize = -1;
+ @Option(name = "-maximum-data-size", usage = "Maximum possible data size in bytes. (default 150,323,855,000)")
+ private long maximumDataSize = -1;
+
@Option(name = "-buffer-size", usage = "Disk read buffer size in bytes.")
private int bufferSize = -1;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
new file mode 100644
index 0000000..f1961ff
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
@@ -0,0 +1,54 @@
+/*
+ * 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.vxquery.datamodel.builders.atomic;
+
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.UTFDataFormatException;
+
+import org.apache.vxquery.datamodel.builders.base.AbstractBuilder;
+import org.apache.vxquery.runtime.functions.util.FunctionHelper;
+
+import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
+
+public class UTF8StringBuilder extends AbstractBuilder {
+ private IMutableValueStorage mvs;
+ private DataOutput out;
+
+ @Override
+ public void reset(IMutableValueStorage mvs) throws IOException {
+ this.mvs = mvs;
+ out = mvs.getDataOutput();
+ out.write(0);
+ out.write(0);
+ }
+
+ @Override
+ public void finish() throws IOException {
+ int utflen = mvs.getLength() - 2;
+ BytePointable.setByte(mvs.getByteArray(), 0, (byte) ((utflen >>> 8) & 0xFF));
+ BytePointable.setByte(mvs.getByteArray(), 1, (byte) ((utflen >>> 0) & 0xFF));
+ }
+
+ public void appendCharArray(char[] ch, int start, int length) throws IOException {
+ FunctionHelper.writeCharArray(ch, start, length, out);
+ if (mvs.getLength() > 65535) {
+ throw new UTFDataFormatException("encoded string too long: " + mvs.getLength() + " bytes");
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
new file mode 100644
index 0000000..4ba9a14
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
@@ -0,0 +1,27 @@
+/*
+ * 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.vxquery.datamodel.builders.base;
+
+import java.io.IOException;
+
+import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+
+public abstract class AbstractBuilder {
+ public abstract void reset(IMutableValueStorage mvs) throws IOException;
+
+ public abstract void finish() throws IOException;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
deleted file mode 100644
index 3b4eea0..0000000
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.datamodel.builders.nodes;
-
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.UTFDataFormatException;
-
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-
-public class UTF8StringBuilder extends AbstractNodeBuilder {
- private IMutableValueStorage mvs;
- private DataOutput out;
-
- @Override
- public void reset(IMutableValueStorage mvs) throws IOException {
- this.mvs = mvs;
- out = mvs.getDataOutput();
- out.write(0);
- out.write(0);
- }
-
- @Override
- public void finish() throws IOException {
- int utflen = mvs.getLength() - 2;
- BytePointable.setByte(mvs.getByteArray(), 0, (byte) ((utflen >>> 8) & 0xFF));
- BytePointable.setByte(mvs.getByteArray(), 1, (byte) ((utflen >>> 0) & 0xFF));
- }
-
- public void appendCharArray(char[] ch, int start, int length) throws IOException {
- FunctionHelper.writeCharArray(ch, start, length, out);
- if (mvs.getLength() > 65535) {
- throw new UTFDataFormatException("encoded string too long: " + mvs.getLength() + " bytes");
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
index f784a13..0f4ac08 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
@@ -29,6 +29,7 @@ import org.apache.vxquery.runtime.functions.arithmetic.AddOperation;
import org.apache.vxquery.runtime.functions.arithmetic.DivideOperation;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
+import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -53,13 +54,14 @@ public class AvgGlobalAggregateEvaluatorFactory extends AbstractTaggedValueArgum
final ArrayBackedValueStorage abvsSum = new ArrayBackedValueStorage();
final DataOutput dOutSum = abvsSum.getDataOutput();
final AddOperation aOp = new AddOperation();
+ final ArithmeticHelper add1 = new ArithmeticHelper(aOp, dCtx);
+ final ArithmeticHelper add2 = new ArithmeticHelper(aOp, dCtx);
final DivideOperation aOpDivide = new DivideOperation();
+ final ArithmeticHelper divide = new ArithmeticHelper(aOpDivide, dCtx);
final LongPointable longp = (LongPointable) LongPointable.FACTORY.createPointable();
final SequencePointable seq = (SequencePointable) SequencePointable.FACTORY.createPointable();
final TaggedValuePointable tvpArg = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
- final TypedPointables tp1 = new TypedPointables();
- final TypedPointables tp2 = new TypedPointables();
-
+
return new AbstractTaggedValueArgumentAggregateEvaluator(args) {
TaggedValuePointable tvpSum = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
TaggedValuePointable tvpCount = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
@@ -93,7 +95,7 @@ public class AvgGlobalAggregateEvaluatorFactory extends AbstractTaggedValueArgum
} else {
// Set count as a TaggedValuePointable.
try {
- FunctionHelper.arithmeticOperation(aOpDivide, dCtx, tvpSum, tvpCount, tvpSum, tp1, tp2);
+ divide.compute(tvpSum, tvpCount, tvpSum);
result.set(tvpSum);
} catch (Exception e) {
throw new AlgebricksException(e);
@@ -112,9 +114,9 @@ public class AvgGlobalAggregateEvaluatorFactory extends AbstractTaggedValueArgum
return;
} else if (seqLen == 2) {
seq.getEntry(0, tvpArg);
- FunctionHelper.arithmeticOperation(aOp, dCtx, tvpArg, tvpCount, tvpCount, tp1, tp2);
+ add1.compute(tvpArg, tvpCount, tvpCount);
seq.getEntry(1, tvpArg);
- FunctionHelper.arithmeticOperation(aOp, dCtx, tvpArg, tvpSum, tvpSum, tp1, tp2);
+ add2.compute(tvpArg, tvpSum, tvpSum);
} else {
throw new SystemException(ErrorCode.SYSE0001);
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
index e325165..6eac723 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
@@ -19,7 +19,6 @@ package org.apache.vxquery.runtime.functions.aggregate;
import java.io.DataOutput;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.accessors.TypedPointables;
import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.datamodel.values.XDMConstants;
@@ -27,7 +26,7 @@ import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.arithmetic.AddOperation;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
+import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
@@ -53,8 +52,7 @@ public class AvgLocalAggregateEvaluatorFactory extends AbstractTaggedValueArgume
final ArrayBackedValueStorage abvsSeq = new ArrayBackedValueStorage();
final SequenceBuilder sb = new SequenceBuilder();
final AddOperation aOp = new AddOperation();
- final TypedPointables tp1 = new TypedPointables();
- final TypedPointables tp2 = new TypedPointables();
+ final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
return new AbstractTaggedValueArgumentAggregateEvaluator(args) {
long count;
@@ -106,7 +104,7 @@ public class AvgLocalAggregateEvaluatorFactory extends AbstractTaggedValueArgume
@Override
protected void step(TaggedValuePointable[] args) throws SystemException {
TaggedValuePointable tvp = args[0];
- FunctionHelper.arithmeticOperation(aOp, dCtx, tvp, tvpSum, tvpSum, tp1, tp2);
+ add.compute(tvp, tvpSum, tvpSum);
count++;
}
};
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
index e1e6204..d89426b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
@@ -29,6 +29,7 @@ import org.apache.vxquery.runtime.functions.arithmetic.AddOperation;
import org.apache.vxquery.runtime.functions.arithmetic.DivideOperation;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
+import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
import org.apache.vxquery.runtime.functions.util.FunctionHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -53,9 +54,9 @@ public class FnAvgAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA
final ArrayBackedValueStorage abvsCount = new ArrayBackedValueStorage();
final DataOutput dOutCount = abvsCount.getDataOutput();
final AddOperation aOp = new AddOperation();
+ final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
final DivideOperation aOpDivide = new DivideOperation();
- final TypedPointables tp1 = new TypedPointables();
- final TypedPointables tp2 = new TypedPointables();
+ final ArithmeticHelper divide = new ArithmeticHelper(aOpDivide, dCtx);
return new AbstractTaggedValueArgumentAggregateEvaluator(args) {
long count;
@@ -83,7 +84,7 @@ public class FnAvgAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA
dOutCount.writeLong(count);
tvpCount.set(abvsCount);
- FunctionHelper.arithmeticOperation(aOpDivide, dCtx, tvpSum, tvpCount, tvpSum, tp1, tp2);
+ divide.compute(tvpSum, tvpCount, tvpSum);
result.set(tvpSum);
} catch (Exception e) {
throw new AlgebricksException(e);
@@ -104,7 +105,7 @@ public class FnAvgAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA
throw new SystemException(ErrorCode.SYSE0001, e.toString());
}
} else {
- FunctionHelper.arithmeticOperation(aOp, dCtx, tvp, tvpSum, tvpSum, new TypedPointables(), new TypedPointables());
+ add.compute(tvp, tvpSum, tvpSum);
}
count++;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
index e02f4e2..31fcecc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
@@ -21,7 +21,6 @@ import java.io.DataOutput;
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.datamodel.accessors.SequencePointable;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.accessors.TypedPointables;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.exceptions.ErrorCode;
@@ -30,7 +29,7 @@ import org.apache.vxquery.runtime.functions.arithmetic.AddOperation;
import org.apache.vxquery.runtime.functions.arithmetic.DivideOperation;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
+import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
@@ -57,9 +56,9 @@ public class FnAvgScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
final DataOutput dOut = abvs.getDataOutput();
final AddOperation aOp = new AddOperation();
+ final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
final DivideOperation aOpDivide = new DivideOperation();
- final TypedPointables tp1 = new TypedPointables();
- final TypedPointables tp2 = new TypedPointables();
+ final ArithmeticHelper divide = new ArithmeticHelper(aOpDivide, dCtx);
return new AbstractTaggedValueArgumentScalarEvaluator(args) {
@Override
@@ -78,7 +77,7 @@ public class FnAvgScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
// Init.
tvpSum.set(tvpNext);
} else {
- FunctionHelper.arithmeticOperation(aOp, dCtx, tvpNext, tvpSum, tvpSum, tp1, tp2);
+ add.compute(tvpNext, tvpSum, tvpSum);
}
}
@@ -92,7 +91,7 @@ public class FnAvgScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
throw new SystemException(ErrorCode.SYSE0001, e);
}
- FunctionHelper.arithmeticOperation(aOpDivide, dCtx, tvpSum, tvpCount, tvpSum, tp1, tp2);
+ divide.compute(tvpSum, tvpCount, tvpSum);
result.set(tvpSum);
}
} else {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
index c9057ba..631b575 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
@@ -20,13 +20,12 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.accessors.TypedPointables;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.arithmetic.AddOperation;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
+import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
@@ -47,8 +46,7 @@ public class FnSumAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA
final ArrayBackedValueStorage abvsSum = new ArrayBackedValueStorage();
final DataOutput dOutSum = abvsSum.getDataOutput();
final AddOperation aOp = new AddOperation();
- final TypedPointables tp1 = new TypedPointables();
- final TypedPointables tp2 = new TypedPointables();
+ final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
return new AbstractTaggedValueArgumentAggregateEvaluator(args) {
TaggedValuePointable tvpSum = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
@@ -80,7 +78,7 @@ public class FnSumAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA
@Override
protected void step(TaggedValuePointable[] args) throws SystemException {
TaggedValuePointable tvp = args[0];
- FunctionHelper.arithmeticOperation(aOp, dCtx, tvp, tvpSum, tvpSum, tp1, tp2);
+ add.compute(tvp, tvpSum, tvpSum);
}
};
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
index 0c82710..e70efbe 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
@@ -21,14 +21,13 @@ import java.io.DataOutput;
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.datamodel.accessors.SequencePointable;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.accessors.TypedPointables;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.arithmetic.AddOperation;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
+import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
@@ -56,8 +55,7 @@ public class FnSumScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
final TaggedValuePointable tvpSum = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
final VoidPointable p = (VoidPointable) VoidPointable.FACTORY.createPointable();
final AddOperation aOp = new AddOperation();
- final TypedPointables tp1 = new TypedPointables();
- final TypedPointables tp2 = new TypedPointables();
+ final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
return new AbstractTaggedValueArgumentScalarEvaluator(args) {
@Override
@@ -91,7 +89,7 @@ public class FnSumScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
// Init.
tvpSum.set(tvpNext);
} else {
- FunctionHelper.arithmeticOperation(aOp, dCtx, tvpNext, tvpSum, tvpSum, tp1, tp2);
+ add.compute(tvpNext, tvpSum, tvpSum);
}
}
result.set(tvpSum);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
index eafb048..90e1c4e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
@@ -16,17 +16,15 @@
*/
package org.apache.vxquery.runtime.functions.arithmetic;
-
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.datamodel.accessors.SequencePointable;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.accessors.TypedPointables;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
+import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
@@ -45,11 +43,9 @@ public abstract class AbstractArithmeticScalarEvaluatorFactory extends
@Override
protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
throws AlgebricksException {
- final AbstractArithmeticOperation aOp = createArithmeticOperation();
- final SequencePointable seqp = (SequencePointable) SequencePointable.FACTORY.createPointable();
final DynamicContext dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
- final TypedPointables tp1 = new TypedPointables();
- final TypedPointables tp2 = new TypedPointables();
+ final ArithmeticHelper aHelper = new ArithmeticHelper(createArithmeticOperation(), dCtx);
+ final SequencePointable seqp = (SequencePointable) SequencePointable.FACTORY.createPointable();
return new AbstractTaggedValueArgumentScalarEvaluator(args) {
@Override
@@ -72,11 +68,10 @@ public abstract class AbstractArithmeticScalarEvaluatorFactory extends
}
throw new SystemException(ErrorCode.XPTY0004);
}
- FunctionHelper.arithmeticOperation(aOp, dCtx, tvp1, tvp2, result, tp1, tp2);
+ aHelper.compute(tvp1, tvp2, result);
}
};
}
-
protected abstract AbstractArithmeticOperation createArithmeticOperation();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
new file mode 100644
index 0000000..0c2b41a
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java
@@ -0,0 +1,511 @@
+/*
+ * 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.vxquery.runtime.functions.util;
+
+import java.io.DataOutput;
+
+import org.apache.vxquery.context.DynamicContext;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.accessors.TypedPointables;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.exceptions.ErrorCode;
+import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.runtime.functions.arithmetic.AbstractArithmeticOperation;
+import org.apache.vxquery.runtime.functions.cast.CastToDoubleOperation;
+import org.apache.vxquery.types.BuiltinTypeConstants;
+import org.apache.vxquery.types.BuiltinTypeRegistry;
+
+import edu.uci.ics.hyracks.data.std.api.IPointable;
+import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
+import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+
+public class ArithmeticHelper {
+ private final AbstractArithmeticOperation aOp;
+ private final DynamicContext dCtx;
+ private final TypedPointables tp1;
+ private final TypedPointables tp2;
+ private final ArrayBackedValueStorage abvs;
+ private final DataOutput dOut;
+ private final ArrayBackedValueStorage abvsArgument1;
+ private final DataOutput dOutArgument1;
+ private final ArrayBackedValueStorage abvsArgument2;
+ private final DataOutput dOutArgument2;
+ private final CastToDoubleOperation castToDouble;
+
+ public ArithmeticHelper(AbstractArithmeticOperation aOp, DynamicContext dCtx) {
+ this.aOp = aOp;
+ this.dCtx = dCtx;
+ tp1 = new TypedPointables();
+ tp2 = new TypedPointables();
+ abvs = new ArrayBackedValueStorage();
+ dOut = abvs.getDataOutput();
+ abvsArgument1 = new ArrayBackedValueStorage();
+ dOutArgument1 = abvsArgument1.getDataOutput();
+ abvsArgument2 = new ArrayBackedValueStorage();
+ dOutArgument2 = abvsArgument2.getDataOutput();
+ castToDouble = new CastToDoubleOperation();
+ }
+
+ public void compute(TaggedValuePointable tvp1, TaggedValuePointable tvp2, IPointable result) throws SystemException {
+ abvs.reset();
+ try {
+ int tid1 = getBaseTypeForArithmetics(tvp1.getTag());
+ int tid2 = getBaseTypeForArithmetics(tvp2.getTag());
+ LongPointable longp1 = (LongPointable) LongPointable.FACTORY.createPointable();
+ DoublePointable doublep1 = (DoublePointable) DoublePointable.FACTORY.createPointable();
+ switch (tvp1.getTag()) {
+ case ValueTag.XS_INTEGER_TAG:
+ case ValueTag.XS_NON_POSITIVE_INTEGER_TAG:
+ case ValueTag.XS_NEGATIVE_INTEGER_TAG:
+ case ValueTag.XS_LONG_TAG:
+ case ValueTag.XS_NON_NEGATIVE_INTEGER_TAG:
+ case ValueTag.XS_UNSIGNED_LONG_TAG:
+ case ValueTag.XS_POSITIVE_INTEGER_TAG:
+ case ValueTag.XS_INT_TAG:
+ case ValueTag.XS_UNSIGNED_INT_TAG:
+ case ValueTag.XS_SHORT_TAG:
+ case ValueTag.XS_UNSIGNED_SHORT_TAG:
+ case ValueTag.XS_BYTE_TAG:
+ case ValueTag.XS_UNSIGNED_BYTE_TAG:
+ abvsArgument1.reset();
+ FunctionHelper.getIntegerPointable(tvp1, dOutArgument1, tp1);
+ longp1.set(abvsArgument1.getByteArray(), abvsArgument1.getStartOffset() + 1,
+ LongPointable.TYPE_TRAITS.getFixedLength());
+ break;
+ case ValueTag.XS_DOUBLE_TAG:
+ tvp1.getValue(doublep1);
+ break;
+ case ValueTag.XS_UNTYPED_ATOMIC_TAG:
+ tid1 = ValueTag.XS_DOUBLE_TAG;
+ tvp1.getValue(tp1.utf8sp);
+ abvsArgument1.reset();
+ castToDouble.convertUntypedAtomic(tp1.utf8sp, dOutArgument1);
+ doublep1.set(abvsArgument1.getByteArray(), abvsArgument1.getStartOffset() + 1,
+ DoublePointable.TYPE_TRAITS.getFixedLength());
+ break;
+ }
+ LongPointable longp2 = (LongPointable) LongPointable.FACTORY.createPointable();
+ DoublePointable doublep2 = (DoublePointable) DoublePointable.FACTORY.createPointable();
+ switch (tvp2.getTag()) {
+ case ValueTag.XS_INTEGER_TAG:
+ case ValueTag.XS_NON_POSITIVE_INTEGER_TAG:
+ case ValueTag.XS_NEGATIVE_INTEGER_TAG:
+ case ValueTag.XS_LONG_TAG:
+ case ValueTag.XS_NON_NEGATIVE_INTEGER_TAG:
+ case ValueTag.XS_UNSIGNED_LONG_TAG:
+ case ValueTag.XS_POSITIVE_INTEGER_TAG:
+ case ValueTag.XS_INT_TAG:
+ case ValueTag.XS_UNSIGNED_INT_TAG:
+ case ValueTag.XS_SHORT_TAG:
+ case ValueTag.XS_UNSIGNED_SHORT_TAG:
+ case ValueTag.XS_BYTE_TAG:
+ case ValueTag.XS_UNSIGNED_BYTE_TAG:
+ abvsArgument2.reset();
+ FunctionHelper.getIntegerPointable(tvp2, dOutArgument2, tp2);
+ longp2.set(abvsArgument2.getByteArray(), abvsArgument2.getStartOffset() + 1,
+ LongPointable.TYPE_TRAITS.getFixedLength());
+ break;
+ case ValueTag.XS_DOUBLE_TAG:
+ tvp2.getValue(doublep2);
+ break;
+ case ValueTag.XS_UNTYPED_ATOMIC_TAG:
+ tid2 = ValueTag.XS_DOUBLE_TAG;
+ tvp2.getValue(tp2.utf8sp);
+ abvsArgument2.reset();
+ castToDouble.convertUntypedAtomic(tp2.utf8sp, dOutArgument2);
+ doublep2.set(abvsArgument2.getByteArray(), abvsArgument2.getStartOffset() + 1,
+ DoublePointable.TYPE_TRAITS.getFixedLength());
+ break;
+ }
+ switch (tid1) {
+ case ValueTag.XS_DECIMAL_TAG:
+ tvp1.getValue(tp1.decp);
+ switch (tid2) {
+ case ValueTag.XS_DECIMAL_TAG:
+ tvp2.getValue(tp2.decp);
+ aOp.operateDecimalDecimal(tp1.decp, tp2.decp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_INTEGER_TAG:
+ aOp.operateDecimalInteger(tp1.decp, longp2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_FLOAT_TAG:
+ tvp2.getValue(tp2.floatp);
+ aOp.operateDecimalFloat(tp1.decp, tp2.floatp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DOUBLE_TAG:
+ aOp.operateDecimalDouble(tp1.decp, doublep2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp2.getValue(tp2.longp);
+ aOp.operateDecimalDTDuration(tp1.decp, tp2.longp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ tvp2.getValue(tp2.intp);
+ aOp.operateDecimalYMDuration(tp1.decp, tp2.intp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+ }
+ break;
+
+ case ValueTag.XS_INTEGER_TAG:
+ switch (tid2) {
+ case ValueTag.XS_DECIMAL_TAG:
+ tvp2.getValue(tp2.decp);
+ aOp.operateIntegerDecimal(longp1, tp2.decp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_INTEGER_TAG:
+ aOp.operateIntegerInteger(longp1, longp2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_FLOAT_TAG:
+ tvp2.getValue(tp2.floatp);
+ aOp.operateIntegerFloat(longp1, tp2.floatp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DOUBLE_TAG:
+ aOp.operateIntegerDouble(longp1, doublep2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp2.getValue(tp2.longp);
+ aOp.operateIntegerDTDuration(longp1, tp2.longp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ tvp2.getValue(tp2.intp);
+ aOp.operateIntegerYMDuration(longp1, tp2.intp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+ }
+ break;
+
+ case ValueTag.XS_FLOAT_TAG:
+ tvp1.getValue(tp1.floatp);
+ switch (tid2) {
+ case ValueTag.XS_DECIMAL_TAG:
+ tvp2.getValue(tp2.decp);
+ aOp.operateFloatDecimal(tp1.floatp, tp2.decp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_INTEGER_TAG:
+ aOp.operateFloatInteger(tp1.floatp, longp2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_FLOAT_TAG:
+ tvp2.getValue(tp2.floatp);
+ aOp.operateFloatFloat(tp1.floatp, tp2.floatp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DOUBLE_TAG:
+ aOp.operateFloatDouble(tp1.floatp, doublep2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp2.getValue(tp2.longp);
+ aOp.operateFloatDTDuration(tp1.floatp, tp2.longp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ tvp2.getValue(tp2.intp);
+ aOp.operateFloatYMDuration(tp1.floatp, tp2.intp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+ }
+ break;
+
+ case ValueTag.XS_DOUBLE_TAG:
+ switch (tid2) {
+ case ValueTag.XS_DECIMAL_TAG:
+ tvp2.getValue(tp2.decp);
+ aOp.operateDoubleDecimal(doublep1, tp2.decp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_INTEGER_TAG:
+ aOp.operateDoubleInteger(doublep1, longp2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_FLOAT_TAG:
+ tvp2.getValue(tp2.floatp);
+ aOp.operateDoubleFloat(doublep1, tp2.floatp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DOUBLE_TAG:
+ aOp.operateDoubleDouble(doublep1, doublep2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp2.getValue(tp2.longp);
+ aOp.operateDoubleDTDuration(doublep1, tp2.longp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ tvp2.getValue(tp2.intp);
+ aOp.operateDoubleYMDuration(doublep1, tp2.intp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+ }
+ break;
+
+ case ValueTag.XS_DATE_TAG:
+ tvp1.getValue(tp1.datep);
+ switch (tid2) {
+ case ValueTag.XS_DATE_TAG:
+ tvp2.getValue(tp2.datep);
+ aOp.operateDateDate(tp1.datep, tp2.datep, dCtx, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp2.getValue(tp2.longp);
+ aOp.operateDateDTDuration(tp1.datep, tp2.longp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ tvp2.getValue(tp2.intp);
+ aOp.operateDateYMDuration(tp1.datep, tp2.intp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+ }
+ break;
+
+ case ValueTag.XS_DATETIME_TAG:
+ tvp1.getValue(tp1.datetimep);
+ switch (tid2) {
+ case ValueTag.XS_DATETIME_TAG:
+ tvp2.getValue(tp2.datetimep);
+ aOp.operateDatetimeDatetime(tp1.datetimep, tp2.datetimep, dCtx, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp2.getValue(tp2.longp);
+ aOp.operateDatetimeDTDuration(tp1.datetimep, tp2.longp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ tvp2.getValue(tp2.intp);
+ aOp.operateDatetimeYMDuration(tp1.datetimep, tp2.intp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+ }
+ break;
+
+ case ValueTag.XS_TIME_TAG:
+ tvp1.getValue(tp1.timep);
+ switch (tid2) {
+ case ValueTag.XS_TIME_TAG:
+ tvp2.getValue(tp2.timep);
+ aOp.operateTimeTime(tp1.timep, tp2.timep, dCtx, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp2.getValue(tp2.longp);
+ aOp.operateTimeDTDuration(tp1.timep, tp2.longp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ }
+ break;
+
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp1.getValue(tp1.longp);
+ switch (tid2) {
+ case ValueTag.XS_DECIMAL_TAG:
+ tvp2.getValue(tp2.decp);
+ aOp.operateDTDurationDecimal(tp1.longp, tp2.decp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_INTEGER_TAG:
+ aOp.operateDTDurationInteger(tp1.longp, longp2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_FLOAT_TAG:
+ tvp2.getValue(tp2.floatp);
+ aOp.operateDTDurationFloat(tp1.longp, tp2.floatp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DOUBLE_TAG:
+ aOp.operateDTDurationDouble(tp1.longp, doublep2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DATE_TAG:
+ tvp2.getValue(tp2.datep);
+ aOp.operateDTDurationDate(tp1.longp, tp2.datep, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_TIME_TAG:
+ tvp2.getValue(tp2.timep);
+ aOp.operateDTDurationTime(tp1.longp, tp2.timep, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DATETIME_TAG:
+ tvp2.getValue(tp2.datetimep);
+ aOp.operateDTDurationDatetime(tp1.longp, tp2.datetimep, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp2.getValue(tp2.longp);
+ aOp.operateDTDurationDTDuration(tp1.longp, tp2.longp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+ }
+ break;
+
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ tvp1.getValue(tp1.intp);
+ switch (tid2) {
+ case ValueTag.XS_DECIMAL_TAG:
+ tvp2.getValue(tp2.decp);
+ aOp.operateYMDurationDecimal(tp1.intp, tp2.decp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_INTEGER_TAG:
+ aOp.operateYMDurationInteger(tp1.intp, longp2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_FLOAT_TAG:
+ tvp2.getValue(tp2.floatp);
+ aOp.operateYMDurationFloat(tp1.intp, tp2.floatp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DOUBLE_TAG:
+ aOp.operateYMDurationDouble(tp1.intp, doublep2, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DATE_TAG:
+ tvp2.getValue(tp2.datep);
+ aOp.operateYMDurationDate(tp1.intp, tp2.datep, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_DATETIME_TAG:
+ tvp2.getValue(tp2.datetimep);
+ aOp.operateYMDurationDatetime(tp1.intp, tp2.datetimep, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ tvp2.getValue(tp2.intp);
+ aOp.operateYMDurationYMDuration(tp1.intp, tp2.intp, dOut);
+ result.set(abvs.getByteArray(), 0, abvs.getLength());
+ return;
+ }
+ break;
+ }
+ } catch (SystemException se) {
+ throw se;
+ } catch (Exception e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
+ }
+ throw new SystemException(ErrorCode.XPTY0004);
+ }
+
+ public static int getBaseTypeForArithmetics(int tid) throws SystemException {
+ if (tid >= BuiltinTypeConstants.BUILTIN_TYPE_COUNT) {
+ throw new SystemException(ErrorCode.XPTY0004);
+ }
+ while (true) {
+ switch (tid) {
+ case ValueTag.XS_STRING_TAG:
+ case ValueTag.XS_DECIMAL_TAG:
+ case ValueTag.XS_INTEGER_TAG:
+ case ValueTag.XS_FLOAT_TAG:
+ case ValueTag.XS_DOUBLE_TAG:
+ case ValueTag.XS_ANY_URI_TAG:
+ case ValueTag.XS_BOOLEAN_TAG:
+ case ValueTag.XS_DATE_TAG:
+ case ValueTag.XS_DATETIME_TAG:
+ case ValueTag.XS_TIME_TAG:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ case ValueTag.XS_BASE64_BINARY_TAG:
+ case ValueTag.XS_HEX_BINARY_TAG:
+ case ValueTag.XS_QNAME_TAG:
+ case ValueTag.XS_G_DAY_TAG:
+ case ValueTag.XS_G_MONTH_DAY_TAG:
+ case ValueTag.XS_G_MONTH_TAG:
+ case ValueTag.XS_G_YEAR_MONTH_TAG:
+ case ValueTag.XS_G_YEAR_TAG:
+ case ValueTag.XS_UNTYPED_ATOMIC_TAG:
+ return tid;
+
+ case ValueTag.XS_LONG_TAG:
+ case ValueTag.XS_NEGATIVE_INTEGER_TAG:
+ case ValueTag.XS_NON_POSITIVE_INTEGER_TAG:
+ case ValueTag.XS_NON_NEGATIVE_INTEGER_TAG:
+ case ValueTag.XS_POSITIVE_INTEGER_TAG:
+ case ValueTag.XS_UNSIGNED_INT_TAG:
+ case ValueTag.XS_UNSIGNED_LONG_TAG:
+ case ValueTag.XS_INT_TAG:
+ case ValueTag.XS_UNSIGNED_SHORT_TAG:
+ case ValueTag.XS_SHORT_TAG:
+ case ValueTag.XS_UNSIGNED_BYTE_TAG:
+ case ValueTag.XS_BYTE_TAG:
+ return ValueTag.XS_INTEGER_TAG;
+
+ case ValueTag.XS_ANY_ATOMIC_TAG:
+ throw new SystemException(ErrorCode.XPTY0004);
+
+ default:
+ tid = BuiltinTypeRegistry.INSTANCE.getSchemaTypeById(tid).getBaseType().getTypeId();
+ return tid;
+ }
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
index e40147e..296d062 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
+import org.apache.vxquery.datamodel.builders.atomic.UTF8StringBuilder;
import org.apache.vxquery.datamodel.builders.nodes.AbstractNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.AttributeNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.CommentNodeBuilder;
@@ -30,7 +31,6 @@ import org.apache.vxquery.datamodel.builders.nodes.DocumentNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.ElementNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.PINodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.TextNodeBuilder;
-import org.apache.vxquery.datamodel.builders.nodes.UTF8StringBuilder;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.types.BuiltinTypeQNames;
import org.apache.vxquery.types.ElementType;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index 0e18328..263a93d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -90,11 +90,11 @@ public class XMLQueryCompiler {
private String[] nodeList;
public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize) {
- this(listener, nodeList, frameSize, -1, -1);
+ this(listener, nodeList, frameSize, -1, -1, -1);
}
public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize,
- int availableProcessors, long joinHashSize) {
+ int availableProcessors, long joinHashSize, long maximumDataSize) {
this.listener = listener == null ? NoopXQueryCompilationListener.INSTANCE : listener;
this.frameSize = frameSize;
this.nodeList = nodeList;
@@ -115,10 +115,10 @@ public class XMLQueryCompiler {
if (joinHashSize > 0) {
builder.getPhysicalOptimizationConfig().setMaxFramesHybridHash((int) (joinHashSize / this.frameSize));
}
-
- builder.getPhysicalOptimizationConfig().setMaxFramesLeftInputHybridHash(
- (int) (60L * 1024 * 1048576 / this.frameSize));
-
+ if (maximumDataSize > 0) {
+ builder.getPhysicalOptimizationConfig().setMaxFramesLeftInputHybridHash(
+ (int) (maximumDataSize / this.frameSize));
+ }
builder.setLogicalRewrites(buildDefaultLogicalRewrites());
builder.setPhysicalRewrites(buildDefaultPhysicalRewrites());
builder.setSerializerDeserializerProvider(new ISerializerDeserializerProvider() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d5101a17/vxquery-server/src/main/resources/conf/cluster.properties
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/conf/cluster.properties b/vxquery-server/src/main/resources/conf/cluster.properties
index 4614898..9f7d950 100644
--- a/vxquery-server/src/main/resources/conf/cluster.properties
+++ b/vxquery-server/src/main/resources/conf/cluster.properties
@@ -35,7 +35,8 @@ NCLOGS_DIR=$VXTMP_DIR/logs
JAVA_HOME=$JAVA_HOME
#The directory to put cc logs
-CCOPTS=" -cc-root ${CCTMP_DIR} "
+CCOPTS=" -cc-root ${CCTMP_DIR} -heartbeat-period 60000 -max-heartbeat-lapse-periods 10 "
+
#The directory to put nc logs
NCOPTS=" -iodevices /home/ecarman/disk1/tmp/,/home/ecarman/disk2/tmp/ "
[13/25] vxquery git commit: Feedback from review and maven now runs
the previous passing XQTS with maven test. (Saving work)
Posted by pr...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index b8eba23..cb8bde8 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -417,7 +417,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-24, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-25, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-26, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-27, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-28, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-29, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-30, EXPECTED_RESULT_GOT_ERROR
@@ -567,7 +567,7 @@ Construct/DirectConOther//K2-DirectConOther-67, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-68, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-69, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-7, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-70, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConOther//K2-DirectConOther-70, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-71, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-8, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-9, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -600,8 +600,8 @@ Expressions/CondExpr//CondExpr020, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr021, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr022, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//K-CondExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_FAILURE
-Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_FAILURE
+Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-12, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//K-CondExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-3, EXPECTED_RESULT_GOT_FAILURE
@@ -754,8 +754,8 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-namexml-4, EXPECTED
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-parent-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-string-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-2, EXPECTED_RESULT_GOT_ERROR
@@ -785,7 +785,7 @@ Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-parent-1, EXPECTED_E
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-adjtext-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ConText//Constr-text-adjtext-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConText//Constr-text-count-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConText//Constr-text-count-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ConText//Constr-text-count-2, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ConText//Constr-text-count-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ConText//Constr-text-count-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -816,7 +816,7 @@ Expressions/Construct/ConInScopeNamespace//Constr-inscope-18, EXPECTED_RESULT_GO
Expressions/Construct/ConInScopeNamespace//Constr-inscope-19, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-2, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-4, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-5, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-6, EXPECTED_RESULT_GOT_FAILURE
@@ -919,15 +919,15 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-2
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-4, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-eol-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-eol-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-eol-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-eol-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-2, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-entref-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-eol-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-eol-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-eol-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-eol-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-3, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -1032,11 +1032,11 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-4
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-5, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-8, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1056,8 +1056,8 @@ Expressions/Construct/DirectConOther//Constr-pi-content-2, EXPECTED_RESULT_GOT_S
Expressions/Construct/DirectConOther//Constr-pi-content-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConOther//Constr-pi-content-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConOther//Constr-pi-content-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConOther//Constr-pi-content-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConOther//Constr-pi-content-7, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConOther//Constr-pi-content-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConOther//Constr-pi-content-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConOther//Constr-pi-content-8, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConOther//Constr-pi-target-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/DirectConOther//Constr-pi-target-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -1128,13 +1128,13 @@ Expressions/ExtensionExpression//extexpr-17, EXPECTED_RESULT_GOT_FAILURE
Expressions/ExtensionExpression//extexpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/ExtensionExpression//extexpr-19, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/ExtensionExpression//extexpr-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/ExtensionExpression//extexpr-20, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ExtensionExpression//extexpr-20, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/ExtensionExpression//extexpr-21, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/ExtensionExpression//extexpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/ExtensionExpression//extexpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/ExtensionExpression//extexpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/ExtensionExpression//extexpr-25, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/ExtensionExpression//extexpr-26, EXPECTED_RESULT_GOT_FAILURE
+Expressions/ExtensionExpression//extexpr-26, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/ExtensionExpression//extexpr-3, EXPECTED_RESULT_GOT_FAILURE
Expressions/ExtensionExpression//extexpr-4, EXPECTED_ERROR_GOT_FAILURE
Expressions/ExtensionExpression//extexpr-5, EXPECTED_RESULT_GOT_FAILURE
@@ -1172,7 +1172,7 @@ Expressions/FLWORExpr/ForExpr//ForExpr027, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr//ForExpr028, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/ForExpr//ForExpr029, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/ForExpr//ForExpr030, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExpr//ForExpr031, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/ForExpr//ForExpr031, EXPECTED_ERROR_GOT_RESULT
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-10, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-11, EXPECTED_ERROR_GOT_RESULT
@@ -1188,13 +1188,13 @@ Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-2, EX
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-20, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-21, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-22, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-23, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-23, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-24, EXPECTED_ERROR_GOT_RESULT
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-25, EXPECTED_ERROR_GOT_RESULT
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-26, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-27, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-28, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-29, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-29, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-30, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-4, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -1257,7 +1257,7 @@ Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-55, EXPECTED_RESU
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExprType//ForExprType001, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExprType//ForExprType002, EXPECTED_RESULT_GOT_FAILURE
@@ -1350,7 +1350,7 @@ Expressions/FLWORExpr/LetExprWith//letexprwith-1, EXPECTED_ERROR_GOT_FAILURE
Expressions/FLWORExpr/LetExprWith//letexprwith-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExprWith//letexprwith-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExprWith//letexprwith-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExprWith//letexprwith-13, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/LetExprWith//letexprwith-13, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExprWith//letexprwith-14, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExprWith//letexprwith-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExprWith//letexprwith-16, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1436,7 +1436,7 @@ Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-11, EXPECTED_RES
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-18, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1480,7 +1480,7 @@ Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-7, EXPECTED_RESU
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWith//orderbylocal-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-10, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-13, EXPECTED_RESULT_GOT_ERROR
@@ -1518,7 +1518,7 @@ Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-5, EXPECTED
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-7, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/OrderbyExpr/OrderbyExprWithout//orderbywithout-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/ReturnExpr//ReturnExpr001, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ReturnExpr//ReturnExpr002, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ReturnExpr//ReturnExpr003, EXPECTED_RESULT_GOT_FAILURE
@@ -1544,7 +1544,7 @@ Expressions/FLWORExpr/WhereExpr//K-WhereExpr-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-11, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/WhereExpr//K-WhereExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-7, EXPECTED_RESULT_GOT_FAILURE
@@ -1577,7 +1577,7 @@ Expressions/FLWORExpr/WhereExpr//whereClause-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//whereClause-5, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//whereClause-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//whereClause-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//whereClause-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/WhereExpr//whereClause-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//whereClause-9, EXPECTED_RESULT_GOT_ERROR
Expressions/FunctionCallExpr//K2-FunctionCallExpr-1, EXPECTED_RESULT_GOT_ERROR
Expressions/FunctionCallExpr//K2-FunctionCallExpr-10, EXPECTED_RESULT_GOT_ERROR
@@ -1672,9 +1672,9 @@ Expressions/LogicExpr//K-LogicExpr-19, EXPECTED_ERROR_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-20, EXPECTED_ERROR_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-21, EXPECTED_ERROR_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-22, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-23, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-24, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/LogicExpr//K-LogicExpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/LogicExpr//K-LogicExpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-25, EXPECTED_RESULT_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-26, EXPECTED_RESULT_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-27, EXPECTED_RESULT_GOT_FAILURE
@@ -1690,10 +1690,10 @@ Expressions/LogicExpr//K-LogicExpr-35, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-36, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-37, EXPECTED_RESULT_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-38, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-39, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-39, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-40, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-41, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-40, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/LogicExpr//K-LogicExpr-41, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-42, EXPECTED_RESULT_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-43, EXPECTED_RESULT_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-44, EXPECTED_RESULT_GOT_FAILURE
@@ -2303,8 +2303,8 @@ Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multip
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-14, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-16, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-17, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-18, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-17, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-18, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multiply-dayTimeDuration-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2526,8 +2526,8 @@ Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-mult
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-14, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-16, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-17, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-18, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-17, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-18, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-19, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -3352,9 +3352,9 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-17, EXPECTED_ER
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-18, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-19, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-20, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-21, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-22, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-20, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-21, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-22, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-23, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-24, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompEq//K-GenCompEq-25, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -3507,8 +3507,8 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-14, EXPECTED_RE
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-16, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-17, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-18, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-19, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-18, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-19, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//K-GenCompGT-4, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -3617,11 +3617,11 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression493, EXPEC
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//generalexpression494, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompGT//greaterthanonanyuri-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-10, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQ//K-GenCompGTEQ-8, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -3735,8 +3735,8 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-14, EXPECTED_RE
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-16, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-17, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-18, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-19, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-18, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-19, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompLT//K-GenCompLT-4, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -3957,7 +3957,7 @@ Expressions/Operators/CompExpr/GenComprsn/GenCompNE//K-GenCompNE-1, EXPECTED_RES
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//K-GenCompNE-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//K-GenCompNE-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//K-GenCompNE-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/GenComprsn/GenCompNE//K-GenCompNE-13, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/GenComprsn/GenCompNE//K-GenCompNE-13, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//K-GenCompNE-14, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//K-GenCompNE-15, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/GenComprsn/GenCompNE//K-GenCompNE-16, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -5055,9 +5055,9 @@ Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-39, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-40, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-41, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-42, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-43, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-41, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-42, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-43, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-44, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-45, EXPECTED_RESULT_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqual//K-NumericEqual-46, EXPECTED_ERROR_GOT_FAILURE
@@ -5211,9 +5211,9 @@ Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-18, EX
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-19, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-20, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-21, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-22, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-23, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-21, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-22, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-23, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGT//K-NumericGT-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -5299,8 +5299,8 @@ Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-18, EX
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-19, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-20, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-21, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-22, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-21, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-22, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLT//K-NumericLT-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -5451,11 +5451,11 @@ Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-q
Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-19, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-2, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-20, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-7, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-7, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-8, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQName//fn-prefix-from-qname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/QNameOp/QNameEQ//K-QNameEQ-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -5534,9 +5534,9 @@ Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeCheckin
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-3, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-30, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-31, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-32, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-33, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-34, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-32, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-33, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-34, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-35, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-36, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-37, EXPECTED_ERROR_GOT_FAILURE
@@ -5545,7 +5545,7 @@ Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeCheckin
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-4, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-40, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-41, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-42, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-42, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-5, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-6, EXPECTED_ERROR_GOT_FAILURE
Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-7, EXPECTED_ERROR_GOT_FAILURE
@@ -5769,7 +5769,7 @@ Expressions/PathExpr/PathExpressions//PathExpr-6, EXPECTED_RESULT_GOT_ERROR
Expressions/PathExpr/PathExpressions//PathExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PathExpr/PathExpressions//PathExpr-8, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/PathExpr/PathExpressions//PathExpr-9, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExprErr-2, EXPECTED_ERROR_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExprErr-2, EXPECTED_ERROR_GOT_RESULT
Expressions/PathExpr/Predicates//predicates-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Predicates//predicates-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/PathExpr/Predicates//predicates-11, EXPECTED_RESULT_GOT_FAILURE
@@ -6005,9 +6005,9 @@ Expressions/PathExpr/Steps/Axes//Axes092, EXPECTED_ERROR_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes093, EXPECTED_ERROR_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes094, EXPECTED_ERROR_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes095, EXPECTED_ERROR_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes096, EXPECTED_ERROR_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes097, EXPECTED_ERROR_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes098, EXPECTED_ERROR_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes096, EXPECTED_ERROR_GOT_RESULT
+Expressions/PathExpr/Steps/Axes//Axes097, EXPECTED_ERROR_GOT_RESULT
+Expressions/PathExpr/Steps/Axes//Axes098, EXPECTED_ERROR_GOT_RESULT
Expressions/PathExpr/Steps/Axes//Axes099, EXPECTED_ERROR_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes100, EXPECTED_ERROR_GOT_FAILURE
Expressions/PathExpr/Steps/Axes//Axes101, EXPECTED_ERROR_GOT_FAILURE
@@ -6899,7 +6899,7 @@ Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-46, EXPECTED_RESULT_G
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-47, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-48, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-49, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-50, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-51, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-52, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6910,7 +6910,7 @@ Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-56, EXPECTED_RESULT_G
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-57, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-58, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-59, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-60, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-61, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-62, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -6956,7 +6956,7 @@ Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-98, EXPECTED_ERROR_GO
Expressions/QuantExpr/QuantExprWithout//K-QuantExprWithout-99, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/QuantExpr/QuantExprWithout//quantExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/QuantExpr/QuantExprWithout//quantExpr-11, EXPECTED_RESULT_GOT_FAILURE
+Expressions/QuantExpr/QuantExprWithout//quantExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantExpr-13, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantExpr-14, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6982,7 +6982,7 @@ Expressions/QuantExpr/QuantExprWithout//quantExpr-4, EXPECTED_RESULT_GOT_SAME_RE
Expressions/QuantExpr/QuantExprWithout//quantExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/QuantExpr/QuantExprWithout//quantExpr-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/QuantExpr/QuantExprWithout//quantExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantexpr-19, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantexpr-31, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6991,10 +6991,10 @@ Expressions/QuantExpr/QuantExprWithout//quantexpr-34, EXPECTED_RESULT_GOT_SAME_R
Expressions/QuantExpr/QuantExprWithout//quantexpr-35, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantexpr-36, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantexpr-37, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/QuantExpr/QuantExprWithout//quantexpr-38, EXPECTED_RESULT_GOT_FAILURE
+Expressions/QuantExpr/QuantExprWithout//quantexpr-38, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantexpr-39, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantexpr-40, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/QuantExpr/QuantExprWithout//quantexpr-41, EXPECTED_RESULT_GOT_FAILURE
+Expressions/QuantExpr/QuantExprWithout//quantexpr-41, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantexpr-42, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantexpr-43, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/QuantExpr/QuantExprWithout//quantexpr-44, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -7034,7 +7034,7 @@ Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc2, EXPECTED_ERROR_GO
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc3, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc4, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-1, EXPECTED_ERROR_GOT_RESULT
-Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-10, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-13, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -7047,9 +7047,9 @@ Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-19, EXPECTED_RESULT_GOT_
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-20, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-21, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-22, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-23, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-24, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-25, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-26, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-27, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -7066,9 +7066,9 @@ Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-36, EXPECTED_ERROR_GOT_F
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-4, EXPECTED_ERROR_GOT_FAILURE
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-5, EXPECTED_ERROR_GOT_FAILURE
Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-7, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-9, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//K-commaOp-1, EXPECTED_RESULT_GOT_ERROR
Expressions/SeqExpr/ConstructSeq/commaOp//K-commaOp-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//K-commaOp-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -7090,7 +7090,7 @@ Expressions/SeqExpr/ConstructSeq/commaOp//constSeq-22, EXPECTED_RESULT_GOT_DIFFE
Expressions/SeqExpr/ConstructSeq/commaOp//constSeq-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//constSeq-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//constSeq-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/SeqExpr/ConstructSeq/commaOp//constSeq-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/ConstructSeq/commaOp//constSeq-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//constSeq-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//constSeq-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//constSeq-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -7099,7 +7099,7 @@ Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc2, EXPECTED_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc8, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/ConstructSeq/commaOp//sequenceexpressionhc9, EXPECTED_RESULT_GOT_FAILURE
@@ -7127,10 +7127,10 @@ Expressions/SeqExpr/FilterExpr//K-FilterExpr-28, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-29, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/SeqExpr/FilterExpr//K-FilterExpr-30, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-31, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-32, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-33, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-34, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-31, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-32, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-33, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-34, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-35, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-36, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-37, EXPECTED_RESULT_GOT_FAILURE
@@ -7148,7 +7148,7 @@ Expressions/SeqExpr/FilterExpr//K-FilterExpr-47, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-48, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-49, EXPECTED_ERROR_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-50, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-50, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-51, EXPECTED_ERROR_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-52, EXPECTED_ERROR_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-53, EXPECTED_ERROR_GOT_FAILURE
@@ -7163,12 +7163,12 @@ Expressions/SeqExpr/FilterExpr//K-FilterExpr-60, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-61, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-62, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-63, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-64, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-65, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-64, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-65, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-66, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-67, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-68, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-69, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-69, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-7, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-70, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-71, EXPECTED_RESULT_GOT_FAILURE
@@ -7190,7 +7190,7 @@ Expressions/SeqExpr/FilterExpr//K-FilterExpr-85, EXPECTED_ERROR_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-86, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-87, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-88, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/FilterExpr//K-FilterExpr-89, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/FilterExpr//K-FilterExpr-89, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-90, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/FilterExpr//K-FilterExpr-91, EXPECTED_ERROR_GOT_FAILURE
@@ -7222,13 +7222,13 @@ Expressions/SeqExpr/FilterExpr//filterexpressionhc9, EXPECTED_RESULT_GOT_FAILURE
Expressions/SeqExpr/RangeExpr//rangeExpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/SeqExpr/RangeExpr//rangeExpr-12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/RangeExpr//rangeExpr-13, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/RangeExpr//rangeExpr-14, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/RangeExpr//rangeExpr-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/RangeExpr//rangeExpr-16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/RangeExpr//rangeExpr-17, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/RangeExpr//rangeExpr-18, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/RangeExpr//rangeExpr-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/RangeExpr//rangeExpr-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/RangeExpr//rangeExpr-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SeqExpr/RangeExpr//rangeExpr-15, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/RangeExpr//rangeExpr-16, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/RangeExpr//rangeExpr-17, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/SeqExpr/RangeExpr//rangeExpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -7239,7 +7239,7 @@ Expressions/SeqExpr/RangeExpr//rangeExpr-24, EXPECTED_RESULT_GOT_DIFFERENT_RESUL
Expressions/SeqExpr/RangeExpr//rangeExpr-25, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/SeqExpr/RangeExpr//rangeExpr-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/RangeExpr//rangeExpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/SeqExpr/RangeExpr//rangeExpr-5, EXPECTED_ERROR_GOT_FAILURE
Expressions/SeqExpr/RangeExpr//rangeExpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -7996,7 +7996,7 @@ Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1006, EXPECTED_RESULT_GOT_SA
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1007, EXPECTED_ERROR_GOT_FAILURE
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1008, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1009, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-101, EXPECTED_RESULT_GOT_FAILURE
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-101, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1010, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1011, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-1012, EXPECTED_ERROR_GOT_FAILURE
@@ -9187,7 +9187,7 @@ Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-74, EXPECTED_RESULT_GOT_SAME
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-740, EXPECTED_ERROR_GOT_FAILURE
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-741, EXPECTED_ERROR_GOT_FAILURE
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-742, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-743, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-743, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-744, EXPECTED_RESULT_GOT_FAILURE
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-745, EXPECTED_ERROR_GOT_FAILURE
Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-746, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10283,7 +10283,7 @@ Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-22, EXPECTED_RES
Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-23, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-24, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-25, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-26, EXPECTED_RESULT_GOT_FAILURE
+Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-26, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-27, EXPECTED_RESULT_GOT_FAILURE
Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-28, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/exprSeqTypes/SeqExprInstanceOf//K-SeqExprInstanceOf-29, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10516,10 +10516,10 @@ Expressions/exprSeqTypes/sequenceExprTypeswitch//typeswitchhc6, EXPECTED_RESULT_
Expressions/exprSeqTypes/sequenceExprTypeswitch//typeswitchhc7, EXPECTED_RESULT_GOT_FAILURE
Expressions/exprSeqTypes/sequenceExprTypeswitch//typeswitchhc8, EXPECTED_RESULT_GOT_FAILURE
Expressions/exprSeqTypes/sequenceExprTypeswitch//typeswitchhc9, EXPECTED_RESULT_GOT_FAILURE
-FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-1, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-2, EXPECTED_ERROR_GOT_FAILURE
-FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-3, EXPECTED_RESULT_GOT_FAILURE
-FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-4, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/ForExpr/ForExprWith//K2-ForExprWith-1, EXPECTED_ERROR_GOT_FAILURE
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_ERROR
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_ERROR_GOT_FAILURE
@@ -10565,7 +10565,7 @@ FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-5, EXPECTED_ERROR_GOT_FAILUR
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-6, EXPECTED_RESULT_GOT_FAILURE
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-7, EXPECTED_ERROR_GOT_FAILURE
FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-8, EXPECTED_RESULT_GOT_FAILURE
-FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-9, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-1, EXPECTED_RESULT_GOT_ERROR
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-10, EXPECTED_ERROR_GOT_FAILURE
FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-11, EXPECTED_ERROR_GOT_FAILURE
@@ -10800,11 +10800,11 @@ FunctX/functx-fn-adjust-time-to-timezone//functx-fn-adjust-time-to-timezone-2, E
FunctX/functx-fn-adjust-time-to-timezone//functx-fn-adjust-time-to-timezone-3, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-adjust-time-to-timezone//functx-fn-adjust-time-to-timezone-4, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-adjust-time-to-timezone//functx-fn-adjust-time-to-timezone-all, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-avg//functx-fn-avg-1, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-avg//functx-fn-avg-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-avg//functx-fn-avg-3, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-avg//functx-fn-avg-1, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-avg//functx-fn-avg-2, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-avg//functx-fn-avg-3, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-avg//functx-fn-avg-4, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-avg//functx-fn-avg-5, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-avg//functx-fn-avg-5, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-avg//functx-fn-avg-all, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-base-uri//functx-fn-base-uri-1, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-base-uri//functx-fn-base-uri-2, EXPECTED_RESULT_GOT_FAILURE
@@ -10821,10 +10821,10 @@ FunctX/functx-fn-boolean//functx-fn-boolean-8, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-boolean//functx-fn-boolean-9, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-boolean//functx-fn-boolean-all, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-ceiling//functx-fn-ceiling-1, EXPECTED_RESULT_GOT_SAME_RESULT
-FunctX/functx-fn-ceiling//functx-fn-ceiling-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-ceiling//functx-fn-ceiling-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-ceiling//functx-fn-ceiling-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-ceiling//functx-fn-ceiling-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FunctX/functx-fn-ceiling//functx-fn-ceiling-2, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-ceiling//functx-fn-ceiling-3, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-ceiling//functx-fn-ceiling-4, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-ceiling//functx-fn-ceiling-5, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-ceiling//functx-fn-ceiling-6, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-ceiling//functx-fn-ceiling-all, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-codepoint-equal//functx-fn-codepoint-equal-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10856,11 +10856,11 @@ FunctX/functx-fn-contains//functx-fn-contains-5, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-contains//functx-fn-contains-6, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-contains//functx-fn-contains-7, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-contains//functx-fn-contains-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-count//functx-fn-count-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-count//functx-fn-count-1, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-count//functx-fn-count-2, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-count//functx-fn-count-3, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-count//functx-fn-count-4, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-count//functx-fn-count-5, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-count//functx-fn-count-4, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-count//functx-fn-count-5, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-count//functx-fn-count-all, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-data//functx-fn-data-1, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-data//functx-fn-data-2, EXPECTED_RESULT_GOT_FAILURE
@@ -10922,8 +10922,8 @@ FunctX/functx-fn-exists//functx-fn-exists-4, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-exists//functx-fn-exists-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-false//functx-fn-false-1, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-floor//functx-fn-floor-1, EXPECTED_RESULT_GOT_SAME_RESULT
-FunctX/functx-fn-floor//functx-fn-floor-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-floor//functx-fn-floor-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FunctX/functx-fn-floor//functx-fn-floor-2, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-floor//functx-fn-floor-3, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-floor//functx-fn-floor-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-floor//functx-fn-floor-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-floor//functx-fn-floor-6, EXPECTED_RESULT_GOT_FAILURE
@@ -10997,13 +10997,13 @@ FunctX/functx-fn-matches//functx-fn-matches-7, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-fn-matches//functx-fn-matches-8, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-fn-matches//functx-fn-matches-9, EXPECTED_RESULT_GOT_ERROR
FunctX/functx-fn-matches//functx-fn-matches-all, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-fn-max//functx-fn-max-1, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-max//functx-fn-max-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-max//functx-fn-max-3, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-max//functx-fn-max-1, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-max//functx-fn-max-2, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-max//functx-fn-max-3, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-max//functx-fn-max-4, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-max//functx-fn-max-all, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-min//functx-fn-min-1, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-min//functx-fn-min-2, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-min//functx-fn-min-1, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-min//functx-fn-min-2, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-min//functx-fn-min-3, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-min//functx-fn-min-4, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-min//functx-fn-min-all, EXPECTED_RESULT_GOT_FAILURE
@@ -11144,10 +11144,10 @@ FunctX/functx-fn-round-half-to-even//functx-fn-round-half-to-even-4, EXPECTED_RE
FunctX/functx-fn-round-half-to-even//functx-fn-round-half-to-even-5, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-round-half-to-even//functx-fn-round-half-to-even-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-round//functx-fn-round-1, EXPECTED_RESULT_GOT_SAME_RESULT
-FunctX/functx-fn-round//functx-fn-round-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-round//functx-fn-round-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-round//functx-fn-round-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-round//functx-fn-round-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FunctX/functx-fn-round//functx-fn-round-2, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-round//functx-fn-round-3, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-round//functx-fn-round-4, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-round//functx-fn-round-5, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-round//functx-fn-round-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
FunctX/functx-fn-seconds-from-dateTime//functx-fn-seconds-from-dateTime-1, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-seconds-from-duration//functx-fn-seconds-from-duration-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -11220,12 +11220,12 @@ FunctX/functx-fn-substring//functx-fn-substring-7, EXPECTED_RESULT_GOT_SAME_RESU
FunctX/functx-fn-substring//functx-fn-substring-8, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-substring//functx-fn-substring-9, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-substring//functx-fn-substring-all, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FunctX/functx-fn-sum//functx-fn-sum-1, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-sum//functx-fn-sum-1, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-sum//functx-fn-sum-2, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-sum//functx-fn-sum-3, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-sum//functx-fn-sum-4, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-sum//functx-fn-sum-5, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-fn-sum//functx-fn-sum-6, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-fn-sum//functx-fn-sum-3, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-sum//functx-fn-sum-4, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-sum//functx-fn-sum-5, EXPECTED_RESULT_GOT_SAME_RESULT
+FunctX/functx-fn-sum//functx-fn-sum-6, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-sum//functx-fn-sum-all, EXPECTED_RESULT_GOT_FAILURE
FunctX/functx-fn-timezone-from-date//functx-fn-timezone-from-date-1, EXPECTED_RESULT_GOT_SAME_RESULT
FunctX/functx-fn-timezone-from-date//functx-fn-timezone-from-date-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -11963,7 +11963,7 @@ Functions/AccessorFunc/BaseURIFunc//fn-base-uri-8, EXPECTED_RESULT_GOT_ERROR
Functions/AccessorFunc/BaseURIFunc//fn-base-uri-9, EXPECTED_RESULT_GOT_ERROR
Functions/AccessorFunc/DataFunc//K-DataFunc-1, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/AccessorFunc/DataFunc//K-DataFunc-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Functions/AccessorFunc/DataFunc//K-DataFunc-3, EXPECTED_RESULT_GOT_FAILURE
+Functions/AccessorFunc/DataFunc//K-DataFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AccessorFunc/DataFunc//K-DataFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AccessorFunc/DataFunc//K2-DataFunc-1, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/AccessorFunc/DataFunc//K2-DataFunc-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -12195,7 +12195,7 @@ Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//K-CodepointTo
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//fn-codepoints-to-string-1, EXPECTED_ERROR_GOT_FAILURE
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//fn-codepoints-to-string-10, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//fn-codepoints-to-string-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//fn-codepoints-to-string-12, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//fn-codepoints-to-string-12, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//fn-codepoints-to-string-13, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//fn-codepoints-to-string-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFunc//fn-codepoints-to-string-15, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -12228,13 +12228,13 @@ Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCod
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-21, EXPECTED_RESULT_GOT_FAILURE
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-5, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-6, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//K-StringToCodepointFunc-9, EXPECTED_RESULT_GOT_ERROR
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-10, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-10, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-11, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-12, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-13, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -12246,7 +12246,7 @@ Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-9, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints1args-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints1args-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFunc//fn-string-to-codepoints1args-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -12274,7 +12274,7 @@ Functions/AllStringFunc/CompStringFunc/CodepointEqualFunc//fn-codepoint-equal-16
Functions/AllStringFunc/CompStringFunc/CodepointEqualFunc//fn-codepoint-equal-17, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CodepointEqualFunc//fn-codepoint-equal-18, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CodepointEqualFunc//fn-codepoint-equal-19, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/CompStringFunc/CodepointEqualFunc//fn-codepoint-equal-2, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/CompStringFunc/CodepointEqualFunc//fn-codepoint-equal-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CodepointEqualFunc//fn-codepoint-equal-20, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CodepointEqualFunc//fn-codepoint-equal-21, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CodepointEqualFunc//fn-codepoint-equal-3, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -12324,10 +12324,10 @@ Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-20, EXPECTED_RESU
Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-21, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-22, EXPECTED_ERROR_GOT_RESULT
Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-4, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-5, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-6, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-7, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/CompStringFunc/CompareFunc//fn-compare2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -12444,7 +12444,7 @@ Functions/AllStringFunc/GeneralStringFunc/ConcatFunc//fn-concat-4, EXPECTED_RESU
Functions/AllStringFunc/GeneralStringFunc/ConcatFunc//fn-concat-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/ConcatFunc//fn-concat-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/ConcatFunc//fn-concat-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/ConcatFunc//fn-concat-8, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/ConcatFunc//fn-concat-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/ConcatFunc//fn-concat-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/ConcatFunc//fn-concatdbl2args-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/GeneralStringFunc/ConcatFunc//fn-concatdbl2args-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -12550,13 +12550,13 @@ Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-14, EXPEC
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-15, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-16, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-17, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-2, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-8, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/LowerCaseFunc//fn-lower-case1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -12642,7 +12642,7 @@ Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//K-StringJoinFunc-5, EX
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//K-StringJoinFunc-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//K-StringJoinFunc-7, EXPECTED_ERROR_GOT_FAILURE
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-10, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-10, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-11, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-12, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-13, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -12655,11 +12655,11 @@ Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-19, EXP
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-20, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-3, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-4, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-5, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-6, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-7, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-3, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-4, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-6, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/StringJoinFunc//fn-string-join2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -12714,8 +12714,8 @@ Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//K-SubstringFunc-8, EXPE
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//K-SubstringFunc-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-10, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-11, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-12, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-12, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-13, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-14, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-15, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -12729,11 +12729,11 @@ Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-21, EXPECT
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-22, EXPECTED_RESULT_GOT_ERROR
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-5, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-6, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-7, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-8, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-9, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-7, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/GeneralStringFunc/SubstringFunc//fn-substring-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/TranslateFunc//K-TranslateFunc-1, EXPECTED_ERROR_GOT_SAME_ERROR
Functions/AllStringFunc/GeneralStringFunc/TranslateFunc//K-TranslateFunc-10, EXPECTED_RESULT_GOT_ERROR
Functions/AllStringFunc/GeneralStringFunc/TranslateFunc//K-TranslateFunc-2, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -12781,13 +12781,13 @@ Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-14, EXPEC
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-15, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-16, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-17, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-2, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-2, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-3, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-4, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-5, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-6, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-8, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case-9, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case1args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/GeneralStringFunc/UpperCaseFunc//fn-upper-case1args-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -13133,27 +13133,27 @@ Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//K-SubstringAfter
Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//K-SubstringAfterFunc-7, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//K-SubstringAfterFunc-8, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//K-SubstringAfterFunc-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//fn-substring-after-1, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//fn-substring-after-10, EXPECTED_RESULT_GOT_FAILURE
+Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//fn-substring-after-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//fn-substring-after-10, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//fn-substring-after-11, EXPECTED_RESULT_GOT_SAME_RESULT
Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//fn-substring-after-12, EXPECTED_RESULT_GOT_SAME_RESULT
-Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//fn-substring-after-13, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//fn-substring-after-14, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFunc//fn-substring-after-15, EXPECTED_RESULT_GOT_FAILURE
-Functions/AllS
<TRUNCATED>
[09/25] vxquery git commit: lowercase the 'xml' category
Posted by pr...@apache.org.
lowercase the 'xml' category
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/8cdc67ce
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/8cdc67ce
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/8cdc67ce
Branch: refs/heads/master
Commit: 8cdc67ce6e4b67faf563e1b0753b07cf69c7dbf1
Parents: 7db3f9e
Author: Till Westmann <we...@gmail.com>
Authored: Thu Jan 22 22:54:35 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Feb 5 11:58:16 2015 -0800
----------------------------------------------------------------------
doap.rdf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/8cdc67ce/doap.rdf
----------------------------------------------------------------------
diff --git a/doap.rdf b/doap.rdf
index b535959..d690c74 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -34,7 +34,7 @@
<download-page rdf:resource="http://www.apache.org/dyn/closer.cgi/vxquery/" />
<programming-language>Java</programming-language>
<category rdf:resource="http://projects.apache.org/category/big-data" />
- <category rdf:resource="http://projects.apache.org/category/XML" />
+ <category rdf:resource="http://projects.apache.org/category/xml" />
<release>
<Version>
<name>Apache VXQuery</name>
[10/25] vxquery git commit: Updated the XML styling of the pom files.
Posted by pr...@apache.org.
Updated the XML styling of the pom files.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/f884ad84
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/f884ad84
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/f884ad84
Branch: refs/heads/master
Commit: f884ad84d32c9b0cf9794b8cfb4b26d243763281
Parents: 8cdc67c
Author: Preston Carman <pr...@apache.org>
Authored: Thu Feb 5 11:52:18 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Feb 5 12:00:16 2015 -0800
----------------------------------------------------------------------
vxquery-benchmark/pom.xml | 153 +++++------
vxquery-core/pom.xml | 565 +++++++++++++++++++++--------------------
vxquery-xtest/pom.xml | 337 ++++++++++++------------
3 files changed, 542 insertions(+), 513 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f884ad84/vxquery-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/pom.xml b/vxquery-benchmark/pom.xml
index 3be42b2..5abc500 100644
--- a/vxquery-benchmark/pom.xml
+++ b/vxquery-benchmark/pom.xml
@@ -14,82 +14,85 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
- </parent>
-
- <artifactId>apache-vxquery-benchmark</artifactId>
- <packaging>jar</packaging>
- <name>VXQuery Benchmark</name>
- <description>Apache VXQuery Benchmark</description>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <distributionManagement>
- <site>
- <id>vxquery.website</id>
- <name>VXQuery Website</name>
- <url>file:../site/vxquery-benchmark/</url>
- </site>
- </distributionManagement>
+ <parent>
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </parent>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-site</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <executions>
- <execution>
- <id>copy-scripts</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/appassembler/scripts</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <artifactId>apache-vxquery-benchmark</artifactId>
+ <packaging>jar</packaging>
+ <name>VXQuery Benchmark</name>
+ <description>Apache VXQuery Benchmark</description>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>dependencies</report>
- <report>plugins</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <linkOnly>true</linkOnly>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <distributionManagement>
+ <site>
+ <id>vxquery.website</id>
+ <name>VXQuery Website</name>
+ <url>file:../site/vxquery-benchmark/</url>
+ </site>
+ </distributionManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-scripts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/appassembler/scripts</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>dependencies</report>
+ <report>plugins</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <linkOnly>true</linkOnly>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f884ad84/vxquery-core/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index 1fbe912..dc278ed 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -14,282 +14,305 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </parent>
- <artifactId>apache-vxquery-core</artifactId>
- <packaging>jar</packaging>
- <name>VXQuery Core</name>
- <description>Apache VXQuery Processor</description>
+ <artifactId>apache-vxquery-core</artifactId>
+ <packaging>jar</packaging>
+ <name>VXQuery Core</name>
+ <description>Apache VXQuery Processor</description>
- <distributionManagement>
- <site>
- <id>vxquery.website</id>
- <name>VXQuery Website</name>
- <url>file:../site/vxquery-core/</url>
- </site>
- </distributionManagement>
+ <distributionManagement>
+ <site>
+ <id>vxquery.website</id>
+ <name>VXQuery Website</name>
+ <url>file:../site/vxquery-core/</url>
+ </site>
+ </distributionManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>javacc</id>
- <goals>
- <goal>javacc</goal>
- </goals>
- <configuration>
- <isStatic>false</isStatic>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-code</id>
- <phase>generate-sources</phase>
- <configuration>
- <target>
- <ant antfile="build-xslt.xml" target="build">
- <property name="build.gen-src.dir" value="${project.build.directory}/generated-sources/main/java" />
- <property name="src.code.dir" value="${basedir}/src/main/java" />
- <property name="xslt.dir" value="${basedir}/src/main/xslt" />
- <property name="classpath.xslt" refid="maven.compile.classpath" />
- </ant>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-site</id>
- <phase>pre-site</phase>
- <configuration>
- <target>
- <ant antfile="build-site.xml" target="build">
- <property name="build.gen-site.dir" value="${project.build.directory}/generated-site/apt" />
- <property name="src.code.dir" value="${basedir}/src/main/java" />
- <property name="xslt.dir" value="${basedir}/src/main/xslt" />
- <property name="classpath.xslt" refid="maven.compile.classpath" />
- </ant>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <directory>
- ${project.build.directory}/generated-sources/main/java
- </directory>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>javacc</id>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ <configuration>
+ <isStatic>false</isStatic>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-code</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <ant
+ antfile="build-xslt.xml"
+ target="build">
+ <property
+ name="build.gen-src.dir"
+ value="${project.build.directory}/generated-sources/main/java" />
+ <property
+ name="src.code.dir"
+ value="${basedir}/src/main/java" />
+ <property
+ name="xslt.dir"
+ value="${basedir}/src/main/xslt" />
+ <property
+ name="classpath.xslt"
+ refid="maven.compile.classpath" />
+ </ant>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-site</id>
+ <phase>pre-site</phase>
+ <configuration>
+ <target>
+ <ant
+ antfile="build-site.xml"
+ target="build">
+ <property
+ name="build.gen-site.dir"
+ value="${project.build.directory}/generated-site/apt" />
+ <property
+ name="src.code.dir"
+ value="${basedir}/src/main/java" />
+ <property
+ name="xslt.dir"
+ value="${basedir}/src/main/xslt" />
+ <property
+ name="classpath.xslt"
+ refid="maven.compile.classpath" />
+ </ant>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <directory>
+ ${project.build.directory}/generated-sources/main/java
+ </directory>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
-->
- </plugins>
- <pluginManagement>
- <plugins>
+ </plugins>
+ <pluginManagement>
+ <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.6,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <versionRange>[2.6,)</versionRange>
- <goals>
- <goal>javacc</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.6,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <versionRange>[2.6,)</versionRange>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-compiler</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-compiler</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-data</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-data</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-api</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-data-std</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-data-std</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-dataflow-common</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-common</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-dataflow-std</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-std</artifactId>
+ </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-transport-xstream</artifactId>
- </dependency>
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-transport-xstream</artifactId>
+ </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.12.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>dependencies</report>
- <report>plugins</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <linkOnly>true</linkOnly>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.12.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>dependencies</report>
+ <report>plugins</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <linkOnly>true</linkOnly>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -302,28 +325,28 @@
</configuration>
</plugin>
-->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <configuration>
- <excludes>
- <exclude>testsuites/**/*</exclude>
- <exclude>reports/**/*</exclude>
- </excludes>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <maxmemory>2g</maxmemory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <notimestamp>true</notimestamp>
- <maxmemory>2g</maxmemory>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>testsuites/**/*</exclude>
+ <exclude>reports/**/*</exclude>
+ </excludes>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <maxmemory>2g</maxmemory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ <maxmemory>2g</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f884ad84/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index dd7b191..9bf8705 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -14,183 +14,186 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </parent>
- <artifactId>apache-vxquery-xtest</artifactId>
- <packaging>jar</packaging>
- <name>VXQuery XTest</name>
- <description>Apache VXQuery Test Driver</description>
+ <artifactId>apache-vxquery-xtest</artifactId>
+ <packaging>jar</packaging>
+ <name>VXQuery XTest</name>
+ <description>Apache VXQuery Test Driver</description>
- <distributionManagement>
- <site>
- <id>vxquery.website</id>
- <name>VXQuery Website</name>
- <url>file:../site/vxquery-xtest/</url>
- </site>
- </distributionManagement>
+ <distributionManagement>
+ <site>
+ <id>vxquery.website</id>
+ <name>VXQuery Website</name>
+ <url>file:../site/vxquery-xtest/</url>
+ </site>
+ </distributionManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <configuration>
- <programs>
- <program>
- <mainClass>org.apache.vxquery.xtest.Main</mainClass>
- <name>xtest</name>
- </program>
- <program>
- <mainClass>org.apache.vxquery.xtest.util.DiskPerformance</mainClass>
- <name>diskperformance</name>
- </program>
- </programs>
- <repositoryLayout>flat</repositoryLayout>
- <repositoryName>lib</repositoryName>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-xtest-scripts</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/appassembler/bin</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources/scripts</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-xtest-conf</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/appassembler/conf</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources/conf</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-site</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <configuration>
+ <programs>
+ <program>
+ <mainClass>org.apache.vxquery.xtest.Main</mainClass>
+ <name>xtest</name>
+ </program>
+ <program>
+ <mainClass>org.apache.vxquery.xtest.util.DiskPerformance</mainClass>
+ <name>diskperformance</name>
+ </program>
+ </programs>
+ <repositoryLayout>flat</repositoryLayout>
+ <repositoryName>lib</repositoryName>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-xtest-scripts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/appassembler/bin</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources/scripts</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-xtest-conf</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/appassembler/conf</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources/conf</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-core</artifactId>
- <version>0.5-SNAPSHOT</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery-core</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-api</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-client</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-client</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-cc</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-cc</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-nc</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-nc</artifactId>
+ </dependency>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-dataflow-std</artifactId>
- </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-std</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>dependencies</report>
- <report>plugins</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <linkOnly>true</linkOnly>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <configuration>
- <excludes>
- <exclude>**/ExpectedTestResults/**/*</exclude>
- <exclude>**/xqts.txt</exclude>
- </excludes>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <maxmemory>2g</maxmemory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <notimestamp>true</notimestamp>
- <maxmemory>2g</maxmemory>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>dependencies</report>
+ <report>plugins</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <linkOnly>true</linkOnly>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/ExpectedTestResults/**/*</exclude>
+ <exclude>**/xqts.txt</exclude>
+ </excludes>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <maxmemory>2g</maxmemory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ <maxmemory>2g</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
[14/25] vxquery git commit: Feedback from review and maven now runs
the previous passing XQTS with maven test. (Saving work)
Posted by pr...@apache.org.
Feedback from review and maven now runs the previous passing XQTS with maven test. (Saving work)
- Still need to fix an issue with maven test opening to many files.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/fccce23d
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/fccce23d
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/fccce23d
Branch: refs/heads/master
Commit: fccce23d046fa232a69bf6a235ae56ca186c84ff
Parents: f13d378
Author: Preston Carman <pr...@apache.org>
Authored: Fri Feb 13 20:44:41 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Feb 13 20:44:41 2015 -0800
----------------------------------------------------------------------
.gitignore | 1 +
README | 22 +
docs/README | 67 -
src/site/apt/development_benchmarks.apt | 20 +
.../apt/development_update_xqts_results.apt | 54 +
src/site/apt/user_installation.apt | 6 +-
src/site/apt/user_query.apt | 4 +-
src/site/site.xml | 121 +-
.../java/org/apache/vxquery/cli/VXQuery.java | 3 +-
.../compiler/rewriter/RewriteRuleset.java | 11 +-
.../DelayMaterializationForJoinProbeRule.java | 142 --
.../accessors/atomic/XSDecimalPointable.java | 4 +-
.../builders/nodes/UTF8StringBuilder.java | 53 -
.../metadata/VXQueryMetadataProvider.java | 14 +-
...AbstractMaxMinAggregateEvaluatorFactory.java | 6 +-
.../AbstractMaxMinScalarEvaluatorFactory.java | 5 +-
.../AvgGlobalAggregateEvaluatorFactory.java | 6 +-
.../AvgLocalAggregateEvaluatorFactory.java | 4 +-
.../FnAvgAggregateEvaluatorFactory.java | 4 +-
.../aggregate/FnAvgScalarEvaluatorFactory.java | 4 +-
.../FnSumAggregateEvaluatorFactory.java | 4 +-
.../aggregate/FnSumScalarEvaluatorFactory.java | 4 +-
.../functions/numeric/FnFloorOperation.java | 4 +-
.../vxquery/xmlparser/SAXContentHandler.java | 1 -
.../src/main/resources/scripts/startcc.sh | 12 +-
.../src/main/resources/scripts/startnc.sh | 10 +-
vxquery-xtest/results/README.md | 5 +-
vxquery-xtest/results/xqts.txt | 2110 +++++++++---------
.../vxquery/xtest/AbstractTestCaseFactory.java | 51 +-
.../vxquery/xtest/HTMLFileReporterImpl.java | 1 -
.../vxquery/xtest/ServletReporterImpl.java | 2 +-
.../apache/vxquery/xtest/TestCaseFactory.java | 6 +-
.../org/apache/vxquery/xtest/TestRunner.java | 1 +
.../org/apache/vxquery/xtest/XTestOptions.java | 3 +
.../vxquery/xtest/JUnitTestCaseFactory.java | 7 +-
.../org/apache/vxquery/xtest/VXQueryTest.java | 34 +-
.../ExpectedTestResults/Numerics/fn:abs.txt | 8 -
.../ExpectedTestResults/Numerics/fn:ceiling.txt | 8 -
.../ExpectedTestResults/Numerics/fn_abs.txt | 8 +
.../ExpectedTestResults/Numerics/fn_ceiling.txt | 8 +
.../resources/Queries/XQuery/Numerics/fn:abs.xq | 22 -
.../Queries/XQuery/Numerics/fn:ceiling.xq | 22 -
.../resources/Queries/XQuery/Numerics/fn_abs.xq | 22 +
.../Queries/XQuery/Numerics/fn_ceiling.xq | 22 +
.../FunctionsAndOperatorsOnNumericsQueries.xml | 12 +-
45 files changed, 1434 insertions(+), 1504 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f69f244..fdde96a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
.settings
.classpath
target
+/ClusterControllerService/
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/README
----------------------------------------------------------------------
diff --git a/README b/README
new file mode 100644
index 0000000..e709f00
--- /dev/null
+++ b/README
@@ -0,0 +1,22 @@
+~~ 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.
+
+VXQuery documentation can be found in src/main/site/apt.
+The folder contains documents that detail how to install VXQuery,
+execute a query and run the test suite.
+
+The vxquery.apache.org website details both user and developer documentation.
+In addition you can subscribe to our mailing list or post issues to our bug
+tracking software.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/docs/README
----------------------------------------------------------------------
diff --git a/docs/README b/docs/README
deleted file mode 100644
index baa177e..0000000
--- a/docs/README
+++ /dev/null
@@ -1,67 +0,0 @@
- Apache VXQuery
-
-What is it?
-===========
-
-Apache VXQuery aims to be a standards compliant XML Query processor
-implemented in Java. The focus is on the evaluation of queries on large
-amounts of XML data. Specifically the goal is to evaluate queries on large
-collections of relatively small XML documents. To achieve this, queries are
-evaluated on a cluster of shared nothing machines. VXQuery levarages the
-runtime facilities provided by Hyracks (http://hyracks.org) and the algebraic
-framework provided by Algebricks.
-
-
-Building
-========
-
-Requirements
-------------
-1. JDK >= 1.6
-2. Apache Maven >= 2.0
-
-Setup
------
-VXQuery is currently only located in SVN. The following instructions are to
-check out the active version under active development.
-
-1. Create a folder for all the VXQuery files.
-
-$ mkdir /path/to/VXQuery
-$ cd /path/to/VXQuery
-
-2. Download and install the Apache VXQuery Incubating.
-
-$ svn checkout https://svn.apache.org/repos/asf/incubator/vxquery/trunk/ apache_vxquery_incubating
-(Accept the certificate information for *.apache.org.)
-$ cd apache_vxquery_incubating/vxquery
-$ mvn package -DskipTests
-$ cd ../..
-
-
-Running
-=======
-
-There are two ways to run VXQuery:
-Note: shell scripts exist for running VXQuery for Un*x like systems.
-
-1. Command line client (vxq)
-
-Run
-$ sh apache_vxquery_incubating/vxquery/vxquery-cli/target/appassembler/bin/vxq
-without any arguments for help on executing the command line client.
-
-2. XQTS test driver (xtest)
-
-The xtest test driver can be used to execute XQuery tests from the XQTS suite.
-
-Run
-$ sh apache_vxquery_incubating/vxquery/vxquery-xtest/target/appassembler/bin/xtest
-without any arguments for help on executing xtest.
-
-Typically the test suite will need extra memory to run and output can be
-written in html for easy viewing. Sample Test Command:
-$ JAVA_OPTS="-Xmx1024m -Djava.util.logging.config.file=/path/to/logging.properties" sh apache_vxquery_incubating/vxquery/vxquery-xtest/target/appassembler/bin/xtest -xqtsbase apache_vxquery_incubating/testsuites/XQTS/ -htmlreport /tmp/full_report.html
-The result can be viewed at /tmp/full_report.html
-
-Note: XQTS test suite is set up as part of the Apache VXQuery setup process.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/src/site/apt/development_benchmarks.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_benchmarks.apt b/src/site/apt/development_benchmarks.apt
new file mode 100644
index 0000000..3892fdb
--- /dev/null
+++ b/src/site/apt/development_benchmarks.apt
@@ -0,0 +1,20 @@
+~~ 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.
+
+Benchmarks
+
+* Weather Benchmark
+
+* XMark Benchmark
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/src/site/apt/development_update_xqts_results.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_update_xqts_results.apt b/src/site/apt/development_update_xqts_results.apt
new file mode 100644
index 0000000..55377a7
--- /dev/null
+++ b/src/site/apt/development_update_xqts_results.apt
@@ -0,0 +1,54 @@
+~~ 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.
+
+Update the XQTS Results
+
+ VXQuery stores the latest XQTS result for the last release.
+ The file can be used to verify that all the previous test still passing.
+ The following instructions show how to update the XQTS results file.
+
+* Instructions
+
+ * Verify current XQTS results are all passing before updating to the new XQTS test results.
+ The following command should produce all passing results.
+ They can be viewed at {{{file:///tmp/full_report_previous.html}file:///tmp/full_report_previous.html}}.
+
+----------------------------------------
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -htmlreport /tmp/full_report_previous.html -previous-test-results vxquery-xtest/results/xqts.txt
+----------------------------------------
+
+ * Remove the old results file.
+
+----------------------------------------
+rm vxquery-xtest/results/xqts.txt
+----------------------------------------
+
+ * Generate the new XQTS result file and save it in the text format.
+
+----------------------------------------
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -textreport vxquery-xtest/results/xqts_temp.txt
+----------------------------------------
+
+ * Sort the results so they can be compared with previous results.
+
+----------------------------------------
+sort vxquery-xtest/results/xqts_temp.txt --output=vxquery-xtest/results/xqts.txt
+----------------------------------------
+
+ * Clean up (remove) the temporary results files.
+
+----------------------------------------
+rm vxquery-xtest/results/xqts_temp.txt
+----------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/src/site/apt/user_installation.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_installation.apt b/src/site/apt/user_installation.apt
index 8713c60..559b3a3 100644
--- a/src/site/apt/user_installation.apt
+++ b/src/site/apt/user_installation.apt
@@ -17,7 +17,7 @@ Installation
* Requirements
- * Apache VXQuery\x99 source archive (apache-vxquery-X.Y-incubating-source-release.zip)
+ * Apache VXQuery\x99 source archive (apache-vxquery-X.Y.zip)
* JDK >= 1.7
@@ -26,8 +26,8 @@ Installation
* Steps
---
-$ unzip apache-vxquery-X.Y-incubating-source-release.zip
-$ cd apache-vxquery-X.Y-incubating
+$ unzip apache-vxquery-X.Y.zip
+$ cd apache-vxquery-X.Y
$ mvn package -DskipTests
$ cd ..
---
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/src/site/apt/user_query.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query.apt b/src/site/apt/user_query.apt
index 44621e1..b86b4dd 100644
--- a/src/site/apt/user_query.apt
+++ b/src/site/apt/user_query.apt
@@ -19,7 +19,7 @@ Executing a Query
* Command
----------------------------------------
-sh ./apache-vxquery-X.Y-incubating/vxquery-cli/target/appassembler/bin/vxq
+sh ./apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin/vxq
----------------------------------------
* Command Line Options
@@ -65,5 +65,5 @@ return $x/title
[[i]] Command line
----------------------------------------
-JAVA_OPTS="-Xmx1024m" sh ./apache-vxquery-X.Y-incubating/vxquery-cli/target/appassembler/bin/vxq test.xq
+JAVA_OPTS="-Xmx1024m" sh ./apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin/vxq test.xq
----------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 45f34f6..8b32624 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -15,60 +15,85 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<project name="VXQuery">
- <bannerLeft>
- <name>VXQuery</name>
- <src>images/VXQuery.png</src>
- <href>http://vxquery.apache.org/</href>
- </bannerLeft>
+ <bannerLeft>
+ <name>VXQuery</name>
+ <src>images/VXQuery.png</src>
+ <href>http://vxquery.apache.org/</href>
+ </bannerLeft>
- <bannerRight>
- <name>Apache Software Foundation</name>
- <src>images/asf_logo_wide.png</src>
- <href>http://www.apache.org/</href>
- </bannerRight>
+ <bannerRight>
+ <name>Apache Software Foundation</name>
+ <src>images/asf_logo_wide.png</src>
+ <href>http://www.apache.org/</href>
+ </bannerRight>
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
- </skin>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.3.1</version>
+ </skin>
- <body>
- <menu name="Apache Software Foundation">
- <item name="Home" href="http://www.apache.org/"/>
- <item name="Donate" href="http://www.apache.org/foundation/sponsorship.html"/>
- <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
- <item name="Security" href="http://www.apache.org/security/"/>
- </menu>
+ <body>
+ <menu name="Apache Software Foundation">
+ <item
+ name="Home"
+ href="http://www.apache.org/" />
+ <item
+ name="Donate"
+ href="http://www.apache.org/foundation/sponsorship.html" />
+ <item
+ name="Thanks"
+ href="http://www.apache.org/foundation/thanks.html" />
+ <item
+ name="Security"
+ href="http://www.apache.org/security/" />
+ </menu>
- <menu name="Get VXQuery">
- <item name="Download" href="http://www.apache.org/dyn/closer.cgi/vxquery/" />
- </menu>
-
- <menu name="For Users">
- <item name="Installation" href="user_installation.html"/>
- <item name="Executing a Query" href="user_query.html"/>
- <item name="Running the Test Suite" href="user_running_tests.html"/>
- </menu>
+ <menu name="Get VXQuery">
+ <item
+ name="Download"
+ href="http://www.apache.org/dyn/closer.cgi/vxquery/" />
+ </menu>
- <menu name="For Developers">
- <item name="Data Basic Types" href="development_tips.html"/>
- <item name="Data XML and Node Types" href="development_xml_node_details.html"/>
- <item name="Eclipse Setup" href="development_eclipse_setup.html"/>
- <item name="Release steps" href="release.html"/>
- </menu>
+ <menu name="For Users">
+ <item
+ name="Installation"
+ href="user_installation.html" />
+ <item
+ name="Executing a Query"
+ href="user_query.html" />
+ <item
+ name="Running the Test Suite"
+ href="user_running_tests.html" />
+ </menu>
- <menu ref="reports"/>
- <menu ref="modules"/>
+ <menu name="For Developers">
+ <item
+ name="Data Basic Types"
+ href="development_tips.html" />
+ <item
+ name="Data XML and Node Types"
+ href="development_xml_node_details.html" />
+ <item
+ name="Eclipse Setup"
+ href="development_eclipse_setup.html" />
+ <item
+ name="Release steps"
+ href="release.html" />
+ </menu>
- <footer>
- <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache
- feather logo, and the Apache VXQuery project logo are either
- registered trademarks or trademarks of The Apache Software
- Foundation in the United States and other countries.
- All other marks mentioned may be trademarks or registered
- trademarks of their respective owners.</div>
- </footer>
- </body>
+ <menu ref="reports" />
+ <menu ref="modules" />
+
+ <footer>
+ <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache
+ feather logo, and the Apache VXQuery project logo are either
+ registered trademarks or trademarks of The Apache Software
+ Foundation in the United States and other countries.
+ All other marks mentioned may be trademarks or registered
+ trademarks of their respective owners.
+ </div>
+ </footer>
+ </body>
</project>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index ca91636..fdf2b05 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -19,6 +19,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringReader;
import java.nio.ByteBuffer;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Date;
import java.util.EnumSet;
@@ -388,7 +389,7 @@ public class VXQuery {
ncConfig.dataIPAddress = "127.0.0.1";
ncConfig.datasetIPAddress = "127.0.0.1";
ncConfig.nodeId = "nc" + (i + 1);
- ncConfig.ioDevices = "/tmp";
+ ncConfig.ioDevices = Files.createTempDirectory(ncConfig.nodeId).toString();
ncs[i] = new NodeControllerService(ncConfig);
ncs[i].start();
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index 12b0780..d551932 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -20,19 +20,17 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.vxquery.compiler.rewriter.rules.ConsolidateAssignAggregateRule;
-import org.apache.vxquery.compiler.rewriter.rules.ConvertFromAlgebricksExpressionsRule;
-import org.apache.vxquery.compiler.rewriter.rules.ConvertToAlgebricksExpressionsRule;
-import org.apache.vxquery.compiler.rewriter.rules.DelayMaterializationForJoinProbeRule;
-import org.apache.vxquery.compiler.rewriter.rules.InlineNestedVariablesRule;
-import org.apache.vxquery.compiler.rewriter.rules.PushChildIntoDataScanRule;
import org.apache.vxquery.compiler.rewriter.rules.ConsolidateUnnestsRule;
-import org.apache.vxquery.compiler.rewriter.rules.ConvertAssignToAggregateRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertAssignToUnnestRule;
+import org.apache.vxquery.compiler.rewriter.rules.ConvertFromAlgebricksExpressionsRule;
+import org.apache.vxquery.compiler.rewriter.rules.ConvertToAlgebricksExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.EliminateSubplanForSingleItemsRule;
import org.apache.vxquery.compiler.rewriter.rules.EliminateUnnestAggregateSequencesRule;
import org.apache.vxquery.compiler.rewriter.rules.EliminateUnnestAggregateSubplanRule;
+import org.apache.vxquery.compiler.rewriter.rules.InlineNestedVariablesRule;
import org.apache.vxquery.compiler.rewriter.rules.IntroduceCollectionRule;
import org.apache.vxquery.compiler.rewriter.rules.IntroduceTwoStepAggregateRule;
+import org.apache.vxquery.compiler.rewriter.rules.PushChildIntoDataScanRule;
import org.apache.vxquery.compiler.rewriter.rules.PushFunctionsOntoEqJoinBranches;
import org.apache.vxquery.compiler.rewriter.rules.RemoveRedundantBooleanExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.RemoveRedundantCastExpressionsRule;
@@ -43,7 +41,6 @@ import org.apache.vxquery.compiler.rewriter.rules.RemoveUnusedSortDistinctNodesR
import org.apache.vxquery.compiler.rewriter.rules.RemoveUnusedTreatRule;
import org.apache.vxquery.compiler.rewriter.rules.SetCollectionDataSourceRule;
import org.apache.vxquery.compiler.rewriter.rules.SetVariableIdContextRule;
-import org.apache.vxquery.compiler.rewriter.rules.VXQueryExtractCommonOperatorsRule;
import edu.uci.ics.hyracks.algebricks.core.rewriter.base.HeuristicOptimizer;
import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/DelayMaterializationForJoinProbeRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/DelayMaterializationForJoinProbeRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/DelayMaterializationForJoinProbeRule.java
deleted file mode 100644
index 341b7ec..0000000
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/DelayMaterializationForJoinProbeRule.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed 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 from
- *
- * 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.vxquery.compiler.rewriter.rules;
-
-import org.apache.commons.lang3.mutable.Mutable;
-import org.apache.commons.lang3.mutable.MutableObject;
-
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator.ExecutionMode;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.ExchangeOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.IsomorphismUtilities;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.physical.MaterializePOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.physical.OneToOneExchangePOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.physical.ReplicatePOperator;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
-
-public class DelayMaterializationForJoinProbeRule implements IAlgebraicRewriteRule {
-
- @Override
- public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException {
- return false;
- }
-
- @Override
- public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
- throws AlgebricksException {
- AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
- if (op.getOperatorTag() != LogicalOperatorTag.INNERJOIN
- && op.getOperatorTag() != LogicalOperatorTag.LEFTOUTERJOIN) {
- return false;
- }
-
- AbstractBinaryJoinOperator abjo = (AbstractBinaryJoinOperator) op;
- if (abjo.getInputs().size() != 2) {
- return false;
- }
-
- Mutable<ILogicalOperator> branchProbeRO = findReplicateOperator(abjo.getInputs().get(0));
- Mutable<ILogicalOperator> branchBuildRO = findReplicateOperator(abjo.getInputs().get(1));
- if (branchBuildRO == null || branchBuildRO == null
- || !IsomorphismUtilities.isOperatorIsomorphic(branchProbeRO.getValue(), branchBuildRO.getValue())) {
- return false;
- }
-
- // Turn off materialization in replicate operator.
- boolean found = false;
- ReplicateOperator ro = (ReplicateOperator) branchProbeRO.getValue();
- boolean[] outputMaterializationFlags = ro.getOutputMaterializationFlags();
- for (int i = 0; i < outputMaterializationFlags.length; ++i) {
- if (outputMaterializationFlags[i]) {
- found = true;
- outputMaterializationFlags[i] = false;
- }
- }
- if (!found) {
- return false;
- }
- ro.setOutputMaterializationFlags(outputMaterializationFlags);
-
- // Set up references to one level down
- Mutable<ILogicalOperator> parentOp = abjo.getInputs().get(0);
- Mutable<ILogicalOperator> childOpRef = parentOp;
- parentOp = parentOp.getValue().getInputs().get(0);
-
- // New plan operators
- AbstractLogicalOperator exchange = new ExchangeOperator();
- exchange.setPhysicalOperator(new OneToOneExchangePOperator());
- exchange.setExecutionMode(ExecutionMode.PARTITIONED);
- MutableObject<ILogicalOperator> exchangeRef = new MutableObject<ILogicalOperator>(exchange);
- exchange.getInputs().add(parentOp);
-
- MaterializeOperator mop = new
- MaterializeOperator();
- mop.setPhysicalOperator(new MaterializePOperator(false));
- mop.setExecutionMode(ExecutionMode.PARTITIONED);
- Mutable<ILogicalOperator> mopRef = new MutableObject<ILogicalOperator>(mop);
- mop.getInputs().add(exchangeRef);
- AbstractLogicalOperator childOp = (AbstractLogicalOperator) childOpRef.getValue();
- childOp.getInputs().set(0, mopRef);
-
-// boolean[] materializeFlag = new boolean[1];
-// materializeFlag[0] = true;
-// ReplicateOperator rop = new ReplicateOperator(1, materializeFlag);
-// rop.setPhysicalOperator(new ReplicatePOperator());
-// rop.setExecutionMode(ExecutionMode.PARTITIONED);
-// Mutable<ILogicalOperator> ropRef = new MutableObject<ILogicalOperator>(rop);
-// rop.getInputs().add(exchangeRef);
-//
-// // Output
-// rop.getOutputs().add(childOpRef);
-// AbstractLogicalOperator childOp = (AbstractLogicalOperator) childOpRef.getValue();
-// childOp.getInputs().set(0, ropRef);
-
- context.computeAndSetTypeEnvironmentForOperator(exchange);
- context.computeAndSetTypeEnvironmentForOperator(mop);
- context.computeAndSetTypeEnvironmentForOperator(childOp);
- return true;
- }
-
- private Mutable<ILogicalOperator> findReplicateOperator(Mutable<ILogicalOperator> input) {
- AbstractLogicalOperator op = (AbstractLogicalOperator) input.getValue();
- if (op.getOperatorTag() == LogicalOperatorTag.REPLICATE) {
- return input;
- }
- if (op.getInputs().size() == 1) {
- return findReplicateOperator(op.getInputs().get(0));
- }
- return null;
- }
-
-// private void updateBranchContext(Mutable<ILogicalOperator> input, IOptimizationContext context)
-// throws AlgebricksException {
-// AbstractLogicalOperator op = (AbstractLogicalOperator) input.getValue();
-// if (op.getOperatorTag() != LogicalOperatorTag.REPLICATE) {
-// updateBranchContext(op.getInputs().get(0), context);
-// }
-// op.setExecutionMode(ExecutionMode.PARTITIONED);
-// // context.invalidateTypeEnvironmentForOperator(op);
-// context.computeAndSetTypeEnvironmentForOperator(op);
-// op.computeOutputTypeEnvironment(context);
-// }
-
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
index b05e27f..f60d9bd 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
@@ -70,9 +70,9 @@ public class XSDecimalPointable extends AbstractPointable implements IHashable,
// TODO double check that precision is not being lost.
int diff = p - op;
if (diff > 0) {
- ov = Math.round(ov / Math.pow(10, diff));
+ ov = (long) (ov * Math.pow(10, diff));
} else if (diff < 0) {
- v = Math.round(v / Math.pow(10, diff));
+ v = (long) (v * Math.pow(10, Math.abs(diff)));
}
return v < ov ? -1 : (v > ov ? 1 : 0);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
deleted file mode 100644
index 3b4eea0..0000000
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.datamodel.builders.nodes;
-
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.UTFDataFormatException;
-
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
-
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-
-public class UTF8StringBuilder extends AbstractNodeBuilder {
- private IMutableValueStorage mvs;
- private DataOutput out;
-
- @Override
- public void reset(IMutableValueStorage mvs) throws IOException {
- this.mvs = mvs;
- out = mvs.getDataOutput();
- out.write(0);
- out.write(0);
- }
-
- @Override
- public void finish() throws IOException {
- int utflen = mvs.getLength() - 2;
- BytePointable.setByte(mvs.getByteArray(), 0, (byte) ((utflen >>> 8) & 0xFF));
- BytePointable.setByte(mvs.getByteArray(), 1, (byte) ((utflen >>> 0) & 0xFF));
- }
-
- public void appendCharArray(char[] ch, int start, int length) throws IOException {
- FunctionHelper.writeCharArray(ch, start, length, out);
- if (mvs.getLength() > 65535) {
- throw new UTFDataFormatException("encoded string too long: " + mvs.getLength() + " bytes");
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
index 0599ea9..60bfb51 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
@@ -118,7 +118,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
public Pair<IPushRuntimeFactory, AlgebricksPartitionConstraint> getWriteFileRuntime(IDataSink sink,
int[] printColumns, IPrinterFactory[] printerFactories, RecordDescriptor inputDesc)
throws AlgebricksException {
- return null;
+ throw new UnsupportedOperationException();
}
@Override
@@ -126,7 +126,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
IDataSource<String> dataSource, IOperatorSchema propagatedSchema, List<LogicalVariable> keys,
LogicalVariable payLoadVar, List<LogicalVariable> additionalNonKeyFields, JobGenContext context,
JobSpecification jobSpec) throws AlgebricksException {
- return null;
+ throw new UnsupportedOperationException();
}
@Override
@@ -134,7 +134,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
IOperatorSchema propagatedSchema, IVariableTypeEnvironment typeEnv, List<LogicalVariable> keys,
LogicalVariable payLoadVar, List<LogicalVariable> additionalNonKeyFields, RecordDescriptor recordDesc,
JobGenContext context, JobSpecification jobSpec) throws AlgebricksException {
- return null;
+ throw new UnsupportedOperationException();
}
@Override
@@ -144,7 +144,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
List<LogicalVariable> secondaryKeys, List<LogicalVariable> additionalNonKeyFields,
ILogicalExpression filterExpr, RecordDescriptor recordDesc, JobGenContext context, JobSpecification spec)
throws AlgebricksException {
- return null;
+ throw new UnsupportedOperationException();
}
@Override
@@ -195,7 +195,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
IOperatorSchema propagatedSchema, IVariableTypeEnvironment typeEnv, List<LogicalVariable> keys,
LogicalVariable payLoadVar, List<LogicalVariable> additionalNonKeyFields, RecordDescriptor recordDesc,
JobGenContext context, JobSpecification jobSpec, boolean bulkload) throws AlgebricksException {
- return null;
+ throw new UnsupportedOperationException();
}
@Override
@@ -205,7 +205,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
List<LogicalVariable> secondaryKeys, List<LogicalVariable> additionalNonKeyFields,
ILogicalExpression filterExpr, RecordDescriptor recordDesc, JobGenContext context, JobSpecification spec,
boolean bulkload) throws AlgebricksException {
- return null;
+ throw new UnsupportedOperationException();
}
@Override
@@ -214,7 +214,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv, List<LogicalVariable> primaryKeys,
List<LogicalVariable> secondaryKeys, ILogicalExpression filterExpr, RecordDescriptor recordDesc,
JobGenContext context, JobSpecification spec, boolean bulkload) throws AlgebricksException {
- return null;
+ throw new UnsupportedOperationException();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java
index 1278e63..ba31783 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java
@@ -47,7 +47,7 @@ public abstract class AbstractMaxMinAggregateEvaluatorFactory extends
}
protected IAggregateEvaluator createEvaluator(IScalarEvaluator[] args) throws AlgebricksException {
- final AbstractValueComparisonOperation aOp = createValueComparisonOperation();
+ final AbstractValueComparisonOperation aOpComparison = createValueComparisonOperation();
final TaggedValuePointable tvp2 = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
final SequencePointable seqp = (SequencePointable) SequencePointable.FACTORY.createPointable();
final TypedPointables tp1 = new TypedPointables();
@@ -92,7 +92,9 @@ public abstract class AbstractMaxMinAggregateEvaluatorFactory extends
if (count != 0) {
tvp2.set(abvs.getByteArray(), abvs.getStartOffset(), abvs.getLength());
}
- if (count == 0 || FunctionHelper.transformThenCompareMinMaxTaggedValues(aOp, tvp1, tvp2, dCtx, tp1, tp2)) {
+ if (count == 0
+ || FunctionHelper.transformThenCompareMinMaxTaggedValues(aOpComparison, tvp1, tvp2, dCtx,
+ tp1, tp2)) {
try {
abvs.reset();
dOut.write(tvp1.getByteArray(), tvp1.getStartOffset(), tvp1.getLength());
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java
index 5f91cd9..b2aa0b9 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java
@@ -47,7 +47,7 @@ public abstract class AbstractMaxMinScalarEvaluatorFactory extends AbstractTagge
throws AlgebricksException {
final DynamicContext dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
final SequencePointable seqp = (SequencePointable) SequencePointable.FACTORY.createPointable();
- final AbstractValueComparisonOperation aOp = createValueComparisonOperation();
+ final AbstractValueComparisonOperation aOpComparison = createValueComparisonOperation();
final TaggedValuePointable tvpReturn = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
final TaggedValuePointable tvpNext = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
final VoidPointable p = (VoidPointable) VoidPointable.FACTORY.createPointable();
@@ -72,7 +72,8 @@ public abstract class AbstractMaxMinScalarEvaluatorFactory extends AbstractTagge
// Init.
tvpReturn.set(tvpNext);
}
- if (FunctionHelper.transformThenCompareMinMaxTaggedValues(aOp, tvpNext, tvpReturn, dCtx, tp1, tp2)) {
+ if (FunctionHelper.transformThenCompareMinMaxTaggedValues(aOpComparison, tvpNext,
+ tvpReturn, dCtx, tp1, tp2)) {
tvpReturn.set(tvpNext);
}
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
index 8d589ed..00756bf 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
@@ -51,9 +51,9 @@ public class AvgGlobalAggregateEvaluatorFactory extends AbstractTaggedValueArgum
final DataOutput dOutCount = abvsCount.getDataOutput();
final ArrayBackedValueStorage abvsSum = new ArrayBackedValueStorage();
final DataOutput dOutSum = abvsSum.getDataOutput();
- final AddOperation aOp = new AddOperation();
- final ArithmeticHelper add1 = new ArithmeticHelper(aOp, dCtx);
- final ArithmeticHelper add2 = new ArithmeticHelper(aOp, dCtx);
+ final AddOperation aOpAdd = new AddOperation();
+ final ArithmeticHelper add1 = new ArithmeticHelper(aOpAdd, dCtx);
+ final ArithmeticHelper add2 = new ArithmeticHelper(aOpAdd, dCtx);
final DivideOperation aOpDivide = new DivideOperation();
final ArithmeticHelper divide = new ArithmeticHelper(aOpDivide, dCtx);
final LongPointable longp = (LongPointable) LongPointable.FACTORY.createPointable();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
index 6eac723..010b96f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java
@@ -51,8 +51,8 @@ public class AvgLocalAggregateEvaluatorFactory extends AbstractTaggedValueArgume
final DataOutput dOutSum = abvsSum.getDataOutput();
final ArrayBackedValueStorage abvsSeq = new ArrayBackedValueStorage();
final SequenceBuilder sb = new SequenceBuilder();
- final AddOperation aOp = new AddOperation();
- final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
+ final AddOperation aOpAdd = new AddOperation();
+ final ArithmeticHelper add = new ArithmeticHelper(aOpAdd, dCtx);
return new AbstractTaggedValueArgumentAggregateEvaluator(args) {
long count;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
index 5717174..6489fe3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
@@ -51,8 +51,8 @@ public class FnAvgAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA
final DataOutput dOutSum = abvsSum.getDataOutput();
final ArrayBackedValueStorage abvsCount = new ArrayBackedValueStorage();
final DataOutput dOutCount = abvsCount.getDataOutput();
- final AddOperation aOp = new AddOperation();
- final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
+ final AddOperation aOpAdd = new AddOperation();
+ final ArithmeticHelper add = new ArithmeticHelper(aOpAdd, dCtx);
final DivideOperation aOpDivide = new DivideOperation();
final ArithmeticHelper divide = new ArithmeticHelper(aOpDivide, dCtx);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
index 31fcecc..daa7715 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java
@@ -55,8 +55,8 @@ public class FnAvgScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
final TaggedValuePointable tvpCount = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
final DataOutput dOut = abvs.getDataOutput();
- final AddOperation aOp = new AddOperation();
- final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
+ final AddOperation aOpAdd = new AddOperation();
+ final ArithmeticHelper add = new ArithmeticHelper(aOpAdd, dCtx);
final DivideOperation aOpDivide = new DivideOperation();
final ArithmeticHelper divide = new ArithmeticHelper(aOpDivide, dCtx);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
index 631b575..6e96fe7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java
@@ -45,8 +45,8 @@ public class FnSumAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA
protected IAggregateEvaluator createEvaluator(IScalarEvaluator[] args) throws AlgebricksException {
final ArrayBackedValueStorage abvsSum = new ArrayBackedValueStorage();
final DataOutput dOutSum = abvsSum.getDataOutput();
- final AddOperation aOp = new AddOperation();
- final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
+ final AddOperation aOpAdd = new AddOperation();
+ final ArithmeticHelper add = new ArithmeticHelper(aOpAdd, dCtx);
return new AbstractTaggedValueArgumentAggregateEvaluator(args) {
TaggedValuePointable tvpSum = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
index e70efbe..2088e1f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java
@@ -54,8 +54,8 @@ public class FnSumScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal
final TaggedValuePointable tvpNext = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
final TaggedValuePointable tvpSum = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
final VoidPointable p = (VoidPointable) VoidPointable.FACTORY.createPointable();
- final AddOperation aOp = new AddOperation();
- final ArithmeticHelper add = new ArithmeticHelper(aOp, dCtx);
+ final AddOperation aOpAdd = new AddOperation();
+ final ArithmeticHelper add = new ArithmeticHelper(aOpAdd, dCtx);
return new AbstractTaggedValueArgumentScalarEvaluator(args) {
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
index 9501d21..a8675e7 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
@@ -32,8 +32,8 @@ public class FnFloorOperation extends AbstractNumericOperation {
@Override
public void operateDecimal(XSDecimalPointable decp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DECIMAL_TAG);
- dOut.write(decp.getDecimalPlace());
- dOut.writeLong((long) Math.floor(decp.getDecimalValue()));
+ dOut.write(0);
+ dOut.writeLong(decp.getBeforeDecimalPlace());
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
index d4d3bd1..296d062 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
@@ -31,7 +31,6 @@ import org.apache.vxquery.datamodel.builders.nodes.DocumentNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.ElementNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.PINodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.TextNodeBuilder;
-import org.apache.vxquery.datamodel.builders.nodes.UTF8StringBuilder;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.types.BuiltinTypeQNames;
import org.apache.vxquery.types.ElementType;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-server/src/main/resources/scripts/startcc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/startcc.sh b/vxquery-server/src/main/resources/scripts/startcc.sh
index 44b08eb..281c0d6 100755
--- a/vxquery-server/src/main/resources/scripts/startcc.sh
+++ b/vxquery-server/src/main/resources/scripts/startcc.sh
@@ -51,15 +51,13 @@ mkdir -p ${CCLOGS_DIR}
# Set up the options for the cc.
CC_OPTIONS=" -client-net-ip-address ${CCHOST} -cluster-net-ip-address ${CCHOST} "
-if [ ! -z "${CCPORT}" ]
-then
+[ "${CCPORT}" ] {
CC_OPTIONS=" ${CC_OPTIONS} -client-net-port ${CCPORT} "
-fi
+}
-if [ ! -z "${CCOPTS}" ]
-then
- CC_OPTIONS=" ${CC_OPTIONS} ${CCOPTS} "
-fi
+[ "$CCOPTS" ] && {
+ CC_OPTIONS=" ${CC_OPTIONS} ${CCOPTS}"
+}
echo "${JAVA_OPTS}" &> ${CCLOGS_DIR}/cc.log
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-server/src/main/resources/scripts/startnc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/startnc.sh b/vxquery-server/src/main/resources/scripts/startnc.sh
index 7d944f0..acf62c0 100755
--- a/vxquery-server/src/main/resources/scripts/startnc.sh
+++ b/vxquery-server/src/main/resources/scripts/startnc.sh
@@ -53,15 +53,13 @@ mkdir -p $NCLOGS_DIR
# Set up the options for the cc.
NC_OPTIONS=" -cc-host ${CCHOST} -cluster-net-ip-address ${IPADDR} -data-ip-address ${IPADDR} -result-ip-address ${IPADDR} -node-id ${NODEID} "
-if [ ! -z "${CCPORT}" ]
-then
+[ "${CCPORT}" ] {
NC_OPTIONS=" ${NC_OPTIONS} -cc-port ${CCPORT} "
-fi
+}
-if [ ! -z "${NCOPTS}" ]
-then
+[ "${NCOPTS}" ] {
NC_OPTIONS=" ${NC_OPTIONS} ${NCOPTS} "
-fi
+}
echo "${JAVA_OPTS}" &> ${NCLOGS_DIR}/nc.log
http://git-wip-us.apache.org/repos/asf/vxquery/blob/fccce23d/vxquery-xtest/results/README.md
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/README.md b/vxquery-xtest/results/README.md
index 59e3a0a..229606b 100644
--- a/vxquery-xtest/results/README.md
+++ b/vxquery-xtest/results/README.md
@@ -17,5 +17,6 @@
= XQTS Text Results =
-The xqts.txt file holds the results from running the XQTS tests. The results
-have been sorted through the linux sort command.
\ No newline at end of file
+The xqts.txt file holds the sorted results from running the XQTS tests.
+
+Check the Apache VXQuery website for instructions on how to update this file.
\ No newline at end of file
[02/25] vxquery git commit: Consolidated changes for November.
Posted by pr...@apache.org.
Consolidated changes for November.
- Update Hyracks version
- MRQL benchmark updates
- Updated the hash join size property for benchmarks
- Fixed hash join size bug
- Added unnesting for descendent step expressions
- Fixed a few rewrite rule bugs
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/99ba4dbf
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/99ba4dbf
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/99ba4dbf
Branch: refs/heads/master
Commit: 99ba4dbfd7fac85cf17c91c23ee8fb328e440319
Parents: e97888e
Author: Preston Carman <pr...@apache.org>
Authored: Tue Nov 18 10:40:19 2014 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Nov 18 10:40:19 2014 -0800
----------------------------------------------------------------------
pom.xml | 985 ++++++++++---------
src/site/apt/user_running_tests.apt | 1 +
.../noaa-ghcn-daily/other_systems/mrql/q07.mrql | 2 +-
.../mrql_scripts/load_node_file.sh | 2 +
.../mrql_scripts/run_group_test.sh | 14 +-
.../mrql_scripts/run_mrql_tests.sh | 7 +-
.../mrql_scripts/yarn_and_flink/README.md | 23 +
.../yarn_and_flink/clear_hadoop2.sh | 22 +
.../yarn_and_flink/load_node_file.sh | 47 +
.../yarn_and_flink/run_group_test.sh | 86 ++
.../yarn_and_flink/run_mrql_tests.sh | 49 +
.../scripts/benchmark_logging.properties | 43 +-
.../noaa-ghcn-daily/scripts/run_benchmark.sh | 2 +-
.../scripts/run_benchmark_cluster.sh | 7 +-
.../scripts/testing_logging.properties | 79 ++
.../scripts/weather_benchmark.py | 24 +-
.../java/org/apache/vxquery/cli/VXQuery.java | 4 +-
.../compiler/rewriter/RewriteRuleset.java | 8 +-
.../rewriter/rules/ConsolidateUnnestsRule.java | 10 +-
...tAssignSortDistinctNodesToOperatorsRule.java | 1 -
.../DelayMaterializationForJoinProbeRule.java | 142 +++
.../PushMapOperatorDownThroughProductRule.java | 142 ---
.../vxquery/functions/builtin-operators.xml | 1 +
.../metadata/VXQueryCollectionDataSource.java | 4 +
.../metadata/VXQueryMetadataProvider.java | 45 +-
.../functions/step/AbstractChildPathStep.java | 74 --
...stractDescendantPathStepScalarEvaluator.java | 5 +-
.../step/AbstractForwardAxisPathStep.java | 74 ++
.../step/ChildPathStepOperatorDescriptor.java | 38 +-
.../functions/step/ChildPathStepUnnesting.java | 3 +-
...DescendantOrSelfPathStepScalarEvaluator.java | 11 +-
.../step/DescendantOrSelfPathStepUnnesting.java | 167 ++++
...cendantOrSelfPathStepUnnestingEvaluator.java | 44 +
...OrSelfPathStepUnnestingEvaluatorFactory.java | 40 +
.../step/DescendantPathStepScalarEvaluator.java | 4 -
.../DescendantPathStepUnnestingEvaluator.java | 44 +
...endantPathStepUnnestingEvaluatorFactory.java | 39 +
.../strings/UTF8StringCharacterIterator.java | 4 +-
.../xmlquery/query/XMLQueryCompiler.java | 2 +-
39 files changed, 1492 insertions(+), 807 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 04e0377..b57411c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,435 +14,438 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>13</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>VXQuery</name>
- <description>A Versatile XQuery Processor</description>
- <url>http://vxquery.apache.org/</url>
-
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf/vxquery.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <issueManagement>
- <system>Jira</system>
- <url>https://issues.apache.org/jira/browse/VXQUERY</url>
- </issueManagement>
-
- <developers>
- <developer>
- <id>antelder</id>
- <name>Ant Elder</name>
- <email />
- <roles>
- <role>Mentor</role>
- </roles>
- <organization />
- <timezone />
- </developer>
-
- <developer>
- <id>cezar</id>
- <name>Cezar Andrei</name>
- <email />
- <roles>
- <role>Architect</role>
- </roles>
- <organization />
- <timezone>-6</timezone>
- </developer>
- <developer>
- <id>dtabass</id>
- <name>Michael J. Carey</name>
- <email />
- <roles>
- <role>Architect</role>
- </roles>
- <organization />
- <timezone>-8</timezone>
- </developer>
- <developer>
- <id>prestonc</id>
- <name>Preston Carman</name>
- <email />
- <roles>
- <role>Developer</role>
- </roles>
- <organization />
- <timezone>-8</timezone>
- </developer>
- <developer>
- <id>sjaco002</id>
- <name>Steven Jacobs</name>
- <email />
- <roles>
- <role>Developer</role>
- </roles>
- <organization />
- <timezone>-8</timezone>
- </developer>
- <developer>
- <id>tillw</id>
- <name>Till Westmann</name>
- <email />
- <roles>
- <role>Chair</role>
- <role>Architect</role>
- </roles>
- <organization />
- <timezone>-8</timezone>
- </developer>
- <developer>
- <id>vinayakb</id>
- <name>Vinayak Borkar</name>
- <email />
- <roles>
- <role>Architect</role>
- </roles>
- <organization />
- <timezone>-8</timezone>
- </developer>
- </developers>
-
- <mailingLists>
- <mailingList>
- <name>dev</name>
- <subscribe>dev-subscribe@vxquery.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@vxquery.apache.org</unsubscribe>
- <post>dev@vxquery.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/vxquery-dev/</archive>
- </mailingList>
- <mailingList>
- <name>commits</name>
- <subscribe>commits-subscribe@vxquery.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@vxquery.apache.org</unsubscribe>
- <post>commits@vxquery.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/vxquery-commits/</archive>
- </mailingList>
- </mailingLists>
-
- <distributionManagement>
- <site>
- <id>vxquery.website</id>
- <name>VXQuery Website</name>
- <url>file:../site/</url>
- </site>
- </distributionManagement>
-
- <repositories>
- <repository>
- <id>hyracks-snapshots</id>
- <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-snapshots/</url>
- <snapshots>
- </snapshots>
- </repository>
- <repository>
- <id>hyracks-releases</id>
- <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-releases/</url>
- <releases>
- </releases>
- </repository>
- <repository>
- <id>hyracks-thirdparty</id>
- <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-thirdparty/</url>
- <releases>
- </releases>
- </repository>
- </repositories>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- <version>2.0.9</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-client</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-common</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-cc</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-nc</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-compiler</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-common</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-core</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-data</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-rewriter</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-runtime</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-data-std</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-dataflow-common</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-dataflow-std</artifactId>
- <version>${hyracks.version}</version>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>3.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.0.6</version>
- </dependency>
-
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>2.7.1</version>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
-
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-transport-xstream</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.4</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <createChecksum>true</createChecksum>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.4.2</version>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>13</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>VXQuery</name>
+ <description>A Versatile XQuery Processor</description>
+ <url>http://vxquery.apache.org/</url>
+
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf/vxquery.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <issueManagement>
+ <system>Jira</system>
+ <url>https://issues.apache.org/jira/browse/VXQUERY</url>
+ </issueManagement>
+
+ <developers>
+ <developer>
+ <id>antelder</id>
+ <name>Ant Elder</name>
+ <email />
+ <roles>
+ <role>Mentor</role>
+ </roles>
+ <organization />
+ <timezone />
+ </developer>
+
+ <developer>
+ <id>cezar</id>
+ <name>Cezar Andrei</name>
+ <email />
+ <roles>
+ <role>Architect</role>
+ </roles>
+ <organization />
+ <timezone>-6</timezone>
+ </developer>
+ <developer>
+ <id>dtabass</id>
+ <name>Michael J. Carey</name>
+ <email />
+ <roles>
+ <role>Architect</role>
+ </roles>
+ <organization />
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>prestonc</id>
+ <name>Preston Carman</name>
+ <email />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <organization />
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>sjaco002</id>
+ <name>Steven Jacobs</name>
+ <email />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <organization />
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>tillw</id>
+ <name>Till Westmann</name>
+ <email />
+ <roles>
+ <role>Chair</role>
+ <role>Architect</role>
+ </roles>
+ <organization />
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>vinayakb</id>
+ <name>Vinayak Borkar</name>
+ <email />
+ <roles>
+ <role>Architect</role>
+ </roles>
+ <organization />
+ <timezone>-8</timezone>
+ </developer>
+ </developers>
+
+ <mailingLists>
+ <mailingList>
+ <name>dev</name>
+ <subscribe>dev-subscribe@vxquery.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@vxquery.apache.org</unsubscribe>
+ <post>dev@vxquery.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/vxquery-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>commits</name>
+ <subscribe>commits-subscribe@vxquery.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@vxquery.apache.org</unsubscribe>
+ <post>commits@vxquery.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/vxquery-commits/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <distributionManagement>
+ <site>
+ <id>vxquery.website</id>
+ <name>VXQuery Website</name>
+ <url>file:../site/</url>
+ </site>
+ </distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>hyracks-snapshots</id>
+ <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-snapshots/</url>
+ <snapshots>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>hyracks-releases</id>
+ <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-releases/</url>
+ <releases>
+ </releases>
+ </repository>
+ <repository>
+ <id>hyracks-thirdparty</id>
+ <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-thirdparty/</url>
+ <releases>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-gitexe</artifactId>
- <version>1.8.1</version>
- </dependency>
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-client</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-common</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-cc</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-nc</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-compiler</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-common</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-core</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-data</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-rewriter</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-runtime</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-api</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-data-std</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-common</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-std</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>4.0.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-transport-xstream</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.4</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <notimestamp>true</notimestamp>
- <maxmemory>2g</maxmemory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.4.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ <maxmemory>2g</maxmemory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
<!-- We override the configuration plugin to override the descriptor to use for building
the source release zip. Specifically, we would like to control the inclusions/exclusions.
For example, we exclude the KEYS file from the zip -->
- <executions>
- <execution>
+ <executions>
+ <execution>
<!-- Use this id to match the id mentioned in the assembly plugin configuration in
the apache parent POM under the apache-release profile -->
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
<!-- combine.self should be override to replace the configuration in the parent POM -->
- <configuration combine.self="override">
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptors>
- <descriptor>src/main/assembly/source.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <configuration combine.self="override">
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptors>
+ <descriptor>src/main/assembly/source.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -471,75 +474,75 @@
</executions>
</plugin>
-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <inherited>false</inherited>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>license</report>
- <report>project-team</report>
- <report>scm</report>
- <report>issue-tracking</report>
- <report>mailing-list</report>
- <report>plugins</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <linkOnly>true</linkOnly>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <configuration>
- <excludes>
- <exclude>.gitignore</exclude>
- <exclude>.git/**/*</exclude>
- </excludes>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <maxmemory>2g</maxmemory>
- </configuration>
- </plugin>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <notimestamp>true</notimestamp>
- <maxmemory>2g</maxmemory>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <hyracks.version>0.2.12</hyracks.version>
- <apache-rat-plugin.version>0.11</apache-rat-plugin.version>
- </properties>
-
- <modules>
- <module>vxquery-core</module>
- <module>vxquery-server</module>
- <module>vxquery-cli</module>
- <module>vxquery-xtest</module>
- <module>vxquery-benchmark</module>
- </modules>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <inherited>false</inherited>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>license</report>
+ <report>project-team</report>
+ <report>scm</report>
+ <report>issue-tracking</report>
+ <report>mailing-list</report>
+ <report>plugins</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <linkOnly>true</linkOnly>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>.gitignore</exclude>
+ <exclude>.git/**/*</exclude>
+ </excludes>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <maxmemory>2g</maxmemory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ <maxmemory>2g</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <hyracks.version>0.2.15-SNAPSHOT</hyracks.version>
+ <apache-rat-plugin.version>0.11</apache-rat-plugin.version>
+ </properties>
+
+ <modules>
+ <module>vxquery-core</module>
+ <module>vxquery-server</module>
+ <module>vxquery-cli</module>
+ <module>vxquery-xtest</module>
+ <module>vxquery-benchmark</module>
+ </modules>
</project>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/src/site/apt/user_running_tests.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt
index ef9748b..f74a897 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -74,6 +74,7 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog xqts/XQTSCatalog.xml -
----------------------------------------
* view the results at {{{file:///tmp/full_report.html}file:///tmp/full_report.html}}.
+
* Add JAVA_OPTS for additional java parameters.
* VXQuery Test Suite
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql
index cdb0b0c..e8dfce1 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07.mrql
@@ -17,7 +17,7 @@
avg(
select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
from rtmax in source(xml, args[0], {"data"}),
- rtmin in source(xml, args[0], {"data"})
+ rtmin in source(xml, args[2], {"data"})
where text(rtmax.date) = text(rtmin.date)
and text(rtmax.station) = text(rtmin.station)
and text(rtmax.dataType) = "TMAX"
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/load_node_file.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/load_node_file.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/load_node_file.sh
index 206c38b..a3d1dfc 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/load_node_file.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/load_node_file.sh
@@ -38,10 +38,12 @@ echo "Loading ${NODES} node ${DATASET} data file in to cluster."
cp saved/backups/mr/${DATASET}_sensors_${NODES}.xml.gz disk1/hadoop/
gunzip disk1/hadoop/${DATASET}_sensors_${NODES}.xml.gz
hadoop fs -copyFromLocal disk1/hadoop/${DATASET}_sensors_${NODES}.xml ${DATASET}/sensors
+hadoop fs -cp ${DATASET}/sensors/${DATASET}_sensors_${NODES}.xml ${DATASET}2/sensors/${DATASET}_sensors_${NODES}.xml
rm -f disk1/hadoop/${DATASET}_sensors_${NODES}.xml
# Add each station block
cp saved/backups/mr/${DATASET}_stations_${NODES}.xml.gz disk1/hadoop/
gunzip disk1/hadoop/${DATASET}_stations_${NODES}.xml.gz
hadoop fs -copyFromLocal disk1/hadoop/${DATASET}_stations_${NODES}.xml ${DATASET}/stations
+hadoop fs -cp ${DATASET}/stations/${DATASET}_stations_${NODES}.xml ${DATASET}2/stations/${DATASET}_stations_${NODES}.xml
rm -f disk1/hadoop/${DATASET}_stations_${NODES}.xml
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
index 0208beb..134c05e 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
@@ -32,6 +32,8 @@ fi
DATASET=${1}
NODES=${2}
REPEAT=1
+#DATA_FILES=${NODES}
+DATA_FILES=8
# Start Hadoop
sh saved/hadoop/hadoop-1.2.1/bin/start-all.sh
@@ -45,6 +47,13 @@ hadoop fs -mkdir ${DATASET}/sensors
hadoop fs -mkdir ${DATASET}/stations
hadoop fs -ls ${DATASET}
+# Prepare hadoop file system 2
+hadoop fs -mkdir ${DATASET}2
+hadoop fs -ls
+hadoop fs -mkdir ${DATASET}2/sensors
+hadoop fs -mkdir ${DATASET}2/stations
+hadoop fs -ls ${DATASET}2
+
hadoop balancer
@@ -58,8 +67,9 @@ done
# Start test
-sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/ ${NODES} ${REPEAT} ${DATASET}
+sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh \
+ vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/ ${NODES} ${REPEAT} ${DATASET}
# Stop Hadoop
-sh saved/hadoop/hadoop-1.2.1/bin/stop-all.sh
\ No newline at end of file
+sh saved/hadoop/hadoop-1.2.1/bin/stop-all.sh
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
index d6bc9ab..912cd3b 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh
@@ -23,16 +23,19 @@
NODES=${2}
REPEAT=${3}
DATASET=${4}
+THREADS=$((4*${NODES}))
# Make log folder
mkdir -p ~/disk1/weather_data/mrql/query_logs/${NODES}nodes/
-for j in $(find ${1} -name '*q??.mrql')
+for j in $(find ${1} -name '*q?7.mrql')
do
date
echo "Running MRQL query: ${j}"
- time for i in {1..${REPEAT}}; do ~/mrql/incubator-mrql/bin/mrql -dist -nodes ${NODES} ${j} ${DATASET}/sensors/ ${DATASET}/stations/ >> ~/disk1/weather_data/mrql/query_logs/${NODES}nodes/$(basename "${j}").log 2>&1; done;
+ time for i in {1..${REPEAT}}; do ~/mrql/incubator-mrql/bin/mrql -dist -nodes ${THREADS} ${j} \
+ ${DATASET}/sensors/ ${DATASET}/stations/ ${DATASET}2/sensors/ ${DATASET}2/stations/ \
+ >> ~/disk1/weather_data/mrql/query_logs/${NODES}nodes/$(basename "${j}").log 2>&1; done;
done
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/README.md
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/README.md b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/README.md
new file mode 100644
index 0000000..f1ff8a5
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/README.md
@@ -0,0 +1,23 @@
+<!--
+ 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.
+-->
+
+
+clear_hadoop2.sh
+
+hadoop namenode -format
+
+run_group_test.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/clear_hadoop2.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/clear_hadoop2.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/clear_hadoop2.sh
new file mode 100755
index 0000000..fbc15b5
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/clear_hadoop2.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# 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.
+#
+
+# Remove data
+rm -rf disk1/hadoop2/hdfs
+rm -rf disk2/hadoop2/hdfs
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/load_node_file.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/load_node_file.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/load_node_file.sh
new file mode 100755
index 0000000..206c38b
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/load_node_file.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# 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.
+#
+
+if [ -z "${1}" ]
+then
+ echo "Please enter the data set as the first argument."
+ exit
+fi
+
+if [ -z "${2}" ]
+then
+ echo "Please enter the node number as the second argument."
+ exit
+fi
+
+DATASET=${1}
+NODES=${2}
+
+echo "Loading ${NODES} node ${DATASET} data file in to cluster."
+
+# Add each sensor block
+cp saved/backups/mr/${DATASET}_sensors_${NODES}.xml.gz disk1/hadoop/
+gunzip disk1/hadoop/${DATASET}_sensors_${NODES}.xml.gz
+hadoop fs -copyFromLocal disk1/hadoop/${DATASET}_sensors_${NODES}.xml ${DATASET}/sensors
+rm -f disk1/hadoop/${DATASET}_sensors_${NODES}.xml
+
+# Add each station block
+cp saved/backups/mr/${DATASET}_stations_${NODES}.xml.gz disk1/hadoop/
+gunzip disk1/hadoop/${DATASET}_stations_${NODES}.xml.gz
+hadoop fs -copyFromLocal disk1/hadoop/${DATASET}_stations_${NODES}.xml ${DATASET}/stations
+rm -f disk1/hadoop/${DATASET}_stations_${NODES}.xml
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/run_group_test.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/run_group_test.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/run_group_test.sh
new file mode 100755
index 0000000..95e8046
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/run_group_test.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+#
+# 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.
+#
+
+if [ -z "${1}" ]
+then
+ echo "Please enter the data set as the first argument."
+ exit
+fi
+
+if [ -z "${2}" ]
+then
+ echo "Please enter the node number as the second argument."
+ exit
+fi
+
+DATASET=${1}
+NODES=${2}
+THREADS=$((4*${NODES}))
+REPEAT=1
+DATA_FILES=${NODES}
+
+# Start Hadoop
+# sh saved/hadoop/hadoop-1.2.1/bin/start-all.sh
+sh saved/hadoop/hadoop-2.5.1/sbin/hadoop-daemon.sh start namenode
+sh saved/hadoop/hadoop-2.5.1/sbin/hadoop-daemons.sh start datanode
+sh saved/hadoop/hadoop-2.5.1/sbin/yarn-daemon.sh start resourcemanager
+sh saved/hadoop/hadoop-2.5.1/sbin/yarn-daemons.sh start nodemanager
+sh saved/hadoop/hadoop-2.5.1/sbin/mr-jobhistory-daemon.sh start historyserver
+
+sleep 10
+
+# Start Flink
+sh saved/flink/flink-yarn-0.6.1-incubating/bin/yarn-session.sh -n ${THREADS} -tm 1024 &
+FLINK_PID=$!
+
+# Prepare hadoop file system
+hadoop fs -mkdir ${DATASET}
+hadoop fs -ls
+hadoop fs -mkdir ${DATASET}/sensors
+hadoop fs -mkdir ${DATASET}/stations
+hadoop fs -ls ${DATASET}
+
+hadoop balancer
+
+
+# Upload test data
+COUNTER=0
+while [ ${COUNTER} -lt ${DATA_FILES} ];
+do
+ sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/load_node_file.sh ${DATASET} ${COUNTER}
+ let COUNTER=COUNTER+1
+done
+
+
+# Start test
+sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_mrql_tests.sh vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/ ${THREADS} ${REPEAT} ${DATASET}
+
+# Stop Flink
+kill ${FLINK_PID}
+jobs -p
+kill $(jobs -p)
+
+
+# Stop Hadoop
+# sh saved/hadoop/hadoop-1.2.1/bin/stop-all.sh
+sh saved/hadoop/hadoop-2.5.1/sbin/mr-jobhistory-daemon.sh stop historyserver
+sh saved/hadoop/hadoop-2.5.1/sbin/yarn-daemons.sh stop nodemanager
+sh saved/hadoop/hadoop-2.5.1/sbin/yarn-daemon.sh stop resourcemanager
+sh saved/hadoop/hadoop-2.5.1/sbin/hadoop-daemons.sh stop datanode
+sh saved/hadoop/hadoop-2.5.1/sbin/hadoop-daemon.sh stop namenode
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/run_mrql_tests.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/run_mrql_tests.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/run_mrql_tests.sh
new file mode 100755
index 0000000..c000727
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/yarn_and_flink/run_mrql_tests.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# 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.
+#
+
+# Examples
+# run_mrql_tests.sh mrql_all/ 1 2
+
+NODES=${2}
+REPEAT=${3}
+DATASET=${4}
+
+
+# Make log folder
+mkdir -p ~/disk1/weather_data/mrql/query_logs/${NODES}nodes/
+
+for j in $(find ${1} -name '*q??.mrql')
+do
+ date
+ echo "Running MRQL query: ${j}"
+ time for i in {1..${REPEAT}}; do ~/mrql/incubator-mrql/bin/mrql.flink -dist -nodes ${NODES} ${j} ${DATASET}/sensors/ ${DATASET}/stations/ >> ~/disk1/weather_data/mrql/query_logs/${NODES}nodes/$(basename "${j}").log 2>&1; done;
+done
+
+
+if which programname >/dev/null;
+then
+ echo "Sending out e-mail notification."
+ SUBJECT="MRQL Tests Finished (${DATASET})"
+ EMAIL="ecarm002@ucr.edu"
+ /bin/mail -s "${SUBJECT}" "${EMAIL}" <<EOM
+ Completed all MRQL tests on ${DATASET}.
+ EOM
+else
+ echo "No mail command to use."
+fi;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
index 2fb0af0..2745a12 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
@@ -1 +1,42 @@
-java.util.logging.ConsoleHandler.level=OFF
\ No newline at end of file
+# Properties file which configures the operation of the JDK
+# logging facility.
+
+# The system will look for this config file, first using
+# a System property specified at startup:
+#
+# >java -Djava.util.logging.config.file=myLoggingConfigFilePath
+#
+# If this property is not specified, then the config file is
+# retrieved from its default location at:
+#
+# JDK_HOME/jre/lib/logging.properties
+
+# Global logging properties.
+# ------------------------------------------
+# The set of handlers to be loaded upon startup.
+# Comma-separated list of class names.
+# (? LogManager docs say no comma here, but JDK example has comma.)
+handlers=java.util.logging.ConsoleHandler
+
+# Default global logging level.
+# Loggers and Handlers may override this level
+.level=WARNING
+
+# Loggers
+# ------------------------------------------
+# Loggers are usually attached to packages.
+# Here, the level for each package is specified.
+# The global level is used by default, so levels
+# specified here simply act as an override.
+#edu.uci.ics.hyracks.dataflow.std.join.level=ALL
+edu.uci.ics.hyracks.dataflow.std.join.OptimizedHybridHashJoinOperatorDescriptor.level=ALL
+
+
+# Handlers
+# -----------------------------------------
+
+# --- ConsoleHandler ---
+# Override of global logging level
+java.util.logging.ConsoleHandler.level=SEVERE
+#java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
index 5146586..8bc6772 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
@@ -29,7 +29,7 @@ REPEAT=5
IGNORE=2
FRAME_SIZE=$((8*1024))
BUFFER_SIZE=$((32*1024*1024))
-JOIN_HASH_SIZE=-1
+JOIN_HASH_SIZE=$(( 4 * (64*1024*1024) ))
if [ -z "${1}" ]
then
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
index 98ab04b..c90a7a9 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
@@ -29,8 +29,7 @@ CLUSTER="uci"
REPEAT=5
FRAME_SIZE=$((8*1024))
BUFFER_SIZE=$((32*1024*1024))
-#JOIN_HASH_SIZE=$((256*1024*1024))
-JOIN_HASH_SIZE=-1
+JOIN_HASH_SIZE=$((4*4*64*1024*1024))
if [ -z "${1}" ]
then
@@ -66,7 +65,7 @@ do
log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log"
log_base_path=$(dirname ${j/queries/query_logs})
mkdir -p ${log_base_path}
- time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${3} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -buffer-size ${BUFFER_SIZE} -join-hash-size ${JOIN_HASH_SIZE} -repeatexec ${REPEAT} > ${log_base_path}/${log_file} 2>&1
+ time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${3} -timing -showquery -showoet -showrp -frame-size ${FRAME_SIZE} -buffer-size ${BUFFER_SIZE} -join-hash-size ${JOIN_HASH_SIZE} -repeatexec ${REPEAT} -timing-ignore-queries 0 > ${log_base_path}/${log_file} 2>&1
echo "\nBuffer Size: ${BUFFER_SIZE}" >> ${log_base_path}/${log_file}
echo "\nFrame Size: ${FRAME_SIZE}" >> ${log_base_path}/${log_file}
echo "\nJoin Hash Size: ${JOIN_HASH_SIZE}" >> ${log_base_path}/${log_file}
@@ -76,6 +75,8 @@ done
# Stop cluster.
python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${CLUSTER}/${2}nodes.xml -a stop
+sleep 5
+python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${CLUSTER}/${2}nodes.xml -a kill
if which programname >/dev/null;
then
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
new file mode 100644
index 0000000..ff877dd
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
@@ -0,0 +1,79 @@
+#/*
+# Copyright 2009-2013 by The Regents of the University of California
+# Licensed 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 from
+#
+# 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.
+#*/
+############################################################
+# Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+# Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler
+# classes. These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+
+handlers= java.util.logging.ConsoleHandler
+
+# To also add the FileHandler, use the following line instead.
+
+# handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers. For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+
+#.level= WARNING
+# .level= INFO
+.level= FINE
+# .level = FINEST
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+# default file output is in user's home directory.
+
+# java.util.logging.FileHandler.pattern = %h/java%u.log
+# java.util.logging.FileHandler.limit = 50000
+# java.util.logging.FileHandler.count = 1
+# java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
+
+# Limit the message that are printed on the console to FINE and above.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+
+# edu.uci.ics.asterix.level = FINE
+edu.uci.ics.algebricks.level = FINE
+# edu.uci.ics.hyracks.level = FINE
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
index 4f81f86..746fef4 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
@@ -48,16 +48,20 @@ class WeatherBenchmark:
]
QUERY_UTILITY_LIST = [
"no_result.xq",
- "sensor_count.xq",
- "station_count.xq",
- "q04_sensor.xq",
- "q04_station.xq",
- "q05_sensor.xq",
- "q05_station.xq",
- "q06_sensor.xq",
- "q06_station.xq",
- "q07_tmin.xq",
- "q07_tmax.xq",
+ "count_sensor.xq",
+ "count_station.xq",
+ "q04_count_join.xq",
+ "q04_count_sensor.xq",
+ "q04_count_station.xq",
+ "q05_count_join.xq",
+ "q05_count_sensor.xq",
+ "q05_count_station.xq",
+ "q06_count_join.xq",
+ "q06_count_sensor.xq",
+ "q06_count_station.xq",
+ "q07_count_join.xq",
+ "q07_count_tmin.xq",
+ "q07_count_tmax.xq",
]
BENCHMARK_LOCAL_TESTS = ["local_speed_up", "local_batch_scale_out"]
BENCHMARK_CLUSTER_TESTS = ["speed_up", "batch_scale_out"]
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index c0ca612..53d9ec2 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -446,10 +446,10 @@ public class VXQuery {
@Option(name = "-local-node-controllers", usage = "Number of local node controllers (default 1)")
private int localNodeControllers = 1;
- @Option(name = "-frame-size", usage = "Frame size in bytes. (default 65536)")
+ @Option(name = "-frame-size", usage = "Frame size in bytes. (default 65,536)")
private int frameSize = 65536;
- @Option(name = "-join-hash-size", usage = "Join hash size in bytes.")
+ @Option(name = "-join-hash-size", usage = "Join hash size in bytes. (default 67,108,864)")
private int joinHashSize = -1;
@Option(name = "-buffer-size", usage = "Disk read buffer size in bytes.")
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index f1d41d8..12b0780 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.vxquery.compiler.rewriter.rules.ConsolidateAssignAggregateRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertFromAlgebricksExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.ConvertToAlgebricksExpressionsRule;
+import org.apache.vxquery.compiler.rewriter.rules.DelayMaterializationForJoinProbeRule;
import org.apache.vxquery.compiler.rewriter.rules.InlineNestedVariablesRule;
import org.apache.vxquery.compiler.rewriter.rules.PushChildIntoDataScanRule;
import org.apache.vxquery.compiler.rewriter.rules.ConsolidateUnnestsRule;
@@ -33,7 +34,6 @@ import org.apache.vxquery.compiler.rewriter.rules.EliminateUnnestAggregateSubpla
import org.apache.vxquery.compiler.rewriter.rules.IntroduceCollectionRule;
import org.apache.vxquery.compiler.rewriter.rules.IntroduceTwoStepAggregateRule;
import org.apache.vxquery.compiler.rewriter.rules.PushFunctionsOntoEqJoinBranches;
-import org.apache.vxquery.compiler.rewriter.rules.PushMapOperatorDownThroughProductRule;
import org.apache.vxquery.compiler.rewriter.rules.RemoveRedundantBooleanExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.RemoveRedundantCastExpressionsRule;
import org.apache.vxquery.compiler.rewriter.rules.RemoveRedundantDataExpressionsRule;
@@ -43,6 +43,7 @@ import org.apache.vxquery.compiler.rewriter.rules.RemoveUnusedSortDistinctNodesR
import org.apache.vxquery.compiler.rewriter.rules.RemoveUnusedTreatRule;
import org.apache.vxquery.compiler.rewriter.rules.SetCollectionDataSourceRule;
import org.apache.vxquery.compiler.rewriter.rules.SetVariableIdContextRule;
+import org.apache.vxquery.compiler.rewriter.rules.VXQueryExtractCommonOperatorsRule;
import edu.uci.ics.hyracks.algebricks.core.rewriter.base.HeuristicOptimizer;
import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
@@ -64,6 +65,7 @@ import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceGroupByCombinerRul
import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceProjectsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.IsolateHyracksOperatorsRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PullSelectOutOfEqJoin;
+import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushMapOperatorDownThroughProductRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushProjectDownRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushProjectIntoDataSourceScanRule;
import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSelectDownRule;
@@ -260,6 +262,7 @@ public class RewriteRuleset {
public final static List<IAlgebraicRewriteRule> buildPhysicalRewritesTopLevelRuleCollection() {
List<IAlgebraicRewriteRule> physicalPlanRewrites = new LinkedList<IAlgebraicRewriteRule>();
physicalPlanRewrites.add(new CopyLimitDownRule());
+ physicalPlanRewrites.add(new SetExecutionModeRule());
return physicalPlanRewrites;
}
@@ -269,10 +272,13 @@ public class RewriteRuleset {
prepareForJobGenRewrites.add(new IsolateHyracksOperatorsRule(
HeuristicOptimizer.hyraxOperatorsBelowWhichJobGenIsDisabled));
prepareForJobGenRewrites.add(new ExtractCommonOperatorsRule());
+// prepareForJobGenRewrites.add(new VXQueryExtractCommonOperatorsRule());
+// prepareForJobGenRewrites.add(new DelayMaterializationForJoinProbeRule());
// Re-infer all types, so that, e.g., the effect of not-is-null is
// propagated.
prepareForJobGenRewrites.add(new PushProjectIntoDataSourceScanRule());
prepareForJobGenRewrites.add(new ReinferAllTypesRule());
+ prepareForJobGenRewrites.add(new SetExecutionModeRule());
return prepareForJobGenRewrites;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
index 6c0aa26..6a2bb08 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateUnnestsRule.java
@@ -18,6 +18,7 @@ package org.apache.vxquery.compiler.rewriter.rules;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox;
+import org.apache.vxquery.functions.BuiltinOperators;
import org.apache.vxquery.functions.Function;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -45,7 +46,7 @@ import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOpera
* UNNEST( $v1 : uf1( $v0 ) )
* plan__child
*
- * Where $v1 is not used in plan__parent.
+ * Where $v1 is not used in plan__parent and uf1 is not a descendant expression.
*
* After
*
@@ -85,6 +86,12 @@ public class ConsolidateUnnestsRule extends AbstractUsedVariablesProcessingRule
if (!functionInfo2.hasScalarEvaluatorFactory()) {
return false;
}
+ // Exception for specific path expressions.
+ if (functionCall2.getFunctionIdentifier().equals(BuiltinOperators.DESCENDANT.getFunctionIdentifier())
+ || functionCall2.getFunctionIdentifier().equals(
+ BuiltinOperators.DESCENDANT_OR_SELF.getFunctionIdentifier())) {
+ return false;
+ }
// Find unnest2 variable in unnest1
Mutable<ILogicalExpression> unnest1Arg = ExpressionToolbox.findVariableExpression(
@@ -105,5 +112,4 @@ public class ConsolidateUnnestsRule extends AbstractUsedVariablesProcessingRule
}
return false;
}
-
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
index b92384e..f3d7d48 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConvertAssignSortDistinctNodesToOperatorsRule.java
@@ -203,7 +203,6 @@ public class ConvertAssignSortDistinctNodesToOperatorsRule implements IAlgebraic
List<Pair<IOrder, Mutable<ILogicalExpression>>> orderArgs = new ArrayList<Pair<IOrder, Mutable<ILogicalExpression>>>();
orderArgs.add(new Pair<IOrder, Mutable<ILogicalExpression>>(OrderOperator.ASC_ORDER, variableRef));
OrderOperator oo = new OrderOperator(orderArgs);
-// oo.setExecutionMode(AbstractLogicalOperator.ExecutionMode.LOCAL);
return oo;
}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/DelayMaterializationForJoinProbeRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/DelayMaterializationForJoinProbeRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/DelayMaterializationForJoinProbeRule.java
new file mode 100644
index 0000000..341b7ec
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/DelayMaterializationForJoinProbeRule.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2009-2013 by The Regents of the University of California
+ * Licensed 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 from
+ *
+ * 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.vxquery.compiler.rewriter.rules;
+
+import org.apache.commons.lang3.mutable.Mutable;
+import org.apache.commons.lang3.mutable.MutableObject;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator.ExecutionMode;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.ExchangeOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.IsomorphismUtilities;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.physical.MaterializePOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.physical.OneToOneExchangePOperator;
+import edu.uci.ics.hyracks.algebricks.core.algebra.operators.physical.ReplicatePOperator;
+import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+
+public class DelayMaterializationForJoinProbeRule implements IAlgebraicRewriteRule {
+
+ @Override
+ public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException {
+ return false;
+ }
+
+ @Override
+ public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
+ AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
+ if (op.getOperatorTag() != LogicalOperatorTag.INNERJOIN
+ && op.getOperatorTag() != LogicalOperatorTag.LEFTOUTERJOIN) {
+ return false;
+ }
+
+ AbstractBinaryJoinOperator abjo = (AbstractBinaryJoinOperator) op;
+ if (abjo.getInputs().size() != 2) {
+ return false;
+ }
+
+ Mutable<ILogicalOperator> branchProbeRO = findReplicateOperator(abjo.getInputs().get(0));
+ Mutable<ILogicalOperator> branchBuildRO = findReplicateOperator(abjo.getInputs().get(1));
+ if (branchBuildRO == null || branchBuildRO == null
+ || !IsomorphismUtilities.isOperatorIsomorphic(branchProbeRO.getValue(), branchBuildRO.getValue())) {
+ return false;
+ }
+
+ // Turn off materialization in replicate operator.
+ boolean found = false;
+ ReplicateOperator ro = (ReplicateOperator) branchProbeRO.getValue();
+ boolean[] outputMaterializationFlags = ro.getOutputMaterializationFlags();
+ for (int i = 0; i < outputMaterializationFlags.length; ++i) {
+ if (outputMaterializationFlags[i]) {
+ found = true;
+ outputMaterializationFlags[i] = false;
+ }
+ }
+ if (!found) {
+ return false;
+ }
+ ro.setOutputMaterializationFlags(outputMaterializationFlags);
+
+ // Set up references to one level down
+ Mutable<ILogicalOperator> parentOp = abjo.getInputs().get(0);
+ Mutable<ILogicalOperator> childOpRef = parentOp;
+ parentOp = parentOp.getValue().getInputs().get(0);
+
+ // New plan operators
+ AbstractLogicalOperator exchange = new ExchangeOperator();
+ exchange.setPhysicalOperator(new OneToOneExchangePOperator());
+ exchange.setExecutionMode(ExecutionMode.PARTITIONED);
+ MutableObject<ILogicalOperator> exchangeRef = new MutableObject<ILogicalOperator>(exchange);
+ exchange.getInputs().add(parentOp);
+
+ MaterializeOperator mop = new
+ MaterializeOperator();
+ mop.setPhysicalOperator(new MaterializePOperator(false));
+ mop.setExecutionMode(ExecutionMode.PARTITIONED);
+ Mutable<ILogicalOperator> mopRef = new MutableObject<ILogicalOperator>(mop);
+ mop.getInputs().add(exchangeRef);
+ AbstractLogicalOperator childOp = (AbstractLogicalOperator) childOpRef.getValue();
+ childOp.getInputs().set(0, mopRef);
+
+// boolean[] materializeFlag = new boolean[1];
+// materializeFlag[0] = true;
+// ReplicateOperator rop = new ReplicateOperator(1, materializeFlag);
+// rop.setPhysicalOperator(new ReplicatePOperator());
+// rop.setExecutionMode(ExecutionMode.PARTITIONED);
+// Mutable<ILogicalOperator> ropRef = new MutableObject<ILogicalOperator>(rop);
+// rop.getInputs().add(exchangeRef);
+//
+// // Output
+// rop.getOutputs().add(childOpRef);
+// AbstractLogicalOperator childOp = (AbstractLogicalOperator) childOpRef.getValue();
+// childOp.getInputs().set(0, ropRef);
+
+ context.computeAndSetTypeEnvironmentForOperator(exchange);
+ context.computeAndSetTypeEnvironmentForOperator(mop);
+ context.computeAndSetTypeEnvironmentForOperator(childOp);
+ return true;
+ }
+
+ private Mutable<ILogicalOperator> findReplicateOperator(Mutable<ILogicalOperator> input) {
+ AbstractLogicalOperator op = (AbstractLogicalOperator) input.getValue();
+ if (op.getOperatorTag() == LogicalOperatorTag.REPLICATE) {
+ return input;
+ }
+ if (op.getInputs().size() == 1) {
+ return findReplicateOperator(op.getInputs().get(0));
+ }
+ return null;
+ }
+
+// private void updateBranchContext(Mutable<ILogicalOperator> input, IOptimizationContext context)
+// throws AlgebricksException {
+// AbstractLogicalOperator op = (AbstractLogicalOperator) input.getValue();
+// if (op.getOperatorTag() != LogicalOperatorTag.REPLICATE) {
+// updateBranchContext(op.getInputs().get(0), context);
+// }
+// op.setExecutionMode(ExecutionMode.PARTITIONED);
+// // context.invalidateTypeEnvironmentForOperator(op);
+// context.computeAndSetTypeEnvironmentForOperator(op);
+// op.computeOutputTypeEnvironment(context);
+// }
+
+}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushMapOperatorDownThroughProductRule.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushMapOperatorDownThroughProductRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushMapOperatorDownThroughProductRule.java
deleted file mode 100644
index a13d64b..0000000
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushMapOperatorDownThroughProductRule.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.vxquery.compiler.rewriter.rules;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.mutable.Mutable;
-
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
-
-/**
- * The rule searches for an inner join operator followed by a map operator.
- * When the map operator only uses variable generated by one side of the join,
- * the operator is pushed down through the product rule.
- *
- * <pre>
- * Before
- *
- * %PARENT_PLAN
- * ASSIGN | EXCHANGE | SELECT | UNNEST
- * INNERJOIN( true )
- * {
- * %RIGHT_BRANCH_PLAN
- * }
- * {
- * %LEFT_BRANCH_PLAN
- * }
- * %CHILD_PLAN
- *
- * Where ASSIGN | EXCHANGE | SELECT | UNNEST are operators with the map
- * property.
- *
- * After
- *
- * When all variables used in ASSIGN | EXCHANGE | SELECT | UNNEST exist in
- * %RIGHT_BRANCH_PLAN.
- *
- * %PARENT_PLAN
- * INNERJOIN( true )
- * {
- * ASSIGN | EXCHANGE | SELECT | UNNEST
- * %RIGHT_BRANCH_PLAN
- * }
- * {
- * %LEFT_BRANCH_PLAN
- * }
- * %CHILD_PLAN
- *
- * When all variables used in ASSIGN | EXCHANGE | SELECT | UNNEST exist in
- * %LEFT_BRANCH_PLAN.
- *
- * %PARENT_PLAN
- * INNERJOIN( true )
- * {
- * %RIGHT_BRANCH_PLAN
- * }
- * {
- * ASSIGN | EXCHANGE | SELECT | UNNEST
- * %LEFT_BRANCH_PLAN
- * }
- * %CHILD_PLAN
- * </pre>
- */
-public class PushMapOperatorDownThroughProductRule implements IAlgebraicRewriteRule {
-
- @Override
- public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException {
- return false;
- }
-
- @Override
- public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
- throws AlgebricksException {
- AbstractLogicalOperator op1 = (AbstractLogicalOperator) opRef.getValue();
- if (!op1.isMap()) {
- return false;
- }
- Mutable<ILogicalOperator> op2Ref = op1.getInputs().get(0);
- AbstractLogicalOperator op2 = (AbstractLogicalOperator) op2Ref.getValue();
- if (op2.getOperatorTag() != LogicalOperatorTag.INNERJOIN) {
- return false;
- }
- AbstractBinaryJoinOperator join = (AbstractBinaryJoinOperator) op2;
- if (join.getCondition().getValue() != ConstantExpression.TRUE) {
- return false;
- }
-
- List<LogicalVariable> used = new ArrayList<LogicalVariable>();
- VariableUtilities.getUsedVariables(op1, used);
-
- Mutable<ILogicalOperator> b0Ref = op2.getInputs().get(0);
- ILogicalOperator b0 = b0Ref.getValue();
- List<LogicalVariable> b0Scm = new ArrayList<LogicalVariable>();
- VariableUtilities.getLiveVariables(b0, b0Scm);
- if (b0Scm.containsAll(used)) {
- // push assign on left branch
- op2Ref.setValue(b0);
- b0Ref.setValue(op1);
- opRef.setValue(op2);
- return true;
- } else {
- Mutable<ILogicalOperator> b1Ref = op2.getInputs().get(1);
- ILogicalOperator b1 = b1Ref.getValue();
- List<LogicalVariable> b1Scm = new ArrayList<LogicalVariable>();
- VariableUtilities.getLiveVariables(b1, b1Scm);
- if (b1Scm.containsAll(used)) {
- // push assign on right branch
- op2Ref.setValue(b1);
- b1Ref.setValue(op1);
- opRef.setValue(op2);
- return true;
- } else {
- return false;
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/99ba4dbf/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml b/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
index ecf7542..5892c48 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
+++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
@@ -906,6 +906,7 @@
<param name="arg" type="node()*"/>
<return type="node()*"/>
<runtime type="scalar" class="org.apache.vxquery.runtime.functions.step.DescendantOrSelfPathStepScalarEvaluatorFactory"/>
+ <runtime type="unnesting" class="org.apache.vxquery.runtime.functions.step.DescendantOrSelfPathStepUnnestingEvaluatorFactory"/>
<property type="UniqueNodes" class="org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenodes.UniqueNodesNOPropagationPolicy"/>
</operator>
[11/25] vxquery git commit: Recent round of changes to improve
performance in the benchmarks.
Posted by pr...@apache.org.
Recent round of changes to improve performance in the benchmarks.
- Added more queries to help identify root causes of performance issues.
- Now allow join hash size to be larger than 2G. (int vs long)
- Cache dictionary for node trees.
- In child unnesting, the filter is now cached between calls.
- Created a string builder to help with parsing. (It now skips converting to a string.)
- Added CC and NC start up options in a new cluster.properties file.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/f13d3780
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/f13d3780
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/f13d3780
Branch: refs/heads/master
Commit: f13d37801f1f0073d3c4b72a79198107e67d3b46
Parents: f884ad8
Author: Preston Carman <pr...@apache.org>
Authored: Thu Dec 18 09:58:23 2014 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Feb 5 12:11:39 2015 -0800
----------------------------------------------------------------------
.../builders/nodes/UTF8StringBuilder.java | 53 ++++++++++++++++++++
.../vxquery/xmlparser/SAXContentHandler.java | 1 +
.../xmlquery/query/XMLQueryCompiler.java | 4 ++
.../src/main/resources/conf/cluster.properties | 1 -
4 files changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f13d3780/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
new file mode 100644
index 0000000..3b4eea0
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
@@ -0,0 +1,53 @@
+/*
+ * 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.vxquery.datamodel.builders.nodes;
+
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.UTFDataFormatException;
+
+import org.apache.vxquery.runtime.functions.util.FunctionHelper;
+
+import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
+
+public class UTF8StringBuilder extends AbstractNodeBuilder {
+ private IMutableValueStorage mvs;
+ private DataOutput out;
+
+ @Override
+ public void reset(IMutableValueStorage mvs) throws IOException {
+ this.mvs = mvs;
+ out = mvs.getDataOutput();
+ out.write(0);
+ out.write(0);
+ }
+
+ @Override
+ public void finish() throws IOException {
+ int utflen = mvs.getLength() - 2;
+ BytePointable.setByte(mvs.getByteArray(), 0, (byte) ((utflen >>> 8) & 0xFF));
+ BytePointable.setByte(mvs.getByteArray(), 1, (byte) ((utflen >>> 0) & 0xFF));
+ }
+
+ public void appendCharArray(char[] ch, int start, int length) throws IOException {
+ FunctionHelper.writeCharArray(ch, start, length, out);
+ if (mvs.getLength() > 65535) {
+ throw new UTFDataFormatException("encoded string too long: " + mvs.getLength() + " bytes");
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f13d3780/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
index 296d062..d4d3bd1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
@@ -31,6 +31,7 @@ import org.apache.vxquery.datamodel.builders.nodes.DocumentNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.ElementNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.PINodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.TextNodeBuilder;
+import org.apache.vxquery.datamodel.builders.nodes.UTF8StringBuilder;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.types.BuiltinTypeQNames;
import org.apache.vxquery.types.ElementType;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f13d3780/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index 263a93d..06b5918 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -119,6 +119,10 @@ public class XMLQueryCompiler {
builder.getPhysicalOptimizationConfig().setMaxFramesLeftInputHybridHash(
(int) (maximumDataSize / this.frameSize));
}
+
+ builder.getPhysicalOptimizationConfig().setMaxFramesLeftInputHybridHash(
+ (int) (60L * 1024 * 1048576 / this.frameSize));
+
builder.setLogicalRewrites(buildDefaultLogicalRewrites());
builder.setPhysicalRewrites(buildDefaultPhysicalRewrites());
builder.setSerializerDeserializerProvider(new ISerializerDeserializerProvider() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f13d3780/vxquery-server/src/main/resources/conf/cluster.properties
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/conf/cluster.properties b/vxquery-server/src/main/resources/conf/cluster.properties
index 107f4a5..fd015d4 100644
--- a/vxquery-server/src/main/resources/conf/cluster.properties
+++ b/vxquery-server/src/main/resources/conf/cluster.properties
@@ -37,7 +37,6 @@ JAVA_HOME=$JAVA_HOME
#The directory to put cc logs
CCOPTS=" -cc-root ${CCTMP_DIR} -heartbeat-period 60000 -max-heartbeat-lapse-periods 10 "
-
#The directory to put nc logs
NCOPTS=" -iodevices /home/ecarman/disk1/tmp/,/home/ecarman/disk2/tmp/ "
#NCOPTS=" -iodevices $NCTMP_DIR "
[19/25] vxquery git commit: Updated the error checking to search
nested exceptions.
Posted by pr...@apache.org.
Updated the error checking to search nested exceptions.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/94c242df
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/94c242df
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/94c242df
Branch: refs/heads/master
Commit: 94c242df136252826827e0c424f77ca139f95e66
Parents: e2e115c
Author: Preston Carman <pr...@apache.org>
Authored: Thu Feb 19 10:41:15 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Feb 19 10:41:15 2015 -0800
----------------------------------------------------------------------
.../java/org/apache/vxquery/xtest/TestRunner.java | 16 +++++++++++++---
.../java/org/apache/vxquery/xtest/VXQueryTest.java | 13 ++++++++++++-
2 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/94c242df/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
index e974bca..a5f0ba1 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
@@ -145,10 +145,20 @@ public class TestRunner {
}
throw e;
}
- } catch (SystemException e) {
- res.error = e;
} catch (Throwable e) {
- res.error = e;
+ // Check for nested SystemExceptions.
+ Throwable error = e;
+ while (error != null) {
+ if (error instanceof SystemException) {
+ res.error = error;
+ break;
+ }
+ error = error.getCause();
+ }
+ // Default
+ if (res.error == null) {
+ res.error = e;
+ }
} finally {
try {
res.compare();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/94c242df/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
index 95a20fa..b889eb6 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
@@ -22,6 +22,8 @@ import java.io.File;
import java.util.Collection;
import org.apache.commons.lang3.StringUtils;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -75,9 +77,13 @@ public class VXQueryTest {
tr = new TestRunner(getVXQueryOptions());
}
+ @Before
+ public void beforeTest() throws Exception {
+ tr.open();
+ }
+
@Test
public void test() throws Exception {
- tr.open();
TestCaseResult result = tr.run(tc);
switch (result.state) {
case EXPECTED_ERROR_GOT_DIFFERENT_ERROR:
@@ -94,6 +100,11 @@ public class VXQueryTest {
case NO_RESULT_FILE:
break;
}
+ }
+
+ @After
+ public void afterTest() throws Exception {
tr.close();
}
+
}
[07/25] vxquery git commit: Added two new test cases for numeric
functions. Also includes a few bug fixes and clean up items.
Posted by pr...@apache.org.
Added two new test cases for numeric functions. Also includes a few bug fixes and clean up items.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/0ff85572
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/0ff85572
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/0ff85572
Branch: refs/heads/master
Commit: 0ff85572e0140b12b478ea58789910d8f059d0b3
Parents: d5101a1
Author: Preston Carman <pr...@apache.org>
Authored: Thu Feb 5 11:47:12 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Feb 5 11:47:12 2015 -0800
----------------------------------------------------------------------
.../noaa-ghcn-daily/scripts/run_benchmark.sh | 2 +-
vxquery-cli/pom.xml | 287 ++++++++++---------
.../java/org/apache/vxquery/cli/VXQuery.java | 3 +-
.../accessors/atomic/XSDecimalPointable.java | 2 +-
.../AvgGlobalAggregateEvaluatorFactory.java | 2 -
.../FnAvgAggregateEvaluatorFactory.java | 2 -
.../functions/numeric/FnCeilingOperation.java | 4 +-
.../functions/numeric/FnRoundOperation.java | 4 +-
.../src/main/resources/conf/cluster.properties | 6 +-
.../ExpectedTestResults/Numerics/fn:abs.txt | 8 +
.../ExpectedTestResults/Numerics/fn:ceiling.txt | 8 +
.../resources/Queries/XQuery/Numerics/fn:abs.xq | 22 ++
.../Queries/XQuery/Numerics/fn:ceiling.xq | 22 ++
.../src/test/resources/VXQueryCatalog.xml | 15 +
.../FunctionsAndOperatorsOnNumericsQueries.xml | 33 +++
15 files changed, 263 insertions(+), 157 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
index c4d8922..5be4696 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
@@ -37,7 +37,7 @@ then
exit
fi
-export JAVA_OPTS="$JAVA_OPTS -server -Xmx7G -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
+export JAVA_OPTS="$JAVA_OPTS -server -Xmx500M -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
for j in $(find ${1} -name '*q??.xq')
do
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-cli/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index ab94c18..b5144d1 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -14,152 +14,155 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
- </parent>
-
- <artifactId>apache-vxquery-cli</artifactId>
- <packaging>jar</packaging>
- <name>VXQuery CLI</name>
- <description>Apache VXQuery Command-Line Utility</description>
-
- <distributionManagement>
- <site>
- <id>vxquery.website</id>
- <name>VXQuery Website</name>
- <url>file:../site/vxquery-cli/</url>
- </site>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <configuration>
- <programs>
- <program>
- <mainClass>org.apache.vxquery.cli.VXQuery</mainClass>
- <name>vxq</name>
- </program>
- </programs>
- <repositoryLayout>flat</repositoryLayout>
- <repositoryName>lib</repositoryName>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>apache-vxquery-cli</artifactId>
+ <packaging>jar</packaging>
+ <name>VXQuery CLI</name>
+ <description>Apache VXQuery Command-Line Utility</description>
+
+ <distributionManagement>
+ <site>
+ <id>vxquery.website</id>
+ <name>VXQuery Website</name>
+ <url>file:../site/vxquery-cli/</url>
+ </site>
+ </distributionManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <configuration>
+ <programs>
+ <program>
+ <mainClass>org.apache.vxquery.cli.VXQuery</mainClass>
+ <name>vxq</name>
+ </program>
+ </programs>
+ <repositoryLayout>flat</repositoryLayout>
+ <repositoryName>lib</repositoryName>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
-->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-site</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-core</artifactId>
- <version>0.5-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-cc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-nc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>algebricks-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-dataflow-std</artifactId>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>dependencies</report>
- <report>plugins</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <linkOnly>true</linkOnly>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <notimestamp>true</notimestamp>
- <maxmemory>2g</maxmemory>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery-core</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-cc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-nc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-common</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-common</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-std</artifactId>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>dependencies</report>
+ <report>plugins</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <linkOnly>true</linkOnly>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ <maxmemory>2g</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 866edd1..ca91636 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -78,7 +78,7 @@ public class VXQuery {
private IHyracksDataset hds;
private ResultSetId resultSetId;
- private static List<String> timingMessages;
+ private static List<String> timingMessages = new ArrayList<String>();
private static long sumTiming;
private static long sumSquaredTiming;
private static long minTiming = Long.MAX_VALUE;
@@ -92,7 +92,6 @@ public class VXQuery {
*/
public VXQuery(CmdLineOptions opts) {
this.opts = opts;
- timingMessages = new ArrayList<String>();
}
/**
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
index 8aca4a0..b05e27f 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
@@ -197,7 +197,7 @@ public class XSDecimalPointable extends AbstractPointable implements IHashable,
@Override
public double doubleValue() {
- return getDecimalValue() / Math.pow(10, getDecimalPlace());
+ return ((double) getDecimalValue()) / Math.pow(10, getDecimalPlace());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
index 0f4ac08..8d589ed 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java
@@ -20,7 +20,6 @@ import java.io.DataOutput;
import org.apache.vxquery.datamodel.accessors.SequencePointable;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.accessors.TypedPointables;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.exceptions.ErrorCode;
@@ -30,7 +29,6 @@ import org.apache.vxquery.runtime.functions.arithmetic.DivideOperation;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
index d89426b..5717174 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java
@@ -20,7 +20,6 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.datamodel.accessors.TypedPointables;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.exceptions.ErrorCode;
@@ -30,7 +29,6 @@ import org.apache.vxquery.runtime.functions.arithmetic.DivideOperation;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory;
import org.apache.vxquery.runtime.functions.util.ArithmeticHelper;
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
index 8fb750f..d7579e1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
@@ -32,8 +32,8 @@ public class FnCeilingOperation extends AbstractNumericOperation {
@Override
public void operateDecimal(XSDecimalPointable decp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DECIMAL_TAG);
- dOut.write(decp.getDecimalPlace());
- dOut.writeLong((long) Math.ceil(decp.getDecimalValue()));
+ dOut.write(0);
+ dOut.writeLong((long) Math.ceil(decp.doubleValue()));
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
index 5d45f86..90e5156 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
@@ -32,8 +32,8 @@ public class FnRoundOperation extends AbstractNumericOperation {
@Override
public void operateDecimal(XSDecimalPointable decp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DECIMAL_TAG);
- dOut.write(decp.getDecimalPlace());
- dOut.writeLong((long) Math.round(decp.getDecimalValue()));
+ dOut.write(0);
+ dOut.writeLong(Math.round(decp.doubleValue()));
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-server/src/main/resources/conf/cluster.properties
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/conf/cluster.properties b/vxquery-server/src/main/resources/conf/cluster.properties
index 9f7d950..107f4a5 100644
--- a/vxquery-server/src/main/resources/conf/cluster.properties
+++ b/vxquery-server/src/main/resources/conf/cluster.properties
@@ -43,13 +43,13 @@ NCOPTS=" -iodevices /home/ecarman/disk1/tmp/,/home/ecarman/disk2/tmp/ "
#NCOPTS=" -iodevices $NCTMP_DIR "
#CC JAVA_OPTS
-CCJAVA_OPTS="-server -Xmx7G -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
+CCJAVA_OPTS="-server -Xmx500M -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
# debug option: CCJAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=7001,server=y,suspend=n -Xmx1g -Djava.util.logging.config.file=logging.properties"
-# Yourkit option: -agentpath:/tools/yjp-10.0.4/bin/linux-x86-64/libyjpagent.so=port=20001"
+# Yourkit option: -agentpath:/tools/yjp-2014-build-14114/bin/linux-x86-64/libyjpagent.so=port=20001"
# Yourkit mac option: -agentpath:/Applications/YourKit_Java_Profiler.app/bin/mac/libyjpagent.jnilib=sampling
#NC JAVA_OPTS
NCJAVA_OPTS="-server -Xmx7G -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
# debug option: NCJAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=7002,server=y,suspend=n -Xmx1g -Djava.util.logging.config.file=logging.properties"
-# Yourkit option: -agentpath:/tools/yjp-10.0.4/bin/linux-x86-64/libyjpagent.so=port=20001"
+# Yourkit option: -agentpath:/tools/yjp-2014-build-14114/bin/linux-x86-64/libyjpagent.so=port=20001"
# Yourkit mac option: -agentpath:/Applications/YourKit_Java_Profiler.app/bin/mac/libyjpagent.jnilib=sampling
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:abs.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:abs.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:abs.txt
new file mode 100644
index 0000000..77fbb52
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:abs.txt
@@ -0,0 +1,8 @@
+5.5
+5
+5.5
+5.5
+5.5
+5
+5.5
+5.5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:ceiling.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:ceiling.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:ceiling.txt
new file mode 100644
index 0000000..1c95747
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn:ceiling.txt
@@ -0,0 +1,8 @@
+6
+5
+6
+6
+-5
+-5
+-5
+-5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:abs.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:abs.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:abs.xq
new file mode 100644
index 0000000..44bd08e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:abs.xq
@@ -0,0 +1,22 @@
+(: 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. :)
+
+(: XQuery fn:abs :)
+(
+ fn:abs(xs:decimal(5.5)), fn:abs(xs:integer(5)), fn:abs(xs:float(5.5)), fn:abs(xs:double(5.5)),
+ fn:abs(xs:decimal(-5.5)), fn:abs(xs:integer(-5)), fn:abs(xs:float(-5.5)), fn:abs(xs:double(-5.5))
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:ceiling.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:ceiling.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:ceiling.xq
new file mode 100644
index 0000000..6a14197
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn:ceiling.xq
@@ -0,0 +1,22 @@
+(: 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. :)
+
+(: XQuery fn:ceiling :)
+(
+ fn:ceiling(xs:decimal(5.5)), fn:ceiling(xs:integer(5)), fn:ceiling(xs:float(5.5)), fn:ceiling(xs:double(5.5)),
+ fn:ceiling(xs:decimal(-5.5)), fn:ceiling(xs:integer(-5)), fn:ceiling(xs:float(-5.5)), fn:ceiling(xs:double(-5.5))
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
index 30ebdc5..773c276 100644
--- a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
+++ b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
@@ -22,6 +22,8 @@
<!ENTITY AggregatePartition2Queries SYSTEM "cat/AggregatePartition2Queries.xml">
<!ENTITY AggregatePartition4Queries SYSTEM "cat/AggregatePartition4Queries.xml">
+<!ENTITY FunctionsAndOperatorsOnNumericsQueries SYSTEM "cat/FunctionsAndOperatorsOnNumericsQueries.xml">
+
<!ENTITY GhcndPartition1Queries SYSTEM "cat/GhcndPartition1Queries.xml">
<!ENTITY GhcndPartition2Queries SYSTEM "cat/GhcndPartition2Queries.xml">
<!ENTITY GhcndPartition4Queries SYSTEM "cat/GhcndPartition4Queries.xml">
@@ -116,6 +118,19 @@
&AggregatePartition4Queries;
</test-group>
</test-group>
+ <test-group name="FunctionsAndOperatorsOnNumericsQueries" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Functions And Operators On Numerics Queries</title>
+ <description/>
+ </GroupInfo>
+ <test-group name="FunctionsAndOperatorsOnNumericsExecutionTests" featureOwner="Preston Carman">
+ <GroupInfo>
+ <title>Functions And Operators On Numerics Execution Tests</title>
+ <description/>
+ </GroupInfo>
+ &FunctionsAndOperatorsOnNumericsQueries;
+ </test-group>
+ </test-group>
<test-group name="GhcndPartitionQueries" featureOwner="Preston Carman">
<GroupInfo>
<title>GHCND Partition Queries</title>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/0ff85572/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml b/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
new file mode 100644
index 0000000..e79c514
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
@@ -0,0 +1,33 @@
+<!--
+ 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.
+-->
+
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>Function and Operators on Numerics</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="functions-and-operators-on-numerics-fn:abs" FilePath="Numerics/" Creator="Preston Carman">
+ <description>Query for fn:abs with all numeric types.</description>
+ <query name="fn:abs" date="2015-01-05"/>
+ <output-file compare="Text">fn:abs.txt</output-file>
+ </test-case>
+ <test-case name="functions-and-operators-on-numerics-fn:ceiling" FilePath="Numerics/" Creator="Preston Carman">
+ <description>Query for fn:ceiling with all numeric types.</description>
+ <query name="fn:ceiling" date="2015-01-05"/>
+ <output-file compare="Text">fn:ceiling.txt</output-file>
+ </test-case>
+</test-group>
\ No newline at end of file
[03/25] vxquery git commit: Recent round of changes to improve
performance in the benchmarks.
Posted by pr...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-server/src/main/resources/conf/cluster.properties
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/conf/cluster.properties b/vxquery-server/src/main/resources/conf/cluster.properties
new file mode 100644
index 0000000..4614898
--- /dev/null
+++ b/vxquery-server/src/main/resources/conf/cluster.properties
@@ -0,0 +1,54 @@
+#
+# 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.
+#
+
+#The tmp directory for VXQuery
+VXTMP_DIR=/tmp/vxquery
+
+#The tmp directory for cc
+CCTMP_DIR=$VXTMP_DIR/cc
+
+#The tmp directory for nc
+NCTMP_DIR=$VXTMP_DIR/nc
+
+#The directory to put cc logs
+CCLOGS_DIR=$VXTMP_DIR/logs
+
+#The directory to put nc logs
+NCLOGS_DIR=$VXTMP_DIR/logs
+
+#The JAVA_HOME
+JAVA_HOME=$JAVA_HOME
+
+#The directory to put cc logs
+CCOPTS=" -cc-root ${CCTMP_DIR} "
+
+#The directory to put nc logs
+NCOPTS=" -iodevices /home/ecarman/disk1/tmp/,/home/ecarman/disk2/tmp/ "
+#NCOPTS=" -iodevices $NCTMP_DIR "
+
+#CC JAVA_OPTS
+CCJAVA_OPTS="-server -Xmx7G -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
+# debug option: CCJAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=7001,server=y,suspend=n -Xmx1g -Djava.util.logging.config.file=logging.properties"
+# Yourkit option: -agentpath:/tools/yjp-10.0.4/bin/linux-x86-64/libyjpagent.so=port=20001"
+# Yourkit mac option: -agentpath:/Applications/YourKit_Java_Profiler.app/bin/mac/libyjpagent.jnilib=sampling
+
+#NC JAVA_OPTS
+NCJAVA_OPTS="-server -Xmx7G -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
+# debug option: NCJAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=7002,server=y,suspend=n -Xmx1g -Djava.util.logging.config.file=logging.properties"
+# Yourkit option: -agentpath:/tools/yjp-10.0.4/bin/linux-x86-64/libyjpagent.so=port=20001"
+# Yourkit mac option: -agentpath:/Applications/YourKit_Java_Profiler.app/bin/mac/libyjpagent.jnilib=sampling
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-server/src/main/resources/scripts/startcc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/startcc.sh b/vxquery-server/src/main/resources/scripts/startcc.sh
index dd1e5be..44b08eb 100755
--- a/vxquery-server/src/main/resources/scripts/startcc.sh
+++ b/vxquery-server/src/main/resources/scripts/startcc.sh
@@ -23,18 +23,28 @@ CCHOST=$1
CCPORT=$2
J_OPTS=$3
+#Import cluster properties
+MYDIR="$(dirname -- $0)"
+. ${MYDIR}/../conf/cluster.properties
+
# Export JAVA_HOME
export JAVA_HOME=${JAVA_HOME}
-# java opts added parameters
+# java opts added parameters in XML Cluster config
if [ ! -z "${J_OPTS}" ]
then
JAVA_OPTS="${JAVA_OPTS} ${J_OPTS}"
export JAVA_OPTS
fi
+# java opts added parameters Server cluster.properties
+if [ ! -z "${CCJAVA_OPTS}" ]
+then
+ JAVA_OPTS="${JAVA_OPTS} ${CCJAVA_OPTS}"
+ export JAVA_OPTS
+fi
+
VXQUERY_HOME=`pwd`
-CCLOGS_DIR=${VXQUERY_HOME}/logs
# logs dir
mkdir -p ${CCLOGS_DIR}
@@ -46,5 +56,12 @@ then
CC_OPTIONS=" ${CC_OPTIONS} -client-net-port ${CCPORT} "
fi
+if [ ! -z "${CCOPTS}" ]
+then
+ CC_OPTIONS=" ${CC_OPTIONS} ${CCOPTS} "
+fi
+
+echo "${JAVA_OPTS}" &> ${CCLOGS_DIR}/cc.log
+
# Launch hyracks cc script without toplogy
${VXQUERY_HOME}/vxquery-server/target/appassembler/bin/vxquerycc ${CC_OPTIONS} &> ${CCLOGS_DIR}/cc_$(date +%Y%m%d%H%M).log &
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-server/src/main/resources/scripts/startnc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/startnc.sh b/vxquery-server/src/main/resources/scripts/startnc.sh
index 260512e..7d944f0 100755
--- a/vxquery-server/src/main/resources/scripts/startnc.sh
+++ b/vxquery-server/src/main/resources/scripts/startnc.sh
@@ -25,6 +25,10 @@ CCHOST=$3
CCPORT=$4
J_OPTS=$5
+#Import cluster properties
+MYDIR="$(dirname -- $0)"
+. ${MYDIR}/../conf/cluster.properties
+
# Set JAVA_HOME
export JAVA_HOME=$JAVA_HOME
@@ -35,8 +39,14 @@ then
export JAVA_OPTS
fi
+# java opts added parameters Server cluster.properties
+if [ ! -z "${NCJAVA_OPTS}" ]
+then
+ JAVA_OPTS="${JAVA_OPTS} ${NCJAVA_OPTS}"
+ export JAVA_OPTS
+fi
+
VXQUERY_HOME=`pwd`
-NCLOGS_DIR=${VXQUERY_HOME}/logs
# logs dir
mkdir -p $NCLOGS_DIR
@@ -48,6 +58,13 @@ then
NC_OPTIONS=" ${NC_OPTIONS} -cc-port ${CCPORT} "
fi
+if [ ! -z "${NCOPTS}" ]
+then
+ NC_OPTIONS=" ${NC_OPTIONS} ${NCOPTS} "
+fi
+
+echo "${JAVA_OPTS}" &> ${NCLOGS_DIR}/nc.log
+
# Launch hyracks nc
${VXQUERY_HOME}/vxquery-server/target/appassembler/bin/vxquerync ${NC_OPTIONS} &> ${NCLOGS_DIR}/nc_$(date +%Y%m%d%H%M).log &
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-server/src/main/resources/scripts/stopcc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/stopcc.sh b/vxquery-server/src/main/resources/scripts/stopcc.sh
index f2b6883..f7fba5c 100755
--- a/vxquery-server/src/main/resources/scripts/stopcc.sh
+++ b/vxquery-server/src/main/resources/scripts/stopcc.sh
@@ -21,6 +21,10 @@ hostname
USER=$1
+#Import cluster properties
+MYDIR="$(dirname -- $0)"
+. ${MYDIR}/../conf/cluster.properties
+
# Kill process
PID=`ps -ef|grep ${USER}|grep java|grep 'Dapp.name=vxquerycc'|awk '{print $2}'`
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-server/src/main/resources/scripts/stopcluster.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/stopcluster.sh b/vxquery-server/src/main/resources/scripts/stopcluster.sh
index 5172a2e..b26f5b2 100755
--- a/vxquery-server/src/main/resources/scripts/stopcluster.sh
+++ b/vxquery-server/src/main/resources/scripts/stopcluster.sh
@@ -21,6 +21,10 @@ CCHOST=$1
CCPORT=$2
J_OPTS=$3
+#Import cluster properties
+MYDIR="$(dirname -- $0)"
+. ${MYDIR}/../conf/cluster.properties
+
# Export JAVA_HOME
export JAVA_HOME=${JAVA_HOME}
@@ -31,8 +35,14 @@ then
export JAVA_OPTS
fi
+# java opts added parameters Server cluster.properties
+if [ ! -z "${CCJAVA_OPTS}" ]
+then
+ JAVA_OPTS="${JAVA_OPTS} ${CCJAVA_OPTS}"
+ export JAVA_OPTS
+fi
+
VXQUERY_HOME=`pwd`
-CCLOGS_DIR=${VXQUERY_HOME}/logs
# logs dir
mkdir -p ${CCLOGS_DIR}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-server/src/main/resources/scripts/stopnc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/stopnc.sh b/vxquery-server/src/main/resources/scripts/stopnc.sh
index 8f29de5..5d00c2f 100755
--- a/vxquery-server/src/main/resources/scripts/stopnc.sh
+++ b/vxquery-server/src/main/resources/scripts/stopnc.sh
@@ -21,6 +21,10 @@ hostname
USER=$1
+#Import cluster properties
+MYDIR="$(dirname -- $0)"
+. ${MYDIR}/../conf/cluster.properties
+
# Kill process
PID=`ps -ef|grep ${USER}|grep java|grep 'Dapp.name=vxquerync'|awk '{print $2}'`
[17/25] vxquery git commit: lowercase the 'xml' category
Posted by pr...@apache.org.
lowercase the 'xml' category
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/1f92648a
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/1f92648a
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/1f92648a
Branch: refs/heads/master
Commit: 1f92648a2f97ee2eef4e243a9e2d5522713534bd
Parents: 0f2a1d9
Author: Till Westmann <we...@gmail.com>
Authored: Thu Jan 22 22:54:35 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Feb 17 09:57:25 2015 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/25] vxquery git commit: Recent round of changes to improve
performance in the benchmarks.
Posted by pr...@apache.org.
Recent round of changes to improve performance in the benchmarks.
- Added more queries to help identify root causes of performance issues.
- Now allow join hash size to be larger than 2G. (int vs long)
- Cache dictionary for node trees.
- In child unnesting, the filter is now cached between calls.
- Created a string builder to help with parsing. (It now skips converting to a string.)
- Added CC and NC start up options in a new cluster.properties file.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/b665db73
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/b665db73
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/b665db73
Branch: refs/heads/master
Commit: b665db73434fa4d4f787258981e16c2e7e5a4fc4
Parents: 99ba4db
Author: Preston Carman <pr...@apache.org>
Authored: Thu Dec 18 09:58:23 2014 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Dec 18 09:58:23 2014 -0800
----------------------------------------------------------------------
.../other_systems/mrql/q07_count_1940.mrql | 30 ++
.../other_systems/mrql/q07_count_1960.mrql | 30 ++
.../other_systems/mrql/q07_count_1980.mrql | 30 ++
.../other_systems/mrql/q07_count_2000.mrql | 30 ++
.../other_systems/mrql/q07_count_join.mrql | 6 +-
.../other_systems/mrql/q07_count_left.mrql | 21 ++
.../other_systems/mrql/q07_count_tmax.mrql | 2 +-
.../other_systems/mrql/q07_count_tmin.mrql | 2 +-
.../other_systems/mrql/q07_data_tmax.mrql | 20 ++
.../other_systems/mrql/q07_data_tmin.mrql | 20 ++
.../other_systems/mrql/q07_filter_1940.mrql | 30 ++
.../other_systems/mrql/q07_filter_1960.mrql | 30 ++
.../other_systems/mrql/q07_filter_1980.mrql | 30 ++
.../other_systems/mrql/q07_filter_2000.mrql | 30 ++
.../mrql_scripts/run_group_test.sh | 4 +-
.../noaa-ghcn-daily/queries/q07_count_1940.xq | 35 +++
.../noaa-ghcn-daily/queries/q07_count_1960.xq | 35 +++
.../noaa-ghcn-daily/queries/q07_count_1980.xq | 35 +++
.../noaa-ghcn-daily/queries/q07_count_2000.xq | 35 +++
.../noaa-ghcn-daily/queries/q07_count_left.xq | 27 ++
.../noaa-ghcn-daily/queries/q07_data_tmax.xq | 26 ++
.../noaa-ghcn-daily/queries/q07_data_tmin.xq | 26 ++
.../noaa-ghcn-daily/queries/q07_filter_1940.xq | 35 +++
.../noaa-ghcn-daily/queries/q07_filter_1960.xq | 35 +++
.../noaa-ghcn-daily/queries/q07_filter_1980.xq | 35 +++
.../noaa-ghcn-daily/queries/q07_filter_2000.xq | 35 +++
.../noaa-ghcn-daily/scripts/run_benchmark.sh | 4 +-
.../scripts/run_benchmark_cluster.sh | 9 +-
.../scripts/testing_logging.properties | 10 +-
.../scripts/weather_benchmark.py | 13 +-
.../java/org/apache/vxquery/cli/VXQuery.java | 3 +-
.../builders/nodes/DictionaryBuilder.java | 21 +-
.../builders/nodes/UTF8StringBuilder.java | 53 ++++
.../functions/step/ChildPathStepUnnesting.java | 10 +-
.../runtime/functions/util/FunctionHelper.java | 6 +
.../vxquery/xmlparser/SAXContentHandler.java | 78 ++---
.../xmlquery/query/XMLQueryCompiler.java | 8 +-
vxquery-server/pom.xml | 305 ++++++++++---------
.../src/main/resources/conf/cluster.properties | 54 ++++
.../src/main/resources/scripts/startcc.sh | 21 +-
.../src/main/resources/scripts/startnc.sh | 19 +-
.../src/main/resources/scripts/stopcc.sh | 4 +
.../src/main/resources/scripts/stopcluster.sh | 12 +-
.../src/main/resources/scripts/stopnc.sh | 4 +
44 files changed, 1097 insertions(+), 211 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1940.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1940.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1940.mrql
new file mode 100644
index 0000000..268f211
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1940.mrql
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+count(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, args[0], {"data"}),
+ dtmax in rtmax.date,
+ rtmin in source(xml, args[2], {"data"}),
+ dtmin in rtmin.date
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and toInt(substring(text(dtmax), 0, 4)) > 1960
+ and text(rtmin.dataType) = "TMIN"
+ and toInt(substring(text(dtmin), 0, 4)) > 1960
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1960.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1960.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1960.mrql
new file mode 100644
index 0000000..268f211
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1960.mrql
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+count(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, args[0], {"data"}),
+ dtmax in rtmax.date,
+ rtmin in source(xml, args[2], {"data"}),
+ dtmin in rtmin.date
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and toInt(substring(text(dtmax), 0, 4)) > 1960
+ and text(rtmin.dataType) = "TMIN"
+ and toInt(substring(text(dtmin), 0, 4)) > 1960
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1980.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1980.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1980.mrql
new file mode 100644
index 0000000..2921cf6
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_1980.mrql
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+count(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, args[0], {"data"}),
+ dtmax in rtmax.date,
+ rtmin in source(xml, args[2], {"data"}),
+ dtmin in rtmin.date
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and toInt(substring(text(dtmax), 0, 4)) > 1980
+ and text(rtmin.dataType) = "TMIN"
+ and toInt(substring(text(dtmin), 0, 4)) > 1980
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_2000.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_2000.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_2000.mrql
new file mode 100644
index 0000000..8bfcb63
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_2000.mrql
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+count(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, args[0], {"data"}),
+ dtmax in rtmax.date,
+ rtmin in source(xml, args[2], {"data"}),
+ dtmin in rtmin.date
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and toInt(substring(text(dtmax), 0, 4)) > 2000
+ and text(rtmin.dataType) = "TMIN"
+ and toInt(substring(text(dtmin), 0, 4)) > 2000
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_join.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_join.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_join.mrql
index 8dec470..c48ae67 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_join.mrql
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_join.mrql
@@ -17,10 +17,10 @@
count(
select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
from rtmax in source(xml, args[0], {"data"}),
- rtmin in source(xml, args[0], {"data"})
+ rtmin in source(xml, args[2], {"data"})
where text(rtmax.date) = text(rtmin.date)
and text(rtmax.station) = text(rtmin.station)
- and text(r.dataType) = "TMAX"
- and text(r.dataType) = "TMIN"
+ and text(rtmax.dataType) = "TMAX"
+ and text(rtmin.dataType) = "TMIN"
)
;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_left.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_left.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_left.mrql
new file mode 100644
index 0000000..c4325f3
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_left.mrql
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+count(
+ select (rtmin)
+ from rtmin in source(xml, args[0], {"data"})
+)
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmax.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmax.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmax.mrql
index ca8ab4c..49cca89 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmax.mrql
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmax.mrql
@@ -17,6 +17,6 @@
count(
select (rtmax)
from rtmax in source(xml, args[0], {"data"})
- where text(r.dataType) = "TMAX"
+ where text(rtmax.dataType) = "TMAX"
)
;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmin.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmin.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmin.mrql
index fe17ebe..00ae56f 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmin.mrql
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_count_tmin.mrql
@@ -17,6 +17,6 @@
count(
select (rtmin)
from rtmin in source(xml, args[0], {"data"})
- where text(r.dataType) = "TMIN"
+ where text(rtmin.dataType) = "TMIN"
)
;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_data_tmax.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_data_tmax.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_data_tmax.mrql
new file mode 100644
index 0000000..374a0e3
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_data_tmax.mrql
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+ select (rtmax)
+ from rtmax in source(xml, args[0], {"data"})
+ where text(r.dataType) = "TMAX"
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_data_tmin.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_data_tmin.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_data_tmin.mrql
new file mode 100644
index 0000000..10e2fe9
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_data_tmin.mrql
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+ select (rtmin)
+ from rtmin in source(xml, args[0], {"data"})
+ where text(r.dataType) = "TMIN"
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1940.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1940.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1940.mrql
new file mode 100644
index 0000000..54699fc
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1940.mrql
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+avg(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, args[0], {"data"}),
+ dtmax in rtmax.date,
+ rtmin in source(xml, args[2], {"data"}),
+ dtmin in rtmin.date
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and toInt(substring(text(dtmax), 0, 4)) > 1960
+ and text(rtmin.dataType) = "TMIN"
+ and toInt(substring(text(dtmin), 0, 4)) > 1960
+) / 10
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1960.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1960.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1960.mrql
new file mode 100644
index 0000000..54699fc
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1960.mrql
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+avg(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, args[0], {"data"}),
+ dtmax in rtmax.date,
+ rtmin in source(xml, args[2], {"data"}),
+ dtmin in rtmin.date
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and toInt(substring(text(dtmax), 0, 4)) > 1960
+ and text(rtmin.dataType) = "TMIN"
+ and toInt(substring(text(dtmin), 0, 4)) > 1960
+) / 10
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1980.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1980.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1980.mrql
new file mode 100644
index 0000000..bff559b
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_1980.mrql
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+avg(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, args[0], {"data"}),
+ dtmax in rtmax.date,
+ rtmin in source(xml, args[2], {"data"}),
+ dtmin in rtmin.date
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and toInt(substring(text(dtmax), 0, 4)) > 1980
+ and text(rtmin.dataType) = "TMIN"
+ and toInt(substring(text(dtmin), 0, 4)) > 1980
+) / 10
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_2000.mrql
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_2000.mrql b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_2000.mrql
new file mode 100644
index 0000000..052a0c9
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql/q07_filter_2000.mrql
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+avg(
+ select (toInt(text(rtmax.value))-toInt(text(rtmin.value)))
+ from rtmax in source(xml, args[0], {"data"}),
+ dtmax in rtmax.date,
+ rtmin in source(xml, args[2], {"data"}),
+ dtmin in rtmin.date
+ where text(rtmax.date) = text(rtmin.date)
+ and text(rtmax.station) = text(rtmin.station)
+ and text(rtmax.dataType) = "TMAX"
+ and toInt(substring(text(dtmax), 0, 4)) > 2000
+ and text(rtmin.dataType) = "TMIN"
+ and toInt(substring(text(dtmin), 0, 4)) > 2000
+) / 10
+;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
index 134c05e..84028e5 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/mrql_scripts/run_group_test.sh
@@ -32,8 +32,8 @@ fi
DATASET=${1}
NODES=${2}
REPEAT=1
-#DATA_FILES=${NODES}
-DATA_FILES=8
+DATA_FILES=${NODES}
+#DATA_FILES=8
# Start Hadoop
sh saved/hadoop/hadoop-1.2.1/bin/start-all.sh
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1940.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1940.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1940.xq
new file mode 100644
index 0000000..c70b4d2
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1940.xq
@@ -0,0 +1,35 @@
+(: 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. :)
+
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max :)
+(: temperature and get the average. :)
+fn:count(
+ let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_min in collection($sensor_collection_min)/dataCollection/data
+
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+
+ where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_min/date))) gt 1940
+ and $r_max/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_max/date))) gt 1940
+ return $r_max/value - $r_min/value
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1960.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1960.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1960.xq
new file mode 100644
index 0000000..26b08f9
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1960.xq
@@ -0,0 +1,35 @@
+(: 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. :)
+
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max :)
+(: temperature and get the average. :)
+fn:count(
+ let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_min in collection($sensor_collection_min)/dataCollection/data
+
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+
+ where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_min/date))) gt 1960
+ and $r_max/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_max/date))) gt 1960
+ return $r_max/value - $r_min/value
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1980.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1980.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1980.xq
new file mode 100644
index 0000000..daa760b
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_1980.xq
@@ -0,0 +1,35 @@
+(: 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. :)
+
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max :)
+(: temperature and get the average. :)
+fn:count(
+ let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_min in collection($sensor_collection_min)/dataCollection/data
+
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+
+ where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_min/date))) gt 1980
+ and $r_max/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_max/date))) gt 1980
+ return $r_max/value - $r_min/value
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_2000.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_2000.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_2000.xq
new file mode 100644
index 0000000..b905807
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_2000.xq
@@ -0,0 +1,35 @@
+(: 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. :)
+
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max :)
+(: temperature and get the average. :)
+fn:count(
+ let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_min in collection($sensor_collection_min)/dataCollection/data
+
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+
+ where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_min/date))) gt 2000
+ and $r_max/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_max/date))) gt 2000
+ return $r_max/value - $r_min/value
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_left.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_left.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_left.xq
new file mode 100644
index 0000000..0639ff4
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_count_left.xq
@@ -0,0 +1,27 @@
+(: 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. :)
+
+(:
+XQuery Join Query
+-------------------
+Find the all the records for TMIN.
+:)
+fn:count(
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+ return $r_max
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_data_tmax.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_data_tmax.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_data_tmax.xq
new file mode 100644
index 0000000..e511918
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_data_tmax.xq
@@ -0,0 +1,26 @@
+(: 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. :)
+
+(:
+XQuery Join Query
+-------------------
+Find the all the records for TMAX.
+:)
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+ where $r_max/dataType eq "TMAX"
+ return $r_max
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_data_tmin.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_data_tmin.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_data_tmin.xq
new file mode 100644
index 0000000..579859f
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_data_tmin.xq
@@ -0,0 +1,26 @@
+(: 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. :)
+
+(:
+XQuery Join Query
+-------------------
+Find the all the records for TMIN.
+:)
+ let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_min in collection($sensor_collection_min)/dataCollection/data
+ where $r_min/dataType eq "TMIN"
+ return $r_min
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1940.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1940.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1940.xq
new file mode 100644
index 0000000..e122494
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1940.xq
@@ -0,0 +1,35 @@
+(: 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. :)
+
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max :)
+(: temperature and get the average. :)
+fn:avg(
+ let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_min in collection($sensor_collection_min)/dataCollection/data
+
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+
+ where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_min/date))) gt 1940
+ and $r_max/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_max/date))) gt 1940
+ return $r_max/value - $r_min/value
+) div 10
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1960.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1960.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1960.xq
new file mode 100644
index 0000000..7888560
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1960.xq
@@ -0,0 +1,35 @@
+(: 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. :)
+
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max :)
+(: temperature and get the average. :)
+fn:avg(
+ let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_min in collection($sensor_collection_min)/dataCollection/data
+
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+
+ where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_min/date))) gt 1960
+ and $r_max/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_max/date))) gt 1960
+ return $r_max/value - $r_min/value
+) div 10
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1980.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1980.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1980.xq
new file mode 100644
index 0000000..0b0cbd3
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_1980.xq
@@ -0,0 +1,35 @@
+(: 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. :)
+
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max :)
+(: temperature and get the average. :)
+fn:avg(
+ let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_min in collection($sensor_collection_min)/dataCollection/data
+
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+
+ where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_min/date))) gt 1980
+ and $r_max/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_max/date))) gt 1980
+ return $r_max/value - $r_min/value
+) div 10
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_2000.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_2000.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_2000.xq
new file mode 100644
index 0000000..b343bd0
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_filter_2000.xq
@@ -0,0 +1,35 @@
+(: 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. :)
+
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max :)
+(: temperature and get the average. :)
+fn:avg(
+ let $sensor_collection_min := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_min in collection($sensor_collection_min)/dataCollection/data
+
+ let $sensor_collection_max := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
+ for $r_max in collection($sensor_collection_max)/dataCollection/data
+
+ where $r_min/station eq $r_max/station
+ and $r_min/date eq $r_max/date
+ and $r_min/dataType eq "TMIN"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_min/date))) gt 2000
+ and $r_max/dataType eq "TMAX"
+ and fn:year-from-dateTime(xs:dateTime(fn:data($r_max/date))) gt 2000
+ return $r_max/value - $r_min/value
+) div 10
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
index 8bc6772..c4d8922 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
@@ -29,7 +29,7 @@ REPEAT=5
IGNORE=2
FRAME_SIZE=$((8*1024))
BUFFER_SIZE=$((32*1024*1024))
-JOIN_HASH_SIZE=$(( 4 * (64*1024*1024) ))
+JOIN_HASH_SIZE=$(( 6 * (1024*1024*1024) / 8 ))
if [ -z "${1}" ]
then
@@ -37,7 +37,7 @@ then
exit
fi
-export JAVA_OPTS="$JAVA_OPTS -server -Xmx8G -XX:+HeapDumpOnOutOfMemoryError -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties"
+export JAVA_OPTS="$JAVA_OPTS -server -Xmx7G -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
for j in $(find ${1} -name '*q??.xq')
do
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
index c90a7a9..7a0c7a9 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
@@ -25,11 +25,12 @@
# run_benchmark.sh ./noaa-ghcn-daily/benchmarks/local_speed_up/queries/ "-client-net-ip-address 169.235.27.138"
# run_benchmark.sh ./noaa-ghcn-daily/benchmarks/local_speed_up/queries/ "" q03
#
-CLUSTER="uci"
-REPEAT=5
+CLUSTER="rita"
+REPEAT=1
FRAME_SIZE=$((8*1024))
BUFFER_SIZE=$((32*1024*1024))
-JOIN_HASH_SIZE=$((4*4*64*1024*1024))
+JOIN_HASH_SIZE=$((1024*1024*1024))
+#JOIN_HASH_SIZE=-1
if [ -z "${1}" ]
then
@@ -50,7 +51,7 @@ python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-serve
# wait for cluster to finish setting up
sleep 5
-export JAVA_OPTS="$JAVA_OPTS -server -Xmx8G -XX:+HeapDumpOnOutOfMemoryError -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties"
+export JAVA_OPTS="$JAVA_OPTS -server -Xmx7G -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties"
for j in $(find ${1} -name '*q??.xq')
do
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
index ff877dd..672e456 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/testing_logging.properties
@@ -43,9 +43,9 @@ handlers= java.util.logging.ConsoleHandler
# Note that the ConsoleHandler also has a separate level
# setting to limit messages printed to the console.
-#.level= WARNING
-# .level= INFO
-.level= FINE
+# .level= WARNING
+ .level= INFO
+# .level= FINE
# .level = FINEST
############################################################
@@ -75,5 +75,5 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
# messages:
# edu.uci.ics.asterix.level = FINE
-edu.uci.ics.algebricks.level = FINE
-# edu.uci.ics.hyracks.level = FINE
+# edu.uci.ics.hyracks.algebricks.level = FINE
+edu.uci.ics.hyracks.level = FINE
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
index 746fef4..fbd7b04 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
@@ -59,9 +59,20 @@ class WeatherBenchmark:
"q06_count_join.xq",
"q06_count_sensor.xq",
"q06_count_station.xq",
+ "q07_count_1940.xq",
+ "q07_count_1960.xq",
+ "q07_count_1980.xq",
+ "q07_count_2000.xq",
"q07_count_join.xq",
+ "q07_count_left.xq",
"q07_count_tmin.xq",
"q07_count_tmax.xq",
+ "q07_data_tmin.xq",
+ "q07_data_tmax.xq",
+ "q07_filter_1940.xq",
+ "q07_filter_1960.xq",
+ "q07_filter_1980.xq",
+ "q07_filter_2000.xq",
]
BENCHMARK_LOCAL_TESTS = ["local_speed_up", "local_batch_scale_out"]
BENCHMARK_CLUSTER_TESTS = ["speed_up", "batch_scale_out"]
@@ -364,7 +375,7 @@ def get_cluster_query_path(base_paths, test, partition, nodes):
def get_cluster_virtual_disk_partitions(nodes, partitions):
vp = get_local_virtual_disk_partitions(partitions)
- vn = calculate_partitions(range(1, len(nodes)+1, 1))
+ vn = calculate_partitions(range(1, len(nodes) + 1, 1))
return vp * vn
def get_local_virtual_disk_partitions(partitions):
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 53d9ec2..1e083df 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -389,6 +389,7 @@ public class VXQuery {
ncConfig.dataIPAddress = "127.0.0.1";
ncConfig.datasetIPAddress = "127.0.0.1";
ncConfig.nodeId = "nc" + (i + 1);
+ ncConfig.ioDevices = "/tmp";
ncs[i] = new NodeControllerService(ncConfig);
ncs[i].start();
}
@@ -450,7 +451,7 @@ public class VXQuery {
private int frameSize = 65536;
@Option(name = "-join-hash-size", usage = "Join hash size in bytes. (default 67,108,864)")
- private int joinHashSize = -1;
+ private long joinHashSize = -1;
@Option(name = "-buffer-size", usage = "Disk read buffer size in bytes.")
private int bufferSize = -1;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
index db7ecf7..bee221d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
@@ -40,10 +40,12 @@ public class DictionaryBuilder {
private final DataOutput dataBufferOut;
- private final ByteArrayAccessibleOutputStream tempStringData;
+ private final ArrayBackedValueStorage cache;
private final TreeMap<String, Integer> hashSlotIndexes;
+ private boolean cacheReady;
+
private final IValueReferenceVector sortedStringsVector = new IValueReferenceVector() {
@Override
public int getStart(int index) {
@@ -74,16 +76,27 @@ public class DictionaryBuilder {
sortedSlotIndexes = new GrowableIntArray();
dataBuffer = new ByteArrayAccessibleOutputStream();
dataBufferOut = new DataOutputStream(dataBuffer);
- tempStringData = new ByteArrayAccessibleOutputStream();
+ cache = new ArrayBackedValueStorage();
hashSlotIndexes = new TreeMap<String, Integer>();
+ cacheReady = false;
}
public void reset() {
stringEndOffsets.clear();
sortedSlotIndexes.clear();
dataBuffer.reset();
- tempStringData.reset();
hashSlotIndexes.clear();
+ cacheReady = false;
+ }
+
+ public void writeFromCache(ArrayBackedValueStorage abvs) throws IOException {
+ if (!cacheReady) {
+ cache.reset();
+ write(cache);
+ cacheReady = true;
+ }
+ DataOutput out = abvs.getDataOutput();
+ out.write(cache.getByteArray(), cache.getStartOffset(), cache.getLength());
}
public void write(ArrayBackedValueStorage abvs) throws IOException {
@@ -122,6 +135,7 @@ public class DictionaryBuilder {
}
stringEndOffsets.append(dataBuffer.size());
hashSlotIndexes.put(str, slotIndex);
+ cacheReady = false;
}
return slotIndex;
}
@@ -141,6 +155,7 @@ public class DictionaryBuilder {
}
stringEndOffsets.append(dataBuffer.size());
sortedSlotIndexes.insert(index, slotIndex);
+ cacheReady = false;
return slotIndex;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
new file mode 100644
index 0000000..3b4eea0
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/UTF8StringBuilder.java
@@ -0,0 +1,53 @@
+/*
+ * 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.vxquery.datamodel.builders.nodes;
+
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.UTFDataFormatException;
+
+import org.apache.vxquery.runtime.functions.util.FunctionHelper;
+
+import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
+
+public class UTF8StringBuilder extends AbstractNodeBuilder {
+ private IMutableValueStorage mvs;
+ private DataOutput out;
+
+ @Override
+ public void reset(IMutableValueStorage mvs) throws IOException {
+ this.mvs = mvs;
+ out = mvs.getDataOutput();
+ out.write(0);
+ out.write(0);
+ }
+
+ @Override
+ public void finish() throws IOException {
+ int utflen = mvs.getLength() - 2;
+ BytePointable.setByte(mvs.getByteArray(), 0, (byte) ((utflen >>> 8) & 0xFF));
+ BytePointable.setByte(mvs.getByteArray(), 1, (byte) ((utflen >>> 0) & 0xFF));
+ }
+
+ public void appendCharArray(char[] ch, int start, int length) throws IOException {
+ FunctionHelper.writeCharArray(ch, start, length, out);
+ if (mvs.getLength() > 65535) {
+ throw new UTFDataFormatException("encoded string too long: " + mvs.getLength() + " bytes");
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
index ea65066..dbae9de 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/ChildPathStepUnnesting.java
@@ -43,6 +43,7 @@ public class ChildPathStepUnnesting extends AbstractForwardAxisPathStep {
private final TaggedValuePointable tvpNtp = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
private final TaggedValuePointable tvpStep = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
INodeFilter filter;
+ int filterLookupID = -1;
public ChildPathStepUnnesting(IHyracksTaskContext ctx, PointablePool pp) {
super(ctx, pp);
@@ -56,9 +57,12 @@ public class ChildPathStepUnnesting extends AbstractForwardAxisPathStep {
throw new IllegalArgumentException("Expected int value tag, got: " + args[1].getTag());
}
args[1].getValue(ip);
- SequenceType sType = dCtx.getStaticContext().lookupSequenceType(ip.getInteger());
- filter = NodeTestFilter.getNodeTestFilter(sType);
-
+ if (ip.getInteger() != filterLookupID) {
+ filterLookupID = ip.getInteger();
+ SequenceType sType = dCtx.getStaticContext().lookupSequenceType(ip.getInteger());
+ filter = NodeTestFilter.getNodeTestFilter(sType);
+ }
+
if (args[0].getTag() == ValueTag.SEQUENCE_TAG) {
args[0].getValue(seqNtp);
seqArgsLength = seqNtp.getEntryCount();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
index 3b60e4e..3a20a86 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
@@ -1260,6 +1260,12 @@ public class FunctionHelper {
}
}
+ public static void writeCharArray(char[] ch, int start, int length, DataOutput dOut) {
+ for (int i = start; i < start + length; ++i) {
+ writeChar(ch[i], dOut);
+ }
+ }
+
public static void writeDateAsString(IDate date, DataOutput dOut) {
// Year
writeNumberWithPadding(date.getYear(), 4, dOut);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
index 37ce001..e40147e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
@@ -30,6 +30,7 @@ import org.apache.vxquery.datamodel.builders.nodes.DocumentNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.ElementNodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.PINodeBuilder;
import org.apache.vxquery.datamodel.builders.nodes.TextNodeBuilder;
+import org.apache.vxquery.datamodel.builders.nodes.UTF8StringBuilder;
import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.types.BuiltinTypeQNames;
import org.apache.vxquery.types.ElementType;
@@ -59,6 +60,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
private final DocumentNodeBuilder docb;
private final PINodeBuilder pinb;
private final TextNodeBuilder tnb;
+ private final UTF8StringBuilder utf8b;
private final List<ElementNodeBuilder> enbStack;
private final List<ElementNodeBuilder> freeENBList;
@@ -78,16 +80,14 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
// Basic tracking and setting variables
private final boolean attachTypes;
- private final StringBuilder buffer;
private final boolean createNodeIds;
private int depth;
- private final ArrayBackedValueStorage docABVS;
- private final ArrayBackedValueStorage elementABVS;
+ private final ArrayBackedValueStorage resultABVS;
private boolean pendingText;
private int nodeIdCounter;
private final ITreeNodeIdProvider nodeIdProvider;
- private final ArrayBackedValueStorage resultABVS;
private final ArrayBackedValueStorage tempABVS;
+ private final ArrayBackedValueStorage textABVS;
public SAXContentHandler(boolean attachTypes, ITreeNodeIdProvider nodeIdProvider) {
// XML node builders
@@ -97,25 +97,24 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
docb = new DocumentNodeBuilder();
pinb = new PINodeBuilder();
tnb = new TextNodeBuilder();
+ utf8b = new UTF8StringBuilder();
enbStack = new ArrayList<ElementNodeBuilder>();
freeENBList = new ArrayList<ElementNodeBuilder>();
-
+
// Element writing and path step variables
skipping = true;
tvp = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable();
-
+
// Basic tracking and setting variables
this.attachTypes = attachTypes;
- buffer = new StringBuilder();
createNodeIds = nodeIdProvider != null;
depth = 0;
- docABVS = new ArrayBackedValueStorage();
- elementABVS = new ArrayBackedValueStorage();
+ resultABVS = new ArrayBackedValueStorage();
pendingText = false;
nodeIdCounter = 0;
this.nodeIdProvider = nodeIdProvider;
- resultABVS = new ArrayBackedValueStorage();
tempABVS = new ArrayBackedValueStorage();
+ textABVS = new ArrayBackedValueStorage();
}
public SAXContentHandler(boolean attachTypes, ITreeNodeIdProvider nodeIdProvider, ByteBuffer frame,
@@ -141,7 +140,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
ElementType eType = (ElementType) nodeType;
NameTest nameTest = eType.getNameTest();
childUri[index] = getStringFromBytes(nameTest.getUri());
- childLocalName[index] = getStringFromBytes(nameTest.getLocalName());;
+ childLocalName[index] = getStringFromBytes(nameTest.getLocalName());
++index;
}
}
@@ -157,7 +156,12 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
if (skipping) {
return;
}
- buffer.append(ch, start, length);
+ try {
+ utf8b.appendCharArray(ch, start, length);
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new SAXException(e);
+ }
pendingText = true;
}
@@ -255,12 +259,18 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
skipping = false;
}
db.reset();
- docABVS.reset();
+ try {
+ textABVS.reset();
+ utf8b.reset(textABVS);
+ } catch (IOException e) {
+ throw new SAXException(e);
+ }
if (skipping) {
return;
}
try {
- docb.reset(docABVS);
+ resultABVS.reset();
+ docb.reset(resultABVS);
if (createNodeIds) {
docb.setLocalNodeId(nodeIdCounter++);
}
@@ -363,15 +373,15 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
try {
flushText();
startChildInParent(cnb);
- buffer.append(ch, start, length);
- tempABVS.reset();
- tempABVS.getDataOutput().writeUTF(buffer.toString());
if (createNodeIds) {
cnb.setLocalNodeId(nodeIdCounter++);
}
- cnb.setValue(tempABVS);
+ utf8b.appendCharArray(ch, start, length);
+ utf8b.finish();
+ cnb.setValue(textABVS);
endChildInParent(cnb);
- buffer.delete(0, buffer.length());
+ textABVS.reset();
+ utf8b.reset(textABVS);
} catch (IOException e) {
e.printStackTrace();
throw new SAXException(e);
@@ -381,14 +391,14 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
private void flushText() throws IOException {
if (pendingText) {
peekENBStackTop().startChild(tnb);
- tempABVS.reset();
- tempABVS.getDataOutput().writeUTF(buffer.toString());
if (createNodeIds) {
tnb.setLocalNodeId(nodeIdCounter++);
}
- tnb.setValue(tempABVS);
+ utf8b.finish();
+ tnb.setValue(textABVS);
peekENBStackTop().endChild(tnb);
- buffer.delete(0, buffer.length());
+ textABVS.reset();
+ utf8b.reset(textABVS);
pendingText = false;
}
}
@@ -418,8 +428,8 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
}
public void writeElement() throws IOException {
- resultABVS.reset();
- DataOutput out = resultABVS.getDataOutput();
+ tempABVS.reset();
+ DataOutput out = tempABVS.getDataOutput();
out.write(ValueTag.NODE_TREE_TAG);
byte header = NodeTreePointable.HEADER_DICTIONARY_EXISTS_MASK;
if (attachTypes) {
@@ -432,13 +442,9 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
if (createNodeIds) {
out.writeInt(nodeIdProvider.getId());
}
- db.write(resultABVS);
- if (subElement == null) {
- out.write(docABVS.getByteArray(), docABVS.getStartOffset(), docABVS.getLength());
- } else {
- out.write(elementABVS.getByteArray(), elementABVS.getStartOffset(), elementABVS.getLength());
- }
- tvp.set(resultABVS.getByteArray(), resultABVS.getStartOffset(), resultABVS.getLength());
+ db.writeFromCache(tempABVS);
+ out.write(resultABVS.getByteArray(), resultABVS.getStartOffset(), resultABVS.getLength());
+ tvp.set(tempABVS.getByteArray(), tempABVS.getStartOffset(), tempABVS.getLength());
addNodeToTuple(tvp, tupleIndex);
skipping = true;
}
@@ -457,8 +463,8 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
if (createNodeIds) {
out.writeInt(nodeIdProvider.getId());
}
- db.write(abvs);
- out.write(docABVS.getByteArray(), docABVS.getStartOffset(), docABVS.getLength());
+ db.writeFromCache(abvs);
+ out.write(resultABVS.getByteArray(), resultABVS.getStartOffset(), resultABVS.getLength());
}
private ElementNodeBuilder createENB() {
@@ -482,8 +488,8 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
private void startChildInParent(AbstractNodeBuilder anb, boolean startNewElement) throws IOException {
if (startNewElement) {
- elementABVS.reset();
- anb.reset(elementABVS);
+ resultABVS.reset();
+ anb.reset(resultABVS);
} else if (enbStack.isEmpty()) {
docb.startChild(anb);
} else {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index 44f2179..0e18328 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -94,7 +94,7 @@ public class XMLQueryCompiler {
}
public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize,
- int availableProcessors, int joinHashSize) {
+ int availableProcessors, long joinHashSize) {
this.listener = listener == null ? NoopXQueryCompilationListener.INSTANCE : listener;
this.frameSize = frameSize;
this.nodeList = nodeList;
@@ -113,8 +113,12 @@ public class XMLQueryCompiler {
});
builder.getPhysicalOptimizationConfig().setFrameSize(this.frameSize);
if (joinHashSize > 0) {
- builder.getPhysicalOptimizationConfig().setMaxFramesHybridHash(joinHashSize/this.frameSize);
+ builder.getPhysicalOptimizationConfig().setMaxFramesHybridHash((int) (joinHashSize / this.frameSize));
}
+
+ builder.getPhysicalOptimizationConfig().setMaxFramesLeftInputHybridHash(
+ (int) (60L * 1024 * 1048576 / this.frameSize));
+
builder.setLogicalRewrites(buildDefaultLogicalRewrites());
builder.setPhysicalRewrites(buildDefaultPhysicalRewrites());
builder.setSerializerDeserializerProvider(new ISerializerDeserializerProvider() {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/b665db73/vxquery-server/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index 6c99712..dfd3ab9 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -14,153 +14,172 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </parent>
- <artifactId>apache-vxquery-server</artifactId>
- <packaging>jar</packaging>
- <name>VXQuery Server</name>
- <description>Apache VXQuery Server</description>
+ <artifactId>apache-vxquery-server</artifactId>
+ <packaging>jar</packaging>
+ <name>VXQuery Server</name>
+ <description>Apache VXQuery Server</description>
- <distributionManagement>
- <site>
- <id>vxquery.website</id>
- <name>VXQuery Website</name>
- <url>file:../site/vxquery-server/</url>
- </site>
- </distributionManagement>
+ <distributionManagement>
+ <site>
+ <id>vxquery.website</id>
+ <name>VXQuery Website</name>
+ <url>file:../site/vxquery-server/</url>
+ </site>
+ </distributionManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <configuration>
- <programs>
- <program>
- <mainClass>org.apache.vxquery.cli.VXQueryClusterShutdown</mainClass>
- <name>vxqueryshutdown</name>
- </program>
- <program>
- <mainClass>edu.uci.ics.hyracks.control.cc.CCDriver</mainClass>
- <name>vxquerycc</name>
- </program>
- <program>
- <mainClass>edu.uci.ics.hyracks.control.nc.NCDriver</mainClass>
- <name>vxquerync</name>
- </program>
- </programs>
- <repositoryLayout>flat</repositoryLayout>
- <repositoryName>lib</repositoryName>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <executions>
- <execution>
- <id>copy-scripts</id>
- <!-- here the phase you need -->
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/appassembler/bin</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources/scripts</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-site</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-core</artifactId>
- <version>0.5-SNAPSHOT</version>
- </dependency>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <configuration>
+ <programs>
+ <program>
+ <mainClass>org.apache.vxquery.cli.VXQueryClusterShutdown</mainClass>
+ <name>vxqueryshutdown</name>
+ </program>
+ <program>
+ <mainClass>edu.uci.ics.hyracks.control.cc.CCDriver</mainClass>
+ <name>vxquerycc</name>
+ </program>
+ <program>
+ <mainClass>edu.uci.ics.hyracks.control.nc.NCDriver</mainClass>
+ <name>vxquerync</name>
+ </program>
+ </programs>
+ <repositoryLayout>flat</repositoryLayout>
+ <repositoryName>lib</repositoryName>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-scripts</id>
+ <!-- here the phase you need -->
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/appassembler/bin</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources/scripts</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-conf</id>
+ <!-- here the phase you need -->
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/appassembler/conf</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources/conf</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-cc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-control-nc</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery-core</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </dependency>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>dependencies</report>
- <report>plugins</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <linkOnly>true</linkOnly>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-cc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-nc</artifactId>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>dependencies</report>
+ <report>plugins</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <linkOnly>true</linkOnly>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
[25/25] vxquery git commit: Merge branch 'prestonc/november_update'
Posted by pr...@apache.org.
Merge branch 'prestonc/november_update'
* prestonc/november_update:
Updated pom and instructions based on code review.
Updated XQTS results and included fix for Algebricks upgrade.
Added rat exclusion for folder manually created for XQTS.
Updated the site to fix a few formatting issues.
Updated the error checking to search nested exceptions.
Updated the XML styling of the pom files.
lowercase the 'xml' category
fix typos
Updated website and xtest now can run all previously passing tests.
Feedback from review and maven now runs the previous passing XQTS with maven test. (Saving work)
Recent round of changes to improve performance in the benchmarks.
Updated the XML styling of the pom files.
lowercase the 'xml' category
fix typos
Added two new test cases for numeric functions. Also includes a few bug fixes and clean up items.
Switched arithmetic from a static call to an object created at the beginning of processing.
Log output settings have been refined for testing.
Recent round of changes to improve performance in the benchmarks.
Consolidated changes for November.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/9abe3e9f
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/9abe3e9f
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/9abe3e9f
Branch: refs/heads/master
Commit: 9abe3e9f098756e2092e24f940d15a3eaab91787
Parents: da09ce8 cc57e1f
Author: Preston Carman <pr...@apache.org>
Authored: Mon Feb 23 10:23:10 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Mon Feb 23 10:23:10 2015 -0800
----------------------------------------------------------------------
.gitignore | 1 +
README | 25 +
docs/README | 67 -
pom.xml | 3 +-
src/site/apt/development_benchmarks.apt | 24 +
src/site/apt/development_data_handling.apt | 162 +
src/site/apt/development_tips.apt | 162 -
.../apt/development_update_xqts_results.apt | 55 +
src/site/apt/user_query.apt | 15 +-
src/site/apt/user_running_tests.apt | 59 +-
src/site/site.xml | 127 +-
.../noaa-ghcn-daily/other_systems/mrql/q07.mrql | 2 +-
.../other_systems/mrql/q07_count_1940.mrql | 30 +
.../other_systems/mrql/q07_count_1960.mrql | 30 +
.../other_systems/mrql/q07_count_1980.mrql | 30 +
.../other_systems/mrql/q07_count_2000.mrql | 30 +
.../other_systems/mrql/q07_count_join.mrql | 6 +-
.../other_systems/mrql/q07_count_left.mrql | 21 +
.../other_systems/mrql/q07_count_tmax.mrql | 2 +-
.../other_systems/mrql/q07_count_tmin.mrql | 2 +-
.../other_systems/mrql/q07_data_tmax.mrql | 20 +
.../other_systems/mrql/q07_data_tmin.mrql | 20 +
.../other_systems/mrql/q07_filter_1940.mrql | 30 +
.../other_systems/mrql/q07_filter_1960.mrql | 30 +
.../other_systems/mrql/q07_filter_1980.mrql | 30 +
.../other_systems/mrql/q07_filter_2000.mrql | 30 +
.../mrql_scripts/load_node_file.sh | 2 +
.../mrql_scripts/run_group_test.sh | 14 +-
.../mrql_scripts/run_mrql_tests.sh | 7 +-
.../mrql_scripts/yarn_and_flink/README.md | 23 +
.../yarn_and_flink/clear_hadoop2.sh | 22 +
.../yarn_and_flink/load_node_file.sh | 47 +
.../yarn_and_flink/run_group_test.sh | 86 +
.../yarn_and_flink/run_mrql_tests.sh | 49 +
.../noaa-ghcn-daily/queries/q07_count_1940.xq | 35 +
.../noaa-ghcn-daily/queries/q07_count_1960.xq | 35 +
.../noaa-ghcn-daily/queries/q07_count_1980.xq | 35 +
.../noaa-ghcn-daily/queries/q07_count_2000.xq | 35 +
.../noaa-ghcn-daily/queries/q07_count_left.xq | 27 +
.../noaa-ghcn-daily/queries/q07_data_tmax.xq | 26 +
.../noaa-ghcn-daily/queries/q07_data_tmin.xq | 26 +
.../noaa-ghcn-daily/queries/q07_filter_1940.xq | 35 +
.../noaa-ghcn-daily/queries/q07_filter_1960.xq | 35 +
.../noaa-ghcn-daily/queries/q07_filter_1980.xq | 35 +
.../noaa-ghcn-daily/queries/q07_filter_2000.xq | 35 +
.../scripts/benchmark_logging.properties | 43 +-
.../noaa-ghcn-daily/scripts/run_benchmark.sh | 4 +-
.../scripts/run_benchmark_cluster.sh | 14 +-
.../scripts/testing_logging.properties | 79 +
.../scripts/weather_benchmark.py | 37 +-
.../java/org/apache/vxquery/cli/VXQuery.java | 18 +-
.../compiler/rewriter/RewriteRuleset.java | 15 +-
.../rewriter/rules/ConsolidateUnnestsRule.java | 10 +-
...tAssignSortDistinctNodesToOperatorsRule.java | 1 -
.../PushMapOperatorDownThroughProductRule.java | 142 -
.../accessors/atomic/XSDecimalPointable.java | 6 +-
.../builders/atomic/UTF8StringBuilder.java | 54 +
.../builders/base/AbstractBuilder.java | 27 +
.../builders/nodes/DictionaryBuilder.java | 21 +-
.../vxquery/functions/builtin-operators.xml | 1 +
.../metadata/VXQueryCollectionDataSource.java | 4 +
.../metadata/VXQueryMetadataProvider.java | 53 +-
...AbstractMaxMinAggregateEvaluatorFactory.java | 6 +-
.../AbstractMaxMinScalarEvaluatorFactory.java | 5 +-
.../AvgGlobalAggregateEvaluatorFactory.java | 18 +-
.../AvgLocalAggregateEvaluatorFactory.java | 10 +-
.../FnAvgAggregateEvaluatorFactory.java | 13 +-
.../aggregate/FnAvgScalarEvaluatorFactory.java | 13 +-
.../FnSumAggregateEvaluatorFactory.java | 10 +-
.../aggregate/FnSumScalarEvaluatorFactory.java | 10 +-
...bstractArithmeticScalarEvaluatorFactory.java | 13 +-
.../functions/numeric/FnCeilingOperation.java | 4 +-
.../functions/numeric/FnFloorOperation.java | 4 +-
.../functions/numeric/FnRoundOperation.java | 4 +-
.../functions/step/AbstractChildPathStep.java | 74 -
...stractDescendantPathStepScalarEvaluator.java | 5 +-
.../step/AbstractForwardAxisPathStep.java | 74 +
.../step/ChildPathStepOperatorDescriptor.java | 38 +-
.../functions/step/ChildPathStepUnnesting.java | 13 +-
...DescendantOrSelfPathStepScalarEvaluator.java | 11 +-
.../step/DescendantOrSelfPathStepUnnesting.java | 167 +
...cendantOrSelfPathStepUnnestingEvaluator.java | 44 +
...OrSelfPathStepUnnestingEvaluatorFactory.java | 40 +
.../step/DescendantPathStepScalarEvaluator.java | 4 -
.../DescendantPathStepUnnestingEvaluator.java | 44 +
...endantPathStepUnnestingEvaluatorFactory.java | 39 +
.../strings/UTF8StringCharacterIterator.java | 4 +-
.../functions/util/ArithmeticHelper.java | 511 ++
.../runtime/functions/util/FunctionHelper.java | 6 +
.../vxquery/xmlparser/SAXContentHandler.java | 78 +-
.../xmlquery/query/XMLQueryCompiler.java | 26 +-
vxquery-server/pom.xml | 16 +-
.../src/main/resources/conf/cluster.properties | 54 +
.../src/main/resources/scripts/startcc.sh | 25 +-
.../src/main/resources/scripts/startnc.sh | 23 +-
.../src/main/resources/scripts/stopcc.sh | 4 +
.../src/main/resources/scripts/stopcluster.sh | 12 +-
.../src/main/resources/scripts/stopnc.sh | 4 +
vxquery-xtest/pom.xml | 8 +
vxquery-xtest/results/README.md | 5 +-
vxquery-xtest/results/xqts.txt | 6460 +++++++++---------
.../vxquery/xtest/AbstractTestCaseFactory.java | 51 +-
.../vxquery/xtest/HTMLFileReporterImpl.java | 1 -
.../vxquery/xtest/ServletReporterImpl.java | 2 +-
.../apache/vxquery/xtest/TestCaseFactory.java | 6 +-
.../org/apache/vxquery/xtest/TestRunner.java | 19 +-
.../org/apache/vxquery/xtest/XTestOptions.java | 3 +
.../vxquery/xtest/JUnitTestCaseFactory.java | 7 +-
.../org/apache/vxquery/xtest/VXQueryTest.java | 47 +-
.../ExpectedTestResults/Numerics/fn_abs.txt | 8 +
.../ExpectedTestResults/Numerics/fn_ceiling.txt | 8 +
.../resources/Queries/XQuery/Numerics/fn_abs.xq | 22 +
.../Queries/XQuery/Numerics/fn_ceiling.xq | 22 +
.../src/test/resources/VXQueryCatalog.xml | 15 +
.../FunctionsAndOperatorsOnNumericsQueries.xml | 33 +
115 files changed, 6286 insertions(+), 4008 deletions(-)
----------------------------------------------------------------------
[15/25] vxquery git commit: Updated website and xtest now can run all
previously passing tests.
Posted by pr...@apache.org.
Updated website and xtest now can run all previously passing tests.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/00c245fd
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/00c245fd
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/00c245fd
Branch: refs/heads/master
Commit: 00c245fd1b4b0d9d1e011514995fee51a291265a
Parents: fccce23
Author: Preston Carman <pr...@apache.org>
Authored: Tue Feb 17 09:40:52 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Feb 17 09:40:52 2015 -0800
----------------------------------------------------------------------
pom.xml | 1 -
src/site/apt/development_data_handling.apt | 162 +++++++++++++++++++
src/site/apt/development_tips.apt | 162 -------------------
.../apt/development_update_xqts_results.apt | 7 +-
src/site/apt/user_query.apt | 11 +-
src/site/apt/user_running_tests.apt | 58 +++++--
src/site/site.xml | 8 +-
.../java/org/apache/vxquery/cli/VXQuery.java | 2 +-
.../xmlquery/query/XMLQueryCompiler.java | 10 ++
vxquery-xtest/pom.xml | 7 +
.../org/apache/vxquery/xtest/TestRunner.java | 2 +-
.../org/apache/vxquery/xtest/VXQueryTest.java | 4 +-
12 files changed, 248 insertions(+), 186 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b57411c..a0e9341 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,6 @@
<organization />
<timezone />
</developer>
-
<developer>
<id>cezar</id>
<name>Cezar Andrei</name>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/src/site/apt/development_data_handling.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_data_handling.apt b/src/site/apt/development_data_handling.apt
new file mode 100644
index 0000000..a161608
--- /dev/null
+++ b/src/site/apt/development_data_handling.apt
@@ -0,0 +1,162 @@
+~~ 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.
+
+Developer Data Handling
+
+
+* Hyracks Data Mapping
+
+ {{{http://hyracks.org}Hyracks}} supports several basic data types stored in
+ byte arrays. The byte arrays can be accessed through objects referred to as
+ pointables. The pointable helps with tracking the bytes stored in a larger
+ storage array. Some pointables support converting the byte array into a
+ desired format such as for numeric type. The most basic pointable has three
+ values stored in the object.
+
+ * byte array
+
+ * starting offset
+
+ * length
+
+ []
+
+ In Apache VXQuery\x99 the TaggedValuePointable is used to read a result from this byte
+ array. The first byte defines the data type and alerts us to what pointable
+ to use for reading the rest of the data.
+
+** Fixed Length Data
+
+ Fixed length data types can be stored in a set field size. The following
+ outlines the Hyracks data type or custom VXQuery definition with the
+ details about the implementation.
+
+*-------------------------+----------------------+---------------+
+| <<Data Type>> | <<Pointable Name>> | <<Data Size>> |
+*-------------------------+----------------------+---------------:
+| xs:boolean | BooleanPointable | 1 |
+*-------------------------+----------------------+---------------:
+| xs:byte | BytePointable | 1 |
+*-------------------------+----------------------+---------------:
+| xs:date | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
+*-------------------------+----------------------+---------------:
+| xs:dateTime | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java}XSDateTimePointable}} | 12 |
+*-------------------------+----------------------+---------------:
+| xs:dayTimeDuration | LongPointable | 8 |
+*-------------------------+----------------------+---------------:
+| xs:decimal | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java}XSDecimalPointable}} | 9 |
+*-------------------------+----------------------+---------------:
+| xs:double | DoublePointable | 8 |
+*-------------------------+----------------------+---------------:
+| xs:duration | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java}XSDurationPointable}} | 12 |
+*-------------------------+----------------------+---------------:
+| xs:float | FloatPointable | 4 |
+*-------------------------+----------------------+---------------:
+| xs:gDay | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
+*-------------------------+----------------------+---------------:
+| xs:gMonth | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
+*-------------------------+----------------------+---------------:
+| xs:gMonthDay | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
+*-------------------------+----------------------+---------------:
+| xs:gYear | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
+*-------------------------+----------------------+---------------:
+| xs:gYearMonth | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
+*-------------------------+----------------------+---------------:
+| xs:int | IntegerPointable | 4 |
+*-------------------------+----------------------+---------------:
+| xs:integer | LongPointable | 8 |
+*-------------------------+----------------------+---------------:
+| xs:negativeInteger | LongPointable | 8 |
+*-------------------------+----------------------+---------------:
+| xs:nonNegativeInteger | LongPointable | 8 |
+*-------------------------+----------------------+---------------:
+| xs:nonPositiveInteger | LongPointable | 8 |
+*-------------------------+----------------------+---------------:
+| xs:positiveInteger | LongPointable | 8 |
+*-------------------------+----------------------+---------------:
+| xs:short | ShortPointable | 2 |
+*-------------------------+----------------------+---------------:
+| xs:time | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java}XSTimePointable}} | 8 |
+*-------------------------+----------------------+---------------:
+| xs:unsignedByte | ShortPointable | 2 |
+*-------------------------+----------------------+---------------:
+| xs:unsignedInt | LongPointable | 8 |
+*-------------------------+----------------------+---------------:
+| xs:unsignedLong | LongPointable | 8 |
+*-------------------------+----------------------+---------------:
+| xs:unsignedShort | IntegerPointable | 4 |
+*-------------------------+----------------------+---------------:
+| xs:yearMonthDuration | IntegerPointable | 4 |
+*-------------------------+----------------------+---------------:
+
+** Variable Length Data
+
+ Some information can not be stored in a fixed length value. The following
+ data types are stored in variable length values. Because the size varies,
+ the first two bytes are used to store the length of the total value in
+ bytes. QName is one exception to this rule because the QName field has
+ three distinct variable length fields. In this case we basically are
+ storing three strings right after each other.
+
+ Please note that all strings are stored in UTF8. The UTF8 characters range
+ in size from one to three bytes. UTF8StringWriter supports writing a
+ character sequence into the UTF8StringPointable format.
+
+*-------------------------+----------------------+---------------+
+| <<Data Type>> | <<Pointable Name>> | <<Data Size>> |
+*-------------------------+----------------------+---------------:
+| xs:anyURI | UTF8StringPointable | 2 + length |
+*-------------------------+----------------------+---------------:
+| xs:base64Binary | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}} | 2 + length |
+*-------------------------+----------------------+---------------:
+| xs:hexBinary | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}} | 2 + length |
+*-------------------------+----------------------+---------------:
+| xs:NOTATION | UTF8StringPointable | 2 + length |
+*-------------------------+----------------------+---------------:
+| xs:QName | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java}XSQNamePointable}} | 6 + length |
+*-------------------------+----------------------+---------------:
+| xs:string | UTF8StringPointable | 2 + length |
+*-------------------------+----------------------+---------------:
+
+
+* String Iterators
+
+ For many string functions, we have used string iterators to traverse the
+ string. The iterator allows the user to ignore the details about the byte
+ size and number of characters. The iterator returns the next character or
+ an end of string value. Stacking iterators can be used to alter the string
+ into a desired form.
+
+ * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/ICharacterIterator.java}ICharacterIterator}}
+
+ * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java}LowerCaseStringCharacterIterator}}
+
+ * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringAfterCharacterIterator.java}SubstringAfterStringCharacterIterator}}
+
+ * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringBeforeCharacterIterator.java}SubstringBeforeStringCharacterIterator}}
+
+ * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringCharacterIterator.java}SubstringStringCharacterIterator}}
+
+ * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java}UTF8StringCharacterIterator}}
+
+ * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java}UpperCaseStringCharacterIterator}}
+
+* Array Backed Value Store
+
+ The array back value store is a key design element of Hyracks. The object
+ is used to manage an output array. The system creates an array large enough
+ to hold your output. Adding to the result, if necessary. The array can be
+ reused and can hold multiple pointable results due to the starting offset
+ parameter in the pointable.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/src/site/apt/development_tips.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_tips.apt b/src/site/apt/development_tips.apt
deleted file mode 100644
index f139c21..0000000
--- a/src/site/apt/development_tips.apt
+++ /dev/null
@@ -1,162 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one or more
-~~ contributor license agreements. See the NOTICE file distributed with
-~~ this work for additional information regarding copyright ownership.
-~~ The ASF licenses this file to You under the Apache License, Version 2.0
-~~ (the "License"); you may not use this file except in compliance with
-~~ the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing, software
-~~ distributed under the License is distributed on an "AS IS" BASIS,
-~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~~ See the License for the specific language governing permissions and
-~~ limitations under the License.
-
-Developer Tips
-
-
-* Hyracks Data Mapping
-
- {{{http://hyracks.org}Hyracks}} supports several basic data types stored in
- byte arrays. The byte arrays can be accessed through objects referred to as
- pointables. The pointable helps with tracking the bytes stored in a larger
- storage array. Some pointables support converting the byte array into a
- desired format such as for numeric type. The most basic pointable has three
- values stored in the object.
-
- * byte array
-
- * starting offset
-
- * length
-
- []
-
- In Apache VXQuery\x99 the TaggedValuePointable is used to read a result from this byte
- array. The first byte defines the data type and alerts us to what pointable
- to use for reading the rest of the data.
-
-** Fixed Length Data
-
- Fixed length data types can be stored in a set field size. The following
- outlines the Hyracks data type or custom VXQuery definition with the
- details about the implementation.
-
-*-------------------------+----------------------+---------------+
-| <<Data Type>> | <<Pointable Name>> | <<Data Size>> |
-*-------------------------+----------------------+---------------:
-| xs:boolean | BooleanPointable | 1 |
-*-------------------------+----------------------+---------------:
-| xs:byte | BytePointable | 1 |
-*-------------------------+----------------------+---------------:
-| xs:date | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
-*-------------------------+----------------------+---------------:
-| xs:dateTime | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java}XSDateTimePointable}} | 12 |
-*-------------------------+----------------------+---------------:
-| xs:dayTimeDuration | LongPointable | 8 |
-*-------------------------+----------------------+---------------:
-| xs:decimal | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java}XSDecimalPointable}} | 9 |
-*-------------------------+----------------------+---------------:
-| xs:double | DoublePointable | 8 |
-*-------------------------+----------------------+---------------:
-| xs:duration | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java}XSDurationPointable}} | 12 |
-*-------------------------+----------------------+---------------:
-| xs:float | FloatPointable | 4 |
-*-------------------------+----------------------+---------------:
-| xs:gDay | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
-*-------------------------+----------------------+---------------:
-| xs:gMonth | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
-*-------------------------+----------------------+---------------:
-| xs:gMonthDay | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
-*-------------------------+----------------------+---------------:
-| xs:gYear | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
-*-------------------------+----------------------+---------------:
-| xs:gYearMonth | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}} | 6 |
-*-------------------------+----------------------+---------------:
-| xs:int | IntegerPointable | 4 |
-*-------------------------+----------------------+---------------:
-| xs:integer | LongPointable | 8 |
-*-------------------------+----------------------+---------------:
-| xs:negativeInteger | LongPointable | 8 |
-*-------------------------+----------------------+---------------:
-| xs:nonNegativeInteger | LongPointable | 8 |
-*-------------------------+----------------------+---------------:
-| xs:nonPositiveInteger | LongPointable | 8 |
-*-------------------------+----------------------+---------------:
-| xs:positiveInteger | LongPointable | 8 |
-*-------------------------+----------------------+---------------:
-| xs:short | ShortPointable | 2 |
-*-------------------------+----------------------+---------------:
-| xs:time | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java}XSTimePointable}} | 8 |
-*-------------------------+----------------------+---------------:
-| xs:unsignedByte | ShortPointable | 2 |
-*-------------------------+----------------------+---------------:
-| xs:unsignedInt | LongPointable | 8 |
-*-------------------------+----------------------+---------------:
-| xs:unsignedLong | LongPointable | 8 |
-*-------------------------+----------------------+---------------:
-| xs:unsignedShort | IntegerPointable | 4 |
-*-------------------------+----------------------+---------------:
-| xs:yearMonthDuration | IntegerPointable | 4 |
-*-------------------------+----------------------+---------------:
-
-** Variable Length Data
-
- Some information can not be stored in a fixed length value. The following
- data types are stored in variable length values. Because the size varies,
- the first two bytes are used to store the length of the total value in
- bytes. QName is one exception to this rule because the QName field has
- three distinct variable length fields. In this case we basically are
- storing three strings right after each other.
-
- Please note that all strings are stored in UTF8. The UTF8 characters range
- in size from one to three bytes. UTF8StringWriter supports writing a
- character sequence into the UTF8StringPointable format.
-
-*-------------------------+----------------------+---------------+
-| <<Data Type>> | <<Pointable Name>> | <<Data Size>> |
-*-------------------------+----------------------+---------------:
-| xs:anyURI | UTF8StringPointable | 2 + length |
-*-------------------------+----------------------+---------------:
-| xs:base64Binary | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}} | 2 + length |
-*-------------------------+----------------------+---------------:
-| xs:hexBinary | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}} | 2 + length |
-*-------------------------+----------------------+---------------:
-| xs:NOTATION | UTF8StringPointable | 2 + length |
-*-------------------------+----------------------+---------------:
-| xs:QName | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java}XSQNamePointable}} | 6 + length |
-*-------------------------+----------------------+---------------:
-| xs:string | UTF8StringPointable | 2 + length |
-*-------------------------+----------------------+---------------:
-
-
-* String Iterators
-
- For many string functions, we have used string iterators to traverse the
- string. The iterator allows the user to ignore the details about the byte
- size and number of characters. The iterator returns the next character or
- an end of string value. Stacking iterators can be used to alter the string
- into a desired form.
-
- * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/ICharacterIterator.java}ICharacterIterator}}
-
- * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java}LowerCaseStringCharacterIterator}}
-
- * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringAfterCharacterIterator.java}SubstringAfterStringCharacterIterator}}
-
- * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringBeforeCharacterIterator.java}SubstringBeforeStringCharacterIterator}}
-
- * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringCharacterIterator.java}SubstringStringCharacterIterator}}
-
- * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java}UTF8StringCharacterIterator}}
-
- * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java}UpperCaseStringCharacterIterator}}
-
-* Array Backed Value Store
-
- The array back value store is a key design element of Hyracks. The object
- is used to manage an output array. The system creates an array large enough
- to hold your output. Adding to the result, if necessary. The array can be
- reused and can hold multiple pointable results due to the starting offset
- parameter in the pointable.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/src/site/apt/development_update_xqts_results.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_update_xqts_results.apt b/src/site/apt/development_update_xqts_results.apt
index 55377a7..115a178 100644
--- a/src/site/apt/development_update_xqts_results.apt
+++ b/src/site/apt/development_update_xqts_results.apt
@@ -22,11 +22,12 @@ Update the XQTS Results
* Instructions
* Verify current XQTS results are all passing before updating to the new XQTS test results.
- The following command should produce all passing results.
- They can be viewed at {{{file:///tmp/full_report_previous.html}file:///tmp/full_report_previous.html}}.
+ The XQTS should be located in "vxquery-xtest/test-suites/xqts", as explained in the {{{Running the Test Suite}http://vxquery.apache.org/user_running_tests.html}}
+ The following command should produce all passing results.
+ They can be viewed at {{{file:///tmp/previous_report.html}file:///tmp/previous_report.html}}.
----------------------------------------
-sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -htmlreport /tmp/full_report_previous.html -previous-test-results vxquery-xtest/results/xqts.txt
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -htmlreport /tmp/previous_report.html -previous-test-results vxquery-xtest/results/xqts.txt
----------------------------------------
* Remove the old results file.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/src/site/apt/user_query.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query.apt b/src/site/apt/user_query.apt
index b86b4dd..7cb04b5 100644
--- a/src/site/apt/user_query.apt
+++ b/src/site/apt/user_query.apt
@@ -16,14 +16,23 @@
Executing a Query
-* Command
+* Command On *nix Based Systems
----------------------------------------
sh ./apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin/vxq
----------------------------------------
+* Commands On Windows Based Systems
+
+----------------------------------------
+cd apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin
+vxq.bat
+----------------------------------------
+
* Command Line Options
+Command line options for all systems.
+
----------------------------------------
-O N : Optimization Level. Default: Full Optimization
-available-processors N : Number of available processors. (default java's available processors)
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/src/site/apt/user_running_tests.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt
index f74a897..32d5278 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -16,12 +16,20 @@
Running the Test Suite
-* Command
+* Command On *nix Based Systems
----------------------------------------
sh ./vxquery/vxquery-xtest/target/appassembler/bin/xtest
----------------------------------------
+* Command On Windows Based Systems
+
+First navigate to "apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin" and then run the following file.
+
+----------------------------------------
+xtest.bat
+----------------------------------------
+
* Command Line Options
----------------------------------------
@@ -48,17 +56,34 @@ sh ./vxquery/vxquery-xtest/target/appassembler/bin/xtest
JAVA_OPTS="-Xmx1024m -Djava.util.logging.config.file=/path/to/logging.properties"
----------------------------------------
-* Example
+* VXQuery Testing Options
+
+ * VXQuery Test Suite
- To run the XQTS testsuite
+ The VXQuery test suite focuses on parallel processing tests used in our weather benchmark.
+
+----------------------------------------
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/src/test/resources/VXQueryCatalog.xml -htmlreport /tmp/full_report.html
+----------------------------------------
- * get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using wget),
+ * XQTS (XQuery Test Suite)
+ To run the complete XQTS on VXQuery.
+
+ * Create a folder to hold the XQTS.
+ If you use "vxquery-xtest/test-suite/xqts", then maven will utilize the XQTS to verify VXQuery's passing functions during the build process.
+
+----------------------------------------
+$ mkdir -p vxquery-xtest/test-suite
+$ cd vxquery-xtest/test-suite
+----------------------------------------
+
+ * Get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using wget),
----------------------------------------
$ wget http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip
----------------------------------------
- * unpack it,
+ * unpack it,
----------------------------------------
$ mkdir xqts
@@ -67,22 +92,27 @@ $ unzip ../XQTS_1_0_3.zip
$ cd ..
----------------------------------------
- * run the tests, and
+ * run the tests, and
----------------------------------------
-sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog xqts/XQTSCatalog.xml -htmlreport /tmp/full_report.html
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suite/xqts/XQTSCatalog.xml -htmlreport /tmp/full_report.html
----------------------------------------
- * view the results at {{{file:///tmp/full_report.html}file:///tmp/full_report.html}}.
+ * view the results at {{{file:///tmp/full_report.html}file:///tmp/full_report.html}}.
- * Add JAVA_OPTS for additional java parameters.
+ * Add JAVA_OPTS for additional java parameters.
-* VXQuery Test Suite
+ * XQTS (XQuery Test Suite) Option 2
+ The following command will run the XQTS for test that are known to pass in VXQuery.
+ The command is intend for developer to check their build and ensure all previous test continue to pass.
+ All the tests should pass.
+
+ * run the tests, and
- The VXQuery test suite focuses on parallel processing tests used in our weather benchmark.
-
----------------------------------------
-sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/src/test/resources/VXQueryCatalog.xml -htmlreport /tmp/full_report.html
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suite/xqts/XQTSCatalog.xml -htmlreport /tmp/previous_report.html -previous-test-results vxquery-xtest/results/xqts.txt
----------------------------------------
-
+
+ * view the results at {{{file:///tmp/previous_report.html}file:///tmp/previous_report.html}}.
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 8b32624..e0c75a0 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -70,7 +70,7 @@ limitations under the License.
<menu name="For Developers">
<item
name="Data Basic Types"
- href="development_tips.html" />
+ href="development_basic_data_types.html" />
<item
name="Data XML and Node Types"
href="development_xml_node_details.html" />
@@ -80,6 +80,12 @@ limitations under the License.
<item
name="Release steps"
href="release.html" />
+ <item
+ name="Update Local Git XQTS Results"
+ href="development_update_xqts_results.html" />
+ <item
+ name="XQuery Benchmarks"
+ href="development_benchmarks.html" />
</menu>
<menu ref="reports" />
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index fdf2b05..080f8a1 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -387,7 +387,7 @@ public class VXQuery {
ncConfig.ccPort = 39001;
ncConfig.clusterNetIPAddress = "127.0.0.1";
ncConfig.dataIPAddress = "127.0.0.1";
- ncConfig.datasetIPAddress = "127.0.0.1";
+ ncConfig.resultIPAddress = "127.0.0.1";
ncConfig.nodeId = "nc" + (i + 1);
ncConfig.ioDevices = Files.createTempDirectory(ncConfig.nodeId).toString();
ncs[i] = new NodeControllerService(ncConfig);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index 06b5918..4f082aa 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -166,6 +166,16 @@ public class XMLQueryCompiler {
public Object makeNullableType(Object type) throws AlgebricksException {
throw new NotImplementedException("NullableTypeComputer is not implented");
}
+
+ @Override
+ public boolean canBeNull(Object type) {
+ throw new NotImplementedException("NullableTypeComputer is not implented");
+ }
+
+ @Override
+ public Object getNonOptionalType(Object type) {
+ throw new NotImplementedException("NullableTypeComputer is not implented");
+ }
});
builder.setNullWriterFactory(new VXQueryNullWriterFactory());
if (availableProcessors < 1) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 9bf8705..483f289 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -112,6 +112,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- <argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib=sampling"</argLine> -->
+ </configuration>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
index 146f277..e974bca 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
@@ -88,7 +88,7 @@ public class TestRunner {
ncConfig1.ccPort = 39001;
ncConfig1.clusterNetIPAddress = "127.0.0.1";
ncConfig1.dataIPAddress = "127.0.0.1";
- ncConfig1.datasetIPAddress = "127.0.0.1";
+ ncConfig1.resultIPAddress = "127.0.0.1";
ncConfig1.nodeId = "nc1";
nc1 = new NodeControllerService(ncConfig1);
nc1.start();
http://git-wip-us.apache.org/repos/asf/vxquery/blob/00c245fd/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
index f772dc8..95a20fa 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
@@ -64,9 +64,9 @@ public class VXQueryTest {
Collection<Object[]> tests = jtcf_vxquery.getList();
if (includeXqtsTests()) {
JUnitTestCaseFactory jtcf_previous = new JUnitTestCaseFactory(getPreviousTestOptions());
- tests.addAll(jtcf_previous.getList());
+ // TODO Maven fails to run when including XQTS. (Error to many open files.)
+ // tests.addAll(jtcf_previous.getList());
}
-
return tests;
}
[20/25] vxquery git commit: Updated the site to fix a few formatting
issues.
Posted by pr...@apache.org.
Updated the site to fix a few formatting issues.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/2e68da45
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/2e68da45
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/2e68da45
Branch: refs/heads/master
Commit: 2e68da45c2657f557f93501dd8b826540d845612
Parents: 94c242d
Author: Preston Carman <pr...@apache.org>
Authored: Thu Feb 19 11:12:18 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Feb 19 11:12:18 2015 -0800
----------------------------------------------------------------------
README | 31 +++++++++++++++-------------
src/site/apt/development_benchmarks.apt | 4 ++++
src/site/apt/user_query.apt | 2 +-
src/site/apt/user_running_tests.apt | 16 +++++++-------
src/site/site.xml | 4 ++--
5 files changed, 32 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/2e68da45/README
----------------------------------------------------------------------
diff --git a/README b/README
index e709f00..9fb027c 100644
--- a/README
+++ b/README
@@ -1,17 +1,20 @@
-~~ 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.
+<!--
+ 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.
+-->
+
VXQuery documentation can be found in src/main/site/apt.
The folder contains documents that detail how to install VXQuery,
http://git-wip-us.apache.org/repos/asf/vxquery/blob/2e68da45/src/site/apt/development_benchmarks.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_benchmarks.apt b/src/site/apt/development_benchmarks.apt
index 3892fdb..40c02c7 100644
--- a/src/site/apt/development_benchmarks.apt
+++ b/src/site/apt/development_benchmarks.apt
@@ -17,4 +17,8 @@ Benchmarks
* Weather Benchmark
+ Instructions will be added shortly. All the code can be found in the vxquery-benchmark project.
+
* XMark Benchmark
+
+ Work in progress.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/2e68da45/src/site/apt/user_query.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query.apt b/src/site/apt/user_query.apt
index 7cb04b5..a022825 100644
--- a/src/site/apt/user_query.apt
+++ b/src/site/apt/user_query.apt
@@ -31,7 +31,7 @@ vxq.bat
* Command Line Options
-Command line options for all systems.
+ Command line options for all systems.
----------------------------------------
-O N : Optimization Level. Default: Full Optimization
http://git-wip-us.apache.org/repos/asf/vxquery/blob/2e68da45/src/site/apt/user_running_tests.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt
index 32d5278..d87de9e 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -24,7 +24,7 @@ sh ./vxquery/vxquery-xtest/target/appassembler/bin/xtest
* Command On Windows Based Systems
-First navigate to "apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin" and then run the following file.
+ First navigate to "apache-vxquery-X.Y/vxquery-cli/target/appassembler/bin" and then run the following file.
----------------------------------------
xtest.bat
@@ -60,17 +60,17 @@ JAVA_OPTS="-Xmx1024m -Djava.util.logging.config.file=/path/to/logging.properties
* VXQuery Test Suite
- The VXQuery test suite focuses on parallel processing tests used in our weather benchmark.
+ The VXQuery test suite focuses on parallel processing tests used in our weather benchmark.
----------------------------------------
sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/src/test/resources/VXQueryCatalog.xml -htmlreport /tmp/full_report.html
----------------------------------------
* XQTS (XQuery Test Suite)
- To run the complete XQTS on VXQuery.
+ To run the complete XQTS on VXQuery.
* Create a folder to hold the XQTS.
- If you use "vxquery-xtest/test-suite/xqts", then maven will utilize the XQTS to verify VXQuery's passing functions during the build process.
+ If you use "vxquery-xtest/test-suite/xqts", then maven will utilize the XQTS to verify VXQuery's passing functions during the build process.
----------------------------------------
$ mkdir -p vxquery-xtest/test-suite
@@ -103,11 +103,11 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-sui
* Add JAVA_OPTS for additional java parameters.
* XQTS (XQuery Test Suite) Option 2
- The following command will run the XQTS for test that are known to pass in VXQuery.
- The command is intend for developer to check their build and ensure all previous test continue to pass.
- All the tests should pass.
+ The following command will run the XQTS for test that are known to pass in VXQuery.
+ The command is intend for developer to check their build and ensure all previous test continue to pass.
+ All the tests should pass.
- * run the tests, and
+ * run the tests, and
----------------------------------------
sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suite/xqts/XQTSCatalog.xml -htmlreport /tmp/previous_report.html -previous-test-results vxquery-xtest/results/xqts.txt
http://git-wip-us.apache.org/repos/asf/vxquery/blob/2e68da45/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index e0c75a0..9f41540 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -69,8 +69,8 @@ limitations under the License.
<menu name="For Developers">
<item
- name="Data Basic Types"
- href="development_basic_data_types.html" />
+ name="Data Handling"
+ href="development_data_handling.html" />
<item
name="Data XML and Node Types"
href="development_xml_node_details.html" />
[08/25] vxquery git commit: fix typos
Posted by pr...@apache.org.
fix typos
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/7db3f9e0
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/7db3f9e0
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/7db3f9e0
Branch: refs/heads/master
Commit: 7db3f9e00d07e2c4e6fe0a82d5122894d92a3e7f
Parents: 0ff8557
Author: Till Westmann <we...@gmail.com>
Authored: Thu Jan 15 22:16:12 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Feb 5 11:58:16 2015 -0800
----------------------------------------------------------------------
doap.rdf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/7db3f9e0/doap.rdf
----------------------------------------------------------------------
diff --git a/doap.rdf b/doap.rdf
index 8f173f1..b535959 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -21,11 +21,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <Project rdf:about="http://vxquery.apapche.org/">
+ <Project rdf:about="http://vxquery.apache.org/">
<created>2014-10-09</created>
<license rdf:resource="http://spdx.org/licenses/Apache-2.0" />
<name>Apache VXQuery</name>
- <homepage rdf:resource="http://vxquery.apapche.org/" />
+ <homepage rdf:resource="http://vxquery.apache.org/" />
<asfext:pmc rdf:resource="http://vxquery.apache.org" />
<shortdesc>Apache VXQuery implements a parallel XML Query processor.</shortdesc>
<description>Apache VXQuery will be a standards compliant XML Query processor implemented in Java. The focus is on the evaluation of queries on large amounts of XML data. Specifically the goal is to evaluate queries on large collections of relatively small XML documents. To achieve this queries will be evaluated on a cluster of shared nothing machines.</description>
[18/25] vxquery git commit: Updated the XML styling of the pom files.
Posted by pr...@apache.org.
Updated the XML styling of the pom files.
Conflicts:
pom.xml
vxquery-server/pom.xml
vxquery-xtest/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/e2e115c1
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/e2e115c1
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/e2e115c1
Branch: refs/heads/master
Commit: e2e115c1f1780b2df35205448a33776e9ec8c71b
Parents: 1f92648
Author: Preston Carman <pr...@apache.org>
Authored: Thu Feb 5 11:52:18 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Feb 17 10:02:02 2015 -0800
----------------------------------------------------------------------
vxquery-server/pom.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/e2e115c1/vxquery-server/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index dfd3ab9..995fa46 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -78,7 +78,6 @@
<executions>
<execution>
<id>copy-scripts</id>
- <!-- here the phase you need -->
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
@@ -94,7 +93,6 @@
</execution>
<execution>
<id>copy-conf</id>
- <!-- here the phase you need -->
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
[16/25] vxquery git commit: fix typos
Posted by pr...@apache.org.
fix typos
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/0f2a1d98
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/0f2a1d98
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/0f2a1d98
Branch: refs/heads/master
Commit: 0f2a1d98f1b74a3dcbccc754bc1c5183a1f0fb44
Parents: 00c245f
Author: Till Westmann <we...@gmail.com>
Authored: Thu Jan 15 22:16:12 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Feb 17 09:55:21 2015 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[24/25] vxquery git commit: Updated pom and instructions based on
code review.
Posted by pr...@apache.org.
Updated pom and instructions based on code review.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/cc57e1f9
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/cc57e1f9
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/cc57e1f9
Branch: refs/heads/master
Commit: cc57e1f9a0f1ed7331ed0deeca719660166dd3d0
Parents: d33315f
Author: Preston Carman <pr...@apache.org>
Authored: Fri Feb 20 17:54:11 2015 -0800
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Feb 20 17:54:11 2015 -0800
----------------------------------------------------------------------
pom.xml | 2 +-
src/site/apt/user_installation.apt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/cc57e1f9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a0e9341..5b4a15d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -533,7 +533,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <hyracks.version>0.2.15-SNAPSHOT</hyracks.version>
+ <hyracks.version>0.2.15</hyracks.version>
<apache-rat-plugin.version>0.11</apache-rat-plugin.version>
</properties>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/cc57e1f9/src/site/apt/user_installation.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_installation.apt b/src/site/apt/user_installation.apt
index 559b3a3..3005885 100644
--- a/src/site/apt/user_installation.apt
+++ b/src/site/apt/user_installation.apt
@@ -17,7 +17,7 @@ Installation
* Requirements
- * Apache VXQuery\x99 source archive (apache-vxquery-X.Y.zip)
+ * Apache VXQuery\x99 source archive (apache-vxquery-X.Y-source-release.zip)
* JDK >= 1.7
@@ -26,7 +26,7 @@ Installation
* Steps
---
-$ unzip apache-vxquery-X.Y.zip
+$ unzip apache-vxquery-X.Y-source-release.zip
$ cd apache-vxquery-X.Y
$ mvn package -DskipTests
$ cd ..
[22/25] vxquery git commit: Updated XQTS results and included fix for
Algebricks upgrade.
Posted by pr...@apache.org.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d33315f2/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index cb8bde8..110b241 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -53,8 +53,8 @@ Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESUL
Catalog//Catalog001, EXPECTED_RESULT_GOT_FAILURE
Catalog//Catalog002, EXPECTED_RESULT_GOT_FAILURE
Catalog//Catalog003, EXPECTED_RESULT_GOT_FAILURE
-CondExpr//K2-CondExpr-1, EXPECTED_ERROR_GOT_FAILURE
-CondExpr//K2-CondExpr-2, EXPECTED_RESULT_GOT_FAILURE
+CondExpr//K2-CondExpr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+CondExpr//K2-CondExpr-2, EXPECTED_RESULT_GOT_ERROR
CondExpr//K2-CondExpr-3, EXPECTED_RESULT_GOT_ERROR
CondExpr//K2-CondExpr-4, EXPECTED_RESULT_GOT_FAILURE
CondExpr//K2-CondExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -63,15 +63,15 @@ CondExpr//K2-CondExpr-7, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-1, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-11, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-12, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-13, EXPECTED_ERROR_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-12, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-13, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-14, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-15, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-16, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-18, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-2, EXPECTED_ERROR_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-2, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-20, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-21, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-22, EXPECTED_ERROR_GOT_FAILURE
@@ -82,45 +82,45 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-26, EXPECTED_RESULT_GOT_E
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-27, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-28, EXPECTED_ERROR_GOT_FAILURE
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-29, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-3, EXPECTED_ERROR_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-30, EXPECTED_RESULT_GOT_FAILURE
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-31, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-32, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-33, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-34, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-35, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-32, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-33, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-34, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-35, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-36, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-37, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-38, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-39, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-4, EXPECTED_ERROR_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-40, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-41, EXPECTED_ERROR_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-41, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-42, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-43, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-44, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-45, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-46, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-49, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-50, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-51, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-52, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-53, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-48, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-49, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-50, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-51, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-52, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-53, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-54, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-55, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-56, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-57, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-58, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-59, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-6, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-60, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-61, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_FAILURE
-Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_FAILURE
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-56, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-57, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-58, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-60, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-61, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-1, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-2, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-3, EXPECTED_ERROR_GOT_RESULT
@@ -130,7 +130,7 @@ Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-6, EXPECTED_ERROR_GOT_RE
Construct/ComputeCon/ComputeConAttr//comp-attr-bad-name-7, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-1, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-3, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-3, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ComputeConComment//K2-ComputeConComment-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-1, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -143,7 +143,7 @@ Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-15, EXPECTED_RESULT_GOT_F
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-4, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-5, EXPECTED_ERROR_GOT_FAILURE
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-6, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-8, EXPECTED_RESULT_GOT_ERROR
@@ -163,8 +163,8 @@ Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-4, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-5, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-6, EXPECTED_ERROR_GOT_RESULT
Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-7, EXPECTED_ERROR_GOT_RESULT
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-8, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-9, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-8, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ComputeConPI//K2-ComputeConPI-9, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-1, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-10, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConDocNode//K2-ConDocNode-11, EXPECTED_RESULT_GOT_ERROR
@@ -203,17 +203,17 @@ Construct/ComputeCon/ConText//K2-ConText-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-12, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-13, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-14, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConText//K2-ConText-15, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConText//K2-ConText-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConText//K2-ConText-3, EXPECTED_RESULT_GOT_FAILURE
-Construct/ComputeCon/ConText//K2-ConText-4, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConText//K2-ConText-3, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConText//K2-ConText-4, EXPECTED_RESULT_GOT_ERROR
Construct/ComputeCon/ConText//K2-ConText-5, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/ComputeCon/ConText//K2-ConText-6, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-7, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-8, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ComputeCon/ConText//K2-ConText-9, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/ConInScopeNamespace//K2-ConInScopeNamespace-1, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem//K2-DirectConElem-1, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem//K2-DirectConElem-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Construct/DirectConElem//K2-DirectConElem-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -224,7 +224,7 @@ Construct/DirectConElem//K2-DirectConElem-16, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-17, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-18, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-19, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem//K2-DirectConElem-2, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem//K2-DirectConElem-20, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-21, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem//K2-DirectConElem-22, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -240,7 +240,7 @@ Construct/DirectConElem//K2-DirectConElem-30, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem//K2-DirectConElem-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem//K2-DirectConElem-32, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem//K2-DirectConElem-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-34, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem//K2-DirectConElem-34, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem//K2-DirectConElem-35, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem//K2-DirectConElem-36, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem//K2-DirectConElem-37, EXPECTED_ERROR_GOT_RESULT
@@ -251,7 +251,7 @@ Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem//K2-DirectConElem-41, EXPECTED_ERROR_GOT_RESULT
Construct/DirectConElem//K2-DirectConElem-42, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_FAILURE
@@ -290,18 +290,18 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-25, EXPECTED_ERR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-26, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-27, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-28, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-29, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-29, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-30, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-31, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-32, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-33, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-34, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-34, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-35, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-36, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-37, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-38, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-39, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-4, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-41, EXPECTED_RESULT_GOT_FAILURE
@@ -341,7 +341,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-71, EXPECTED_RES
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-72, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-73, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-75, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-75, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-76, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -362,14 +362,14 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-21, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-22, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-23, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-24, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-25, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-25, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-26, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-27, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-28, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-27, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-28, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-29, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-3, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-30, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-31, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-31, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-32, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-33, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-34, EXPECTED_RESULT_GOT_ERROR
@@ -385,7 +385,7 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-42, EXPECT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-43, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-44, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-45, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-46, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-46, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-47, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-48, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -447,7 +447,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-51, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-53, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-54, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-55, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-55, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-57, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-58, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -474,33 +474,33 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-78, EX
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-79, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-9, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-1, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-10, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-11, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-12, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-13, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-14, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-1, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-10, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-11, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-12, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-13, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-14, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-15, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-16, EXPECTED_RESULT_GOT_FAILURE
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-8, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConOther//K2-DirectConOther-1, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-9, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-1, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-10, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-11, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-12, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -531,11 +531,11 @@ Construct/DirectConOther//K2-DirectConOther-34, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-35, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-36, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-37, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConOther//K2-DirectConOther-38, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConOther//K2-DirectConOther-38, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-39, EXPECTED_RESULT_GOT_SAME_RESULT
Construct/DirectConOther//K2-DirectConOther-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-40, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConOther//K2-DirectConOther-41, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConOther//K2-DirectConOther-40, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-41, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-42, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-43, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-44, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -545,8 +545,8 @@ Construct/DirectConOther//K2-DirectConOther-47, EXPECTED_RESULT_GOT_DIFFERENT_RE
Construct/DirectConOther//K2-DirectConOther-48, EXPECTED_ERROR_GOT_FAILURE
Construct/DirectConOther//K2-DirectConOther-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConOther//K2-DirectConOther-51, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConOther//K2-DirectConOther-50, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConOther//K2-DirectConOther-51, EXPECTED_RESULT_GOT_ERROR
Construct/DirectConOther//K2-DirectConOther-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-53, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-54, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -571,11 +571,11 @@ Construct/DirectConOther//K2-DirectConOther-70, EXPECTED_RESULT_GOT_DIFFERENT_RE
Construct/DirectConOther//K2-DirectConOther-71, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Construct/DirectConOther//K2-DirectConOther-8, EXPECTED_ERROR_GOT_SAME_ERROR
Construct/DirectConOther//K2-DirectConOther-9, EXPECTED_ERROR_GOT_SAME_ERROR
-ErrorsAndOptimization//errors-and-optimization-1, EXPECTED_RESULT_GOT_FAILURE
-ErrorsAndOptimization//errors-and-optimization-2, EXPECTED_ERROR_GOT_FAILURE
+ErrorsAndOptimization//errors-and-optimization-1, EXPECTED_RESULT_GOT_ERROR
+ErrorsAndOptimization//errors-and-optimization-2, EXPECTED_ERROR_GOT_SAME_ERROR
ErrorsAndOptimization//errors-and-optimization-3, EXPECTED_RESULT_GOT_FAILURE
-ErrorsAndOptimization//errors-and-optimization-4, EXPECTED_ERROR_GOT_FAILURE
-ErrorsAndOptimization//errors-and-optimization-5, EXPECTED_ERROR_GOT_FAILURE
+ErrorsAndOptimization//errors-and-optimization-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+ErrorsAndOptimization//errors-and-optimization-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
ErrorsAndOptimization//errors-and-optimization-6, EXPECTED_ERROR_GOT_SAME_ERROR
ErrorsAndOptimization//errors-and-optimization-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/CondExpr//CondExpr002, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -598,7 +598,7 @@ Expressions/CondExpr//CondExpr018, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr019, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/CondExpr//CondExpr020, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//CondExpr021, EXPECTED_RESULT_GOT_FAILURE
-Expressions/CondExpr//CondExpr022, EXPECTED_RESULT_GOT_FAILURE
+Expressions/CondExpr//CondExpr022, EXPECTED_RESULT_GOT_ERROR
Expressions/CondExpr//K-CondExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -608,26 +608,26 @@ Expressions/CondExpr//K-CondExpr-3, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//K-CondExpr-4, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//K-CondExpr-5, EXPECTED_RESULT_GOT_FAILURE
Expressions/CondExpr//K-CondExpr-6, EXPECTED_RESULT_GOT_FAILURE
-Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_FAILURE
+Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/CondExpr//K-CondExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/CondExpr//K-CondExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-1, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-14, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-17, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-15, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-16, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-18, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-19, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-2, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-3, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -642,29 +642,29 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-1, EXPECTE
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-string-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConAttr//constattrerr-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-3, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-dash-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-data-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-data-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-doc-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-doubledash-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-doubledash-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-doubledash-3, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-doubledash-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-doubledash-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-doubledash-5, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-2, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-enclexpr-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-nested-3, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-string-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConComment//Constr-compcomment-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-adjtext-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-adjtext-2, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-adjtext-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -675,23 +675,23 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-attr-4, EXPECTE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-baseuri-3, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-1, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-14, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-17, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-15, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-16, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-18, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-19, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-2, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-3, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-5, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-6, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-7, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-7, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-8, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-3, EXPECTED_ERROR_GOT_FAILURE
@@ -715,7 +715,7 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-3, EXPEC
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-5, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-1, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -756,7 +756,7 @@ Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-1, EXPECTED_R
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-space-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-string-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConPI//Constr-comppi-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-adjtext-3, EXPECTED_RESULT_GOT_ERROR
@@ -786,23 +786,23 @@ Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-string-1, EXPECTED_R
Expressions/Construct/ComputeCon/ConText//Constr-text-adjtext-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ConText//Constr-text-adjtext-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-count-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/ComputeCon/ConText//Constr-text-count-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConText//Constr-text-count-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-count-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ConText//Constr-text-count-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-count-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/ComputeCon/ConText//Constr-text-count-6, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ConText//Constr-text-data-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConText//Constr-text-data-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-doc-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-1, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-2, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-4, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-enclexpr-5, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConText//Constr-text-nested-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConText//Constr-text-nested-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-nested-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/ComputeCon/ConText//Constr-text-nested-3, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ComputeCon/ConText//Constr-text-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConText//Constr-text-string-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConText//Constr-text-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/ConInScopeNamespace//Constr-inscope-11, EXPECTED_RESULT_GOT_FAILURE
@@ -855,7 +855,7 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-6, E
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-7, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-2, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-2, EXPECTED_ERROR_GOT_RESULT
Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-1, EXPECTED_RESULT_GOT_FAILURE
@@ -954,7 +954,7 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-7,
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-8, EXPECTED_ERROR_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-9, EXPECTED_RESULT_GOT_FAILURE
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-parent-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-string-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-string-1, EXPECTED_RESULT_GOT_ERROR
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-uripres-1, EXPECTED_RESULT_GOT_ERROR
@@ -1201,7 +1201,7 @@ Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-4, EX
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-5, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-6, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-7, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-8, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-8, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr/ForExprPositionalVar//K-ForExprPositionalVar-9, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-10, EXPECTED_RESULT_GOT_ERROR
@@ -1243,8 +1243,8 @@ Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-42, EXPECTED_ERRO
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-43, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-44, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-45, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-46, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-47, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-46, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-47, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-48, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-49, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-5, EXPECTED_RESULT_GOT_ERROR
@@ -1264,7 +1264,7 @@ Expressions/FLWORExpr/ForExprType//ForExprType002, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ForExprType//ForExprType003, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ForExprType//ForExprType004, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ForExprType//ForExprType005, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType006, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/ForExprType//ForExprType006, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/FLWORExpr/ForExprType//ForExprType007, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExprType//ForExprType008, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExprType//ForExprType009, EXPECTED_RESULT_GOT_FAILURE
@@ -1275,7 +1275,7 @@ Expressions/FLWORExpr/ForExprType//ForExprType013, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExprType//ForExprType014, EXPECTED_ERROR_GOT_FAILURE
Expressions/FLWORExpr/ForExprType//ForExprType015, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/ForExprType//ForExprType016, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/ForExprType//ForExprType017, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/ForExprType//ForExprType017, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/FLWORExpr/ForExprType//ForExprType018, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ForExprType//ForExprType019, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ForExprType//ForExprType020, EXPECTED_RESULT_GOT_FAILURE
@@ -1293,7 +1293,7 @@ Expressions/FLWORExpr/ForExprType//ForExprType034, EXPECTED_RESULT_GOT_DIFFERENT
Expressions/FLWORExpr/ForExprType//ForExprType035, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/ForExprType//ForExprType036, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ForExprType//ForExprType045, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/FLWORExpr/ForExprType//ForExprType046, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/ForExprType//ForExprType046, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/FLWORExpr/ForExprType//ForExprType047, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/ForExprType//ForExprType054, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/ForExprType//ForExprType055, EXPECTED_RESULT_GOT_FAILURE
@@ -1324,15 +1324,15 @@ Expressions/FLWORExpr/LetExpr//LetExpr006, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr007, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr008, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr009, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr010, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/LetExpr//LetExpr010, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/FLWORExpr/LetExpr//LetExpr011, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/LetExpr//LetExpr012, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/LetExpr//LetExpr013, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr014, EXPECTED_ERROR_GOT_FAILURE
-Expressions/FLWORExpr/LetExpr//LetExpr015, EXPECTED_RESULT_GOT_FAILURE
-Expressions/FLWORExpr/LetExpr//LetExpr016, EXPECTED_RESULT_GOT_FAILURE
+Expressions/FLWORExpr/LetExpr//LetExpr014, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/FLWORExpr/LetExpr//LetExpr015, EXPECTED_RESULT_GOT_ERROR
+Expressions/FLWORExpr/LetExpr//LetExpr016, EXPECTED_RESULT_GOT_ERROR
Expressions/FLWORExpr/LetExpr//LetExpr017, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/FLWORExpr/LetExpr//LetExpr018, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/LetExpr//LetExpr018, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/FLWORExpr/LetExpr//LetExpr019, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr020, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExpr//LetExpr021, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -1346,7 +1346,7 @@ Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-1, EXPECTED_ERROR
Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-2, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-4, EXPECTED_RESULT_GOT_ERROR
-Expressions/FLWORExpr/LetExprWith//letexprwith-1, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/LetExprWith//letexprwith-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/FLWORExpr/LetExprWith//letexprwith-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExprWith//letexprwith-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/LetExprWith//letexprwith-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1543,7 +1543,7 @@ Expressions/FLWORExpr/WhereExpr//K-WhereExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-10, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-11, EXPECTED_RESULT_GOT_FAILURE
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/WhereExpr//K-WhereExpr-3, EXPECTED_ERROR_GOT_FAILURE
+Expressions/FLWORExpr/WhereExpr//K-WhereExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/FLWORExpr/WhereExpr//K-WhereExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1661,17 +1661,17 @@ Expressions/HigherOrder//hof-918, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/LogicExpr//K-LogicExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-13, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-12, EXPECTED_RESULT_GOT_ERROR
+Expressions/LogicExpr//K-LogicExpr-13, EXPECTED_RESULT_GOT_ERROR
Expressions/LogicExpr//K-LogicExpr-14, EXPECTED_RESULT_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-16, EXPECTED_ERROR_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-17, EXPECTED_ERROR_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-18, EXPECTED_ERROR_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-19, EXPECTED_ERROR_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-16, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/LogicExpr//K-LogicExpr-17, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/LogicExpr//K-LogicExpr-18, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/LogicExpr//K-LogicExpr-19, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/LogicExpr//K-LogicExpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-20, EXPECTED_ERROR_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-21, EXPECTED_ERROR_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-20, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/LogicExpr//K-LogicExpr-21, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/LogicExpr//K-LogicExpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1688,8 +1688,8 @@ Expressions/LogicExpr//K-LogicExpr-33, EXPECTED_RESULT_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-34, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-35, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-36, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/LogicExpr//K-LogicExpr-37, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-38, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-37, EXPECTED_RESULT_GOT_ERROR
+Expressions/LogicExpr//K-LogicExpr-38, EXPECTED_RESULT_GOT_ERROR
Expressions/LogicExpr//K-LogicExpr-39, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-40, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1697,7 +1697,7 @@ Expressions/LogicExpr//K-LogicExpr-41, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-42, EXPECTED_RESULT_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-43, EXPECTED_RESULT_GOT_FAILURE
Expressions/LogicExpr//K-LogicExpr-44, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//K-LogicExpr-45, EXPECTED_ERROR_GOT_FAILURE
+Expressions/LogicExpr//K-LogicExpr-45, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/LogicExpr//K-LogicExpr-46, EXPECTED_ERROR_GOT_RESULT
Expressions/LogicExpr//K-LogicExpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/LogicExpr//K-LogicExpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -1728,10 +1728,10 @@ Expressions/LogicExpr//op-logical-and-021, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-022, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-023, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-024, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-and-025, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-and-026, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-and-027, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-and-028, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//op-logical-and-025, EXPECTED_RESULT_GOT_ERROR
+Expressions/LogicExpr//op-logical-and-026, EXPECTED_RESULT_GOT_ERROR
+Expressions/LogicExpr//op-logical-and-027, EXPECTED_RESULT_GOT_ERROR
+Expressions/LogicExpr//op-logical-and-028, EXPECTED_RESULT_GOT_ERROR
Expressions/LogicExpr//op-logical-and-029, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-030, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-and-031, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1887,10 +1887,10 @@ Expressions/LogicExpr//op-logical-or-021, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-022, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-023, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-024, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/LogicExpr//op-logical-or-025, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-or-026, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-or-027, EXPECTED_RESULT_GOT_FAILURE
-Expressions/LogicExpr//op-logical-or-028, EXPECTED_RESULT_GOT_FAILURE
+Expressions/LogicExpr//op-logical-or-025, EXPECTED_RESULT_GOT_ERROR
+Expressions/LogicExpr//op-logical-or-026, EXPECTED_RESULT_GOT_ERROR
+Expressions/LogicExpr//op-logical-or-027, EXPECTED_RESULT_GOT_ERROR
+Expressions/LogicExpr//op-logical-or-028, EXPECTED_RESULT_GOT_ERROR
Expressions/LogicExpr//op-logical-or-029, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-030, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/LogicExpr//op-logical-or-031, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -2055,7 +2055,7 @@ Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDurati
Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-8, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateAddYMD//op-add-yearMonthDuration-to-date2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2103,7 +2103,7 @@ Expressions/Operators/ArithExpr/DurationArith/DateSubtractYMD//op-subtract-yearM
Expressions/Operators/ArithExpr/DurationArith/DateSubtractYMD//op-subtract-yearMonthDuration-from-date2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateSubtractYMD//op-subtract-yearMonthDuration-from-date2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateSubtractYMD//op-subtract-yearMonthDuration-from-date2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateSubtractYMD//op-subtract-yearMonthDuration-from-date2args-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/DateSubtractYMD//op-subtract-yearMonthDuration-from-date2args-5, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/ArithExpr/DurationArith/DateTimeAddDTD//op-add-dayTimeDuration-to-dateTime-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateTimeAddDTD//op-add-dayTimeDuration-to-dateTime-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateTimeAddDTD//op-add-dayTimeDuration-to-dateTime-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2163,7 +2163,7 @@ Expressions/Operators/ArithExpr/DurationArith/DateTimeSubtractYMD//op-subtract-y
Expressions/Operators/ArithExpr/DurationArith/DateTimeSubtractYMD//op-subtract-yearMonthDuration-from-dateTime2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateTimeSubtractYMD//op-subtract-yearMonthDuration-from-dateTime2args-3, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateTimeSubtractYMD//op-subtract-yearMonthDuration-from-dateTime2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DateTimeSubtractYMD//op-subtract-yearMonthDuration-from-dateTime2args-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/DateTimeSubtractYMD//op-subtract-yearMonthDuration-from-dateTime2args-5, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/ArithExpr/DurationArith/DateTimesSubtract//op-subtract-dateTimes-yielding-DTD-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateTimesSubtract//op-subtract-dateTimes-yielding-DTD-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DateTimesSubtract//op-subtract-dateTimes-yielding-DTD-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2229,21 +2229,21 @@ Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationAdd//op-add-dayTime
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationAdd//op-add-dayTimeDurations2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationAdd//op-add-dayTimeDurations2args-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-10, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-11, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-12, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-13, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-14, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-15, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-16, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-10, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-11, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-12, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-13, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-14, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-15, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-16, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-5, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-6, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-7, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-8, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-9, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//K-DayTimeDurationDivide-9, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//op-divide-dayTimeDuration-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//op-divide-dayTimeDuration-11, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivide//op-divide-dayTimeDuration-12, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2321,12 +2321,12 @@ Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiply//op-multip
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-5, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-6, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-7, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-8, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-9, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//K-DayTimeDurationSubtract-9, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//op-subtract-dayTimeDurations-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//op-subtract-dayTimeDurations-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtract//op-subtract-dayTimeDurations-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2447,7 +2447,7 @@ Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yea
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yearMonthDuration-to-dateTime-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yearMonthDuration-to-dateTime-6, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yearMonthDuration-to-dateTime-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yearMonthDuration-to-dateTime-8, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yearMonthDuration-to-dateTime-8, EXPECTED_RESULT_GOT_ERROR
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yearMonthDuration-to-dateTime-9, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yearMonthDuration-to-dateTime2args-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yearMonthDuration-to-dateTime2args-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2458,7 +2458,7 @@ Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddDT//op-add-yea
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivide//K-YearMonthDurationDivide-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivide//K-YearMonthDurationDivide-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivide//K-YearMonthDurationDivide-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivide//K-YearMonthDurationDivide-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivide//K-YearMonthDurationDivide-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivide//K-YearMonthDurationDivide-5, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivide//K-YearMonthDurationDivide-6, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivide//op-divide-yearMonthDuration-1, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2506,8 +2506,8 @@ Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideYMD//op-div
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideYMD//op-divide-yearMonthDuration-by-yearMonthDuration2args-4, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideYMD//op-divide-yearMonthDuration-by-yearMonthDuration2args-5, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-10, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-11, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-10, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-11, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-12, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-13, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-2, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2516,8 +2516,8 @@ Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearM
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-5, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-6, EXPECTED_ERROR_GOT_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-7, EXPECTED_ERROR_GOT_RESULT
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-8, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-9, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//K-YearMonthDurationMultiply-9, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-multiply-yearMonthDuration-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2546,12 +2546,12 @@ Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply//op-mult
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-3, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-5, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-6, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-7, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-8, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-9, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-8, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//K-YearMonthDurationSubtract-9, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//op-subtract-yearMonthDurations-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//op-subtract-yearMonthDurations-10, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtract//op-subtract-yearMonthDurations-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -2577,48 +2577,48 @@ Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddDTD//K-DateAddDTD-1
Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddDTD//K-DateAddDTD-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMD//K-DateAddYMD-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMD//K-DateAddYMD-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMD//K-DateAddYMD-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMD//K-DateAddYMD-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMD//K-DateAddYMD-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMD//K-DateAddYMD-4, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractDTD//K-DateSubtractDTD-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractYMD//K-DateSubtractYMD-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTD//K-DateTimeAddDTD-1, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTD//K-DateTimeAddDTD-2, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTD//K-DateTimeAddDTD-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTD//K-DateTimeAddDTD-4, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTD//K-DateTimeAddDTD-1, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTD//K-DateTimeAddDTD-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTD//K-DateTimeAddDTD-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTD//K-DateTimeAddDTD-4, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractYMD//K-DateTimeSubtractYMD-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-5, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-6, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtract//K-DatesSubtract-6, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeAddDTD//K-TimeAddDTD-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeAddDTD//K-TimeAddDTD-2, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-5, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-6, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-7, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-8, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-5, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-6, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-7, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtract//K-TimeSubtract-8, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTD//K-TimeSubtractDTD-1, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTD//K-TimeSubtractDTD-2, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTD//K-TimeSubtractDTD-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTD//K-TimeSubtractDTD-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTD//K-TimeSubtractDTD-5, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTD//K-TimeSubtractDTD-2, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTD//K-TimeSubtractDTD-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTD//K-TimeSubtractDTD-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTD//K-TimeSubtractDTD-5, EXPECTED_ERROR_GOT_SAME_ERROR
Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDT//K-YearMonthDurationAddDT-1, EXPECTED_RESULT_GOT_SAME_RESULT
Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDT//K-YearMonthDurationAddDT-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDT//K-YearMonthDurationAddDT-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDT//K-YearMonthDurationAddDT-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDT//K-YearMonthDurationAddDT-5, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDT//K-YearMonthDurationAddDT-6, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDT//K-YearMonthDurationAddDT-3, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDT//K-YearMonthDurationAddDT-4, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDT//K-YearMonthDurationAddDT-5, EXPECTED_ERROR_GOT_SAME_ER
<TRUNCATED>