Repository: vxquery Updated Branches: refs/heads/master ef31a814c -> 4684567b4
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/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 aea6ef7..e9efa11 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 @@ -40,37 +40,37 @@ import org.apache.vxquery.types.SequenceType; import org.apache.vxquery.xmlquery.ast.ModuleNode; import org.apache.vxquery.xmlquery.translator.XMLQueryTranslator; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException; -import edu.uci.ics.hyracks.algebricks.common.utils.Pair; -import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder; -import edu.uci.ics.hyracks.algebricks.compiler.api.ICompiler; -import edu.uci.ics.hyracks.algebricks.compiler.api.ICompilerFactory; -import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.PrioritizedRuleController; -import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialFixpointRuleController; -import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialOnceRuleController; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; -import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.AbstractRuleController; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IOptimizationContextFactory; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig; -import edu.uci.ics.hyracks.algebricks.data.ISerializerDeserializerProvider; -import edu.uci.ics.hyracks.algebricks.data.ITypeTraitProvider; -import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.api.job.JobSpecification; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException; +import org.apache.hyracks.algebricks.common.utils.Pair; +import org.apache.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder; +import org.apache.hyracks.algebricks.compiler.api.ICompiler; +import org.apache.hyracks.algebricks.compiler.api.ICompilerFactory; +import org.apache.hyracks.algebricks.compiler.rewriter.rulecontrollers.PrioritizedRuleController; +import org.apache.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialFixpointRuleController; +import org.apache.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialOnceRuleController; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; +import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; +import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue; +import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer; +import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer; +import org.apache.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory; +import org.apache.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer; +import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; +import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; +import org.apache.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor; +import org.apache.hyracks.algebricks.core.rewriter.base.AbstractRuleController; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.core.rewriter.base.IOptimizationContextFactory; +import org.apache.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig; +import org.apache.hyracks.algebricks.data.ISerializerDeserializerProvider; +import org.apache.hyracks.algebricks.data.ITypeTraitProvider; +import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.api.job.JobSpecification; +import org.apache.hyracks.data.std.primitive.VoidPointable; public class XMLQueryCompiler { private final XQueryCompilationListener listener; @@ -276,4 +276,4 @@ public class XMLQueryCompiler { return defaultPhysicalRewrites; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java index f2a97cc..04690f5 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryParser.java @@ -44,4 +44,4 @@ public class XMLQueryParser { private XMLQueryParser() { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java index fdf3a53..aee9812 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryTypeChecker.java @@ -20,4 +20,4 @@ final class XMLQueryTypeChecker { static void typeCheckModule(Module module) { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java index 94aedb6..48bc7e6 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryCompilationListener.java @@ -26,4 +26,4 @@ public interface XQueryCompilationListener { public void notifyCodegenResult(Module module); public void notifyOptimizedResult(Module module); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java index 00997b9..d8fdf94 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XQueryConstants.java @@ -62,4 +62,4 @@ public final class XQueryConstants { SLASH, SLASH_SLASH, } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java index f8a3c65..e4e222d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/VXQueryPositionWriter.java @@ -18,14 +18,13 @@ import java.io.DataOutput; import java.io.IOException; import java.io.Serializable; +import org.apache.hyracks.algebricks.runtime.base.IUnnestingPositionWriter; import org.apache.vxquery.datamodel.values.ValueTag; -import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingPositionWriter; - public class VXQueryPositionWriter implements IUnnestingPositionWriter, Serializable { private static final long serialVersionUID = 1L; - public void write(DataOutput dataOutput, int position) throws IOException { + public void write(DataOutput dataOutput, long position) throws IOException { dataOutput.writeByte(ValueTag.XS_INTEGER_TAG); dataOutput.writeLong(position); } http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java index 9faefda..d2ff3da 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java @@ -33,6 +33,31 @@ import javax.xml.namespace.QName; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; import org.apache.commons.lang3.tuple.Pair; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; +import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.DistributeResultOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.EmptyTupleSourceOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; +import org.apache.hyracks.algebricks.core.algebra.plan.ALogicalPlanImpl; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream; import org.apache.vxquery.compiler.CompilerControlBlock; import org.apache.vxquery.compiler.algebricks.VXQueryConstantValue; import org.apache.vxquery.context.StaticContext; @@ -156,32 +181,6 @@ import org.apache.vxquery.xmlquery.query.XQueryConstants; import org.apache.vxquery.xmlquery.query.XQueryConstants.PathType; import org.apache.vxquery.xmlquery.query.XQueryConstants.TypeQuantifier; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; -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.AbstractFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DistributeResultOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.EmptyTupleSourceOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SelectOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.plan.ALogicalPlanImpl; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; -import edu.uci.ics.hyracks.data.std.util.ByteArrayAccessibleOutputStream; - public class XMLQueryTranslator { private static final Pattern UNQUOTER = Pattern .compile("(<)|(>)|(')|(&)|(")|(\"\")|('')|(&#\\d+;)|(&#x(?:[A-Fa-f0-9])+;)"); @@ -226,8 +225,8 @@ public class XMLQueryTranslator { Module module = new Module(); moduleCtx = new StaticContextImpl(rootCtx); - moduleCtx.registerVariable(new XQueryVariable(XMLQueryCompilerConstants.DOT_VAR_NAME, SequenceType.create( - AnyItemType.INSTANCE, Quantifier.QUANT_ONE), newLogicalVariable())); + moduleCtx.registerVariable(new XQueryVariable(XMLQueryCompilerConstants.DOT_VAR_NAME, + SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_ONE), newLogicalVariable())); rootVarScope = new RootVariableScope(); currCtx = moduleCtx; module.setModuleContext(moduleCtx); @@ -403,8 +402,8 @@ public class XMLQueryTranslator { paramTypes[i] = Pair.<QName, SequenceType> of(pName, pType); } Signature sign = new Signature(rType, paramTypes); - Function f = external ? new ExternalFunction(name, sign) : new UserDefinedXQueryFunction(name, - sign, null); + Function f = external ? new ExternalFunction(name, sign) + : new UserDefinedXQueryFunction(name, sign, null); moduleCtx.registerFunction(f); break; } @@ -512,8 +511,8 @@ public class XMLQueryTranslator { case SINGLE_TYPE: { SingleTypeNode stNode = (SingleTypeNode) type; ItemType iType = createItemType(stNode.getAtomicType()); - return SequenceType.create(iType, stNode.isOptional() ? Quantifier.QUANT_QUESTION - : Quantifier.QUANT_ONE); + return SequenceType.create(iType, + stNode.isOptional() ? Quantifier.QUANT_QUESTION : Quantifier.QUANT_ONE); } default: @@ -764,7 +763,7 @@ public class XMLQueryTranslator { return translateQuantifiedExprNode(tCtx, qeNode); } - /* + /* case TYPESWITCH_EXPRESSION: { TypeswitchExprNode teNode = (TypeswitchExprNode) value; Expression sExpr = translateExpression(teNode.getSwitchExpr()); @@ -900,9 +899,9 @@ public class XMLQueryTranslator { tCtx.popVariableScope(); } tCtx = tCtx.popContext(); - LogicalVariable lVar = createAssignment( - sfce(qeNode.getQuant() == QuantifierType.EVERY ? BuiltinFunctions.FN_EMPTY_1 - : BuiltinFunctions.FN_EXISTS_1, vre(var)), tCtx); + LogicalVariable lVar = createAssignment(sfce( + qeNode.getQuant() == QuantifierType.EVERY ? BuiltinFunctions.FN_EMPTY_1 : BuiltinFunctions.FN_EXISTS_1, + vre(var)), tCtx); return lVar; } @@ -922,10 +921,10 @@ public class XMLQueryTranslator { private LogicalVariable translateCDataSectionNode(TranslationContext tCtx, CDataSectionNode cdsNode) throws SystemException { - LogicalVariable lVar = createAssignment( - sfce(BuiltinOperators.TEXT_CONSTRUCTOR, - ce(SequenceType.create(BuiltinTypeRegistry.XS_UNTYPED_ATOMIC, Quantifier.QUANT_ONE), - cdsNode.getContent())), tCtx); + LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.TEXT_CONSTRUCTOR, + ce(SequenceType.create(BuiltinTypeRegistry.XS_UNTYPED_ATOMIC, Quantifier.QUANT_ONE), + cdsNode.getContent())), + tCtx); return lVar; } @@ -944,8 +943,8 @@ public class XMLQueryTranslator { private LogicalVariable translateValidateExprNode(TranslationContext tCtx, ValidateExprNode vNode) throws SystemException { XQueryConstants.ValidationMode mode = vNode.getMode(); - Function fn = mode == null || XQueryConstants.ValidationMode.STRICT.equals(mode) ? BuiltinOperators.VALIDATE_STRICT - : BuiltinOperators.VALIDATE_LAX; + Function fn = mode == null || XQueryConstants.ValidationMode.STRICT.equals(mode) + ? BuiltinOperators.VALIDATE_STRICT : BuiltinOperators.VALIDATE_LAX; LogicalVariable lVar = createAssignment(sfce(fn, vre(translateExpression(vNode.getExpr(), tCtx))), tCtx); return lVar; } @@ -955,8 +954,8 @@ public class XMLQueryTranslator { ILogicalExpression name = cast(vre(translateExpression(cNode.getName(), tCtx)), SequenceType.create(BuiltinTypeRegistry.XS_QNAME, Quantifier.QUANT_ONE)); ASTNode content = cNode.getContent(); - ILogicalExpression cExpr = content == null ? sfce(BuiltinOperators.CONCATENATE) : vre(translateExpression( - content, tCtx)); + ILogicalExpression cExpr = content == null ? sfce(BuiltinOperators.CONCATENATE) + : vre(translateExpression(content, tCtx)); LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.ATTRIBUTE_CONSTRUCTOR, name, cExpr), tCtx); return lVar; } @@ -966,8 +965,8 @@ public class XMLQueryTranslator { ILogicalExpression name = cast(vre(translateExpression(cNode.getName(), tCtx)), SequenceType.create(BuiltinTypeRegistry.XS_QNAME, Quantifier.QUANT_ONE)); ASTNode content = cNode.getContent(); - ILogicalExpression cExpr = content == null ? sfce(BuiltinOperators.CONCATENATE) : vre(translateExpression( - content, tCtx)); + ILogicalExpression cExpr = content == null ? sfce(BuiltinOperators.CONCATENATE) + : vre(translateExpression(content, tCtx)); LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.ELEMENT_CONSTRUCTOR, name, cExpr), tCtx); return lVar; } @@ -983,8 +982,9 @@ public class XMLQueryTranslator { ComputedCommentConstructorNode cNode) throws SystemException { ASTNode content = cNode.getContent(); LogicalVariable lVar = createAssignment( - sfce(BuiltinOperators.COMMENT_CONSTRUCTOR, content == null ? sfce(BuiltinOperators.CONCATENATE) - : vre(translateExpression(content, tCtx))), tCtx); + sfce(BuiltinOperators.COMMENT_CONSTRUCTOR, + content == null ? sfce(BuiltinOperators.CONCATENATE) : vre(translateExpression(content, tCtx))), + tCtx); return lVar; } @@ -1001,15 +1001,16 @@ public class XMLQueryTranslator { private LogicalVariable translateComputedTextConstructorNode(TranslationContext tCtx, ComputedTextConstructorNode cNode) throws SystemException { ASTNode content = cNode.getContent(); - LogicalVariable lVar = createAssignment( - sfce(BuiltinOperators.TEXT_CONSTRUCTOR, - content == null ? ce( - SequenceType.create(BuiltinTypeRegistry.XS_UNTYPED_ATOMIC, Quantifier.QUANT_ONE), "") - : vre(translateExpression(content, tCtx))), tCtx); + LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.TEXT_CONSTRUCTOR, + content == null + ? ce(SequenceType.create(BuiltinTypeRegistry.XS_UNTYPED_ATOMIC, Quantifier.QUANT_ONE), "") + : vre(translateExpression(content, tCtx))), + tCtx); return lVar; } - private LogicalVariable translateFLWORExprNode(TranslationContext tCtx, FLWORExprNode fNode) throws SystemException { + private LogicalVariable translateFLWORExprNode(TranslationContext tCtx, FLWORExprNode fNode) + throws SystemException { tCtx = tCtx.pushContext(); List<FLWORClauseNode> cNodes = fNode.getClauses(); int pushCount = 0; @@ -1034,8 +1035,8 @@ public class XMLQueryTranslator { tCtx.varScope.registerVariable(forVar); XQueryVariable posVar = null; if (fvdNode.getPosVar() != null) { - posVar = new XQueryVariable(createQName(fvdNode.getPosVar()), SequenceType.create( - BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), posLVar); + posVar = new XQueryVariable(createQName(fvdNode.getPosVar()), + SequenceType.create(BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), posLVar); tCtx.varScope.registerVariable(posVar); } assert fvdNode.getScoreVar() == null; @@ -1054,7 +1055,8 @@ public class XMLQueryTranslator { if (lvdNode.getType() != null) { letVarType = createSequenceType(lvdNode.getType()); } - XQueryVariable letVar = new XQueryVariable(createQName(lvdNode.getLetVar()), letVarType, seqVar); + XQueryVariable letVar = new XQueryVariable(createQName(lvdNode.getLetVar()), letVarType, + seqVar); tCtx.varScope.registerVariable(letVar); ++pushCount; } @@ -1071,7 +1073,7 @@ public class XMLQueryTranslator { } case ORDERBY_CLAUSE: { OrderbyClauseNode ocNode = (OrderbyClauseNode) cNode; - List<edu.uci.ics.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>> oExprs = new ArrayList<edu.uci.ics.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>>(); + List<org.apache.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>> oExprs = new ArrayList<org.apache.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>>(); List<String> collations = new ArrayList<String>(); for (OrderSpecNode osNode : ocNode.getOrderSpec()) { ILogicalExpression oExpr = vre(translateExpression(osNode.getExpression(), tCtx)); @@ -1103,8 +1105,9 @@ public class XMLQueryTranslator { } collations.add(osNode.getCollation()); */ - oExprs.add(new edu.uci.ics.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>( - o, mutable(oExpr))); + oExprs.add( + new org.apache.hyracks.algebricks.common.utils.Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>>( + o, mutable(oExpr))); } OrderOperator order = new OrderOperator(oExprs); order.getInputs().add(mutable(tCtx.op)); @@ -1170,8 +1173,8 @@ public class XMLQueryTranslator { content.add(data(vre(translateExpression(aVal, tCtx)))); } } - ILogicalExpression contentExpr = content.size() == 1 ? content.get(0) : sfce(BuiltinOperators.CONCATENATE, - content.toArray(new ILogicalExpression[content.size()])); + ILogicalExpression contentExpr = content.size() == 1 ? content.get(0) + : sfce(BuiltinOperators.CONCATENATE, content.toArray(new ILogicalExpression[content.size()])); LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.ATTRIBUTE_CONSTRUCTOR, name, contentExpr), tCtx); return lVar; } @@ -1180,9 +1183,8 @@ public class XMLQueryTranslator { DirectElementConstructorNode decNode) throws SystemException { QNameNode startName = decNode.getStartTagName(); QNameNode endName = decNode.getEndTagName(); - if (endName != null - && (!startName.getPrefix().equals(endName.getPrefix()) || !startName.getLocalName().equals( - endName.getLocalName()))) { + if (endName != null && (!startName.getPrefix().equals(endName.getPrefix()) + || !startName.getLocalName().equals(endName.getLocalName()))) { throw new SystemException(ErrorCode.XPST0003, endName.getSourceLocation()); } pushContext(); @@ -1223,8 +1225,8 @@ public class XMLQueryTranslator { } } popContext(); - ILogicalExpression contentExpr = content.size() == 1 ? content.get(0) : sfce(BuiltinOperators.CONCATENATE, - content.toArray(new ILogicalExpression[content.size()])); + ILogicalExpression contentExpr = content.size() == 1 ? content.get(0) + : sfce(BuiltinOperators.CONCATENATE, content.toArray(new ILogicalExpression[content.size()])); LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.ELEMENT_CONSTRUCTOR, name, contentExpr), tCtx); return lVar; } @@ -1232,9 +1234,8 @@ public class XMLQueryTranslator { private LogicalVariable translateDirectCommentConstructorNode(TranslationContext tCtx, DirectCommentConstructorNode dccNode) throws SystemException { String content = dccNode.getContent(); - LogicalVariable lVar = createAssignment( - sfce(BuiltinOperators.COMMENT_CONSTRUCTOR, - ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), content)), tCtx); + LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.COMMENT_CONSTRUCTOR, + ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), content)), tCtx); return lVar; } @@ -1242,10 +1243,9 @@ public class XMLQueryTranslator { throws SystemException { String target = dpicNode.getTarget(); String content = dpicNode.getContent(); - LogicalVariable lVar = createAssignment( - sfce(BuiltinOperators.PI_CONSTRUCTOR, - ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), target), - ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), content)), tCtx); + LogicalVariable lVar = createAssignment(sfce(BuiltinOperators.PI_CONSTRUCTOR, + ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), target), + ce(SequenceType.create(BuiltinTypeRegistry.XS_STRING, Quantifier.QUANT_ONE), content)), tCtx); return lVar; } @@ -1339,8 +1339,9 @@ public class XMLQueryTranslator { if (!type.isAtomicType()) { throw new SystemException(ErrorCode.XPST0051, fnNode.getName().getSourceLocation()); } - LogicalVariable var = args.isEmpty() ? tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME) - .getLogicalVariable() : args.get(0); + LogicalVariable var = args.isEmpty() + ? tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME).getLogicalVariable() + : args.get(0); ILogicalExpression expr = cast(vre(var), SequenceType.create((ItemType) type, Quantifier.QUANT_QUESTION)); return createAssignment(expr, tCtx); } @@ -1417,8 +1418,8 @@ public class XMLQueryTranslator { } LogicalVariable var = translateExpression(ueNode.getExpr(), tCtx); if (neg) { - ILogicalExpression nExpr = normalize(vre(var), BuiltinOperators.NUMERIC_UNARY_MINUS.getSignature() - .getParameterType(0)); + ILogicalExpression nExpr = normalize(vre(var), + BuiltinOperators.NUMERIC_UNARY_MINUS.getSignature().getParameterType(0)); ILogicalExpression negExpr = sfce(BuiltinOperators.NUMERIC_UNARY_MINUS, nExpr); var = createAssignment(negExpr, tCtx); } @@ -1450,8 +1451,8 @@ public class XMLQueryTranslator { tCtx = tCtx.pushContext(); tCtx.pushVariableScope(); iterateOver(ctxExpr, tCtx); - ctxExpr = vre(tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME) - .getLogicalVariable()); + ctxExpr = vre( + tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME).getLogicalVariable()); ctxExpr = sfce(BuiltinOperators.DESCENDANT_OR_SELF, treat(ctxExpr, SequenceType.create(AnyNodeType.INSTANCE, Quantifier.QUANT_STAR))); List<LogicalVariable> vars = new ArrayList<LogicalVariable>(); @@ -1519,8 +1520,8 @@ public class XMLQueryTranslator { ILogicalExpression expression = ((AssignOperator) tCtx.op).getExpressions().get(0) .getValue(); if (expression.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL - && ((AbstractFunctionCallExpression) expression).getFunctionIdentifier().equals( - BuiltinOperators.CHILD.getFunctionIdentifier())) { + && ((AbstractFunctionCallExpression) expression).getFunctionIdentifier() + .equals(BuiltinOperators.CHILD.getFunctionIdentifier())) { boolTestTmp = sfce(BuiltinFunctions.FN_COUNT_1, boolTestTmp); } } @@ -1535,8 +1536,8 @@ public class XMLQueryTranslator { SelectOperator select = new SelectOperator(mutable(selectCondition), false, null); select.getInputs().add(mutable(tCtx.op)); tCtx.op = select; - ctxExpr = vre(tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME) - .getLogicalVariable()); + ctxExpr = vre( + tCtx.varScope.lookupVariable(XMLQueryCompilerConstants.DOT_VAR_NAME).getLogicalVariable()); } if (popScope) { tCtx.popVariableScope(); @@ -1562,8 +1563,8 @@ public class XMLQueryTranslator { private void iterateOver(ILogicalExpression ctxExpr, TranslationContext tCtx) { LogicalVariable seqLVar = createAssignment(ctxExpr, tCtx); LogicalVariable lastLVar = createAssignment(sfce(BuiltinFunctions.FN_COUNT_1, vre(seqLVar)), tCtx); - tCtx.varScope.registerVariable(new XQueryVariable(XMLQueryCompilerConstants.LAST_VAR_NAME, SequenceType.create( - BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), lastLVar)); + tCtx.varScope.registerVariable(new XQueryVariable(XMLQueryCompilerConstants.LAST_VAR_NAME, + SequenceType.create(BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), lastLVar)); LogicalVariable forLVar = newLogicalVariable(); LogicalVariable posLVar = newLogicalVariable(); UnnestOperator unnest = new UnnestOperator(forLVar, mutable(ufce(BuiltinOperators.ITERATE, vre(seqLVar))), @@ -2146,4 +2147,4 @@ public class XMLQueryTranslator { varMap.put(var.getName(), var); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/xslt/generate-fn-defns.xsl ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/xslt/generate-fn-defns.xsl b/vxquery-core/src/main/xslt/generate-fn-defns.xsl index 1206d25..eb53582 100644 --- a/vxquery-core/src/main/xslt/generate-fn-defns.xsl +++ b/vxquery-core/src/main/xslt/generate-fn-defns.xsl @@ -80,17 +80,17 @@ </xsl:if> <xsl:for-each select="runtime"> <xsl:if test="@type = 'scalar'"> - public edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory createScalarEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { + public org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory createScalarEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { return new <xsl:value-of select="@class"/>(args); } </xsl:if> <xsl:if test="@type = 'aggregate'"> - public edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory createAggregateEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { + public org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory createAggregateEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { return new <xsl:value-of select="@class"/>(args); } </xsl:if> <xsl:if test="@type = 'unnesting'"> - public edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory createUnnestingEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { + public org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory createUnnestingEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { return new <xsl:value-of select="@class"/>(args); } </xsl:if> http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/xslt/generate-op-defns.xsl ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/xslt/generate-op-defns.xsl b/vxquery-core/src/main/xslt/generate-op-defns.xsl index 1ee8c08..f706370 100644 --- a/vxquery-core/src/main/xslt/generate-op-defns.xsl +++ b/vxquery-core/src/main/xslt/generate-op-defns.xsl @@ -72,17 +72,17 @@ </xsl:if> <xsl:for-each select="runtime"> <xsl:if test="@type = 'scalar'"> - public edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory createScalarEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { + public org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory createScalarEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { return new <xsl:value-of select="@class"/>(args); } </xsl:if> <xsl:if test="@type = 'aggregate'"> - public edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory createAggregateEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { + public org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory createAggregateEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { return new <xsl:value-of select="@class"/>(args); } </xsl:if> <xsl:if test="@type = 'unnesting'"> - public edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory createUnnestingEvaluatorFactory(edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { + public org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory createUnnestingEvaluatorFactory(org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory[] args) { return new <xsl:value-of select="@class"/>(args); } </xsl:if> http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java b/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java index 37b529b..165b330 100644 --- a/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java +++ b/vxquery-core/src/test/java/org/apache/vxquery/xmlquery/query/SimpleXQueryTest.java @@ -29,7 +29,7 @@ import org.apache.vxquery.context.RootStaticContextImpl; import org.apache.vxquery.context.StaticContextImpl; import org.junit.Test; -import edu.uci.ics.hyracks.api.dataset.ResultSetId; +import org.apache.hyracks.api.dataset.ResultSetId; public class SimpleXQueryTest { @Test http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-server/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml index 4d5d9a1..04ea34a 100644 --- a/vxquery-server/pom.xml +++ b/vxquery-server/pom.xml @@ -51,11 +51,11 @@ <name>vxqueryshutdown</name> </program> <program> - <mainClass>edu.uci.ics.hyracks.control.cc.CCDriver</mainClass> + <mainClass>org.apache.hyracks.control.cc.CCDriver</mainClass> <name>vxquerycc</name> </program> <program> - <mainClass>edu.uci.ics.hyracks.control.nc.NCDriver</mainClass> + <mainClass>org.apache.hyracks.control.nc.NCDriver</mainClass> <name>vxquerync</name> </program> </programs> @@ -71,7 +71,6 @@ </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> - <version>2.5</version> <executions> <execution> <id>copy-scripts</id> @@ -107,7 +106,6 @@ </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> <executions> <execution> <configuration> @@ -146,12 +144,12 @@ </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java ---------------------------------------------------------------------- diff --git a/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java b/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java index 37fe4f6..ced608a 100644 --- a/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java +++ b/vxquery-server/src/main/java/org/apache/vxquery/cli/VXQueryClusterShutdown.java @@ -21,8 +21,8 @@ import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.Option; -import edu.uci.ics.hyracks.api.client.HyracksConnection; -import edu.uci.ics.hyracks.api.client.IHyracksClientConnection; +import org.apache.hyracks.api.client.HyracksConnection; +import org.apache.hyracks.api.client.IHyracksClientConnection; public class VXQueryClusterShutdown { /** http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml index 9e83fd7..59da063 100644 --- a/vxquery-xtest/pom.xml +++ b/vxquery-xtest/pom.xml @@ -136,27 +136,27 @@ </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-client</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/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 dea6b8d..b38f0ab 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 @@ -269,4 +269,4 @@ public abstract class AbstractTestCaseFactory { public void startPrefixMapping(String prefix, String uri) throws SAXException { } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java index 2a0982e..cf85d85 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ExpectedResult.java @@ -22,4 +22,4 @@ public class ExpectedResult { public ExpectedResult(String fileName) { this.fileName = fileName; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/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 bc17bba..6548287 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 @@ -358,4 +358,4 @@ class ResultManager { return start > 0 ? sb.toString() : s; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java index 03e47eb..dce59b0 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/LineFileReporterImpl.java @@ -38,4 +38,4 @@ public class LineFileReporterImpl implements ResultReporter { public void close() { out.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java index dcb1b7e..616a114 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java @@ -33,4 +33,4 @@ public class Main { xts.init(); xts.waitForCompletion(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java index b3dd60d..349f292 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/ResultReporter.java @@ -20,4 +20,4 @@ public interface ResultReporter { public void reportResult(TestCaseResult result); public void close(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/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 df18b53..6a79a4a 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 @@ -53,4 +53,4 @@ public class ServletReporterImpl extends AbstractHandler implements ResultReport public void close() { reporter.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java index fbfc566..b7295c7 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCase.java @@ -108,4 +108,4 @@ public class TestCase { buffer.append("}"); return buffer.toString(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/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 d168185..a948e23 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 @@ -37,4 +37,4 @@ public class TestCaseFactory extends AbstractTestCaseFactory { } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java index bb28177..86c8530 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestCaseResult.java @@ -218,4 +218,4 @@ public class TestCaseResult { private static final String RED = "#FF9900"; private static final String ORANGE = "#FFCC00"; private static final String GREEN = "#99CC00"; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/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 8ca43e2..d8543f5 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 @@ -36,22 +36,26 @@ import org.apache.vxquery.result.ResultUtils; import org.apache.vxquery.xmlquery.query.VXQueryCompilationListener; import org.apache.vxquery.xmlquery.query.XMLQueryCompiler; -import edu.uci.ics.hyracks.api.client.HyracksConnection; -import edu.uci.ics.hyracks.api.client.IHyracksClientConnection; -import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor; -import edu.uci.ics.hyracks.api.dataset.IHyracksDataset; -import edu.uci.ics.hyracks.api.dataset.IHyracksDatasetReader; -import edu.uci.ics.hyracks.api.dataset.ResultSetId; -import edu.uci.ics.hyracks.api.exceptions.HyracksException; -import edu.uci.ics.hyracks.api.job.JobFlag; -import edu.uci.ics.hyracks.api.job.JobId; -import edu.uci.ics.hyracks.api.job.JobSpecification; -import edu.uci.ics.hyracks.client.dataset.HyracksDataset; -import edu.uci.ics.hyracks.control.cc.ClusterControllerService; -import edu.uci.ics.hyracks.control.common.controllers.CCConfig; -import edu.uci.ics.hyracks.control.common.controllers.NCConfig; -import edu.uci.ics.hyracks.control.nc.NodeControllerService; -import edu.uci.ics.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor; +import org.apache.hyracks.api.client.HyracksConnection; +import org.apache.hyracks.api.client.IHyracksClientConnection; +import org.apache.hyracks.api.comm.FixedSizeFrame; +import org.apache.hyracks.api.comm.IFrame; +import org.apache.hyracks.api.comm.IFrameTupleAccessor; +import org.apache.hyracks.api.comm.VSizeFrame; +import org.apache.hyracks.api.dataset.IHyracksDataset; +import org.apache.hyracks.api.dataset.IHyracksDatasetReader; +import org.apache.hyracks.api.dataset.ResultSetId; +import org.apache.hyracks.api.exceptions.HyracksException; +import org.apache.hyracks.api.job.JobFlag; +import org.apache.hyracks.api.job.JobId; +import org.apache.hyracks.api.job.JobSpecification; +import org.apache.hyracks.client.dataset.HyracksDataset; +import org.apache.hyracks.control.cc.ClusterControllerService; +import org.apache.hyracks.control.common.controllers.CCConfig; +import org.apache.hyracks.control.common.controllers.NCConfig; +import org.apache.hyracks.control.nc.NodeControllerService; +import org.apache.hyracks.control.nc.resources.memory.FrameManager; +import org.apache.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor; public class TestRunner { private static final Pattern EMBEDDED_SYSERROR_PATTERN = Pattern @@ -116,9 +120,9 @@ public class TestRunner { opts.showOET, opts.showRP); XMLQueryCompiler compiler = new XMLQueryCompiler(listener, new String[] { "nc1" }, opts.frameSize); Reader in = new InputStreamReader(new FileInputStream(testCase.getXQueryFile()), "UTF-8"); - CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl( - RootStaticContextImpl.INSTANCE), new ResultSetId(testCase.getXQueryDisplayName().hashCode()), - testCase.getSourceFileMap()); + CompilerControlBlock ccb = new CompilerControlBlock( + new StaticContextImpl(RootStaticContextImpl.INSTANCE), + new ResultSetId(testCase.getXQueryDisplayName().hashCode()), testCase.getSourceFileMap()); compiler.compile(testCase.getXQueryDisplayName(), in, ccb, opts.optimizationLevel); JobSpecification spec = compiler.getModule().getHyracksJobSpecification(); in.close(); @@ -132,14 +136,14 @@ public class TestRunner { if (hds == null) { hds = new HyracksDataset(hcc, spec.getFrameSize(), opts.threads); } - ByteBuffer buffer = ByteBuffer.allocate(spec.getFrameSize()); + FrameManager resultDisplayFrameMgr = new FrameManager(spec.getFrameSize()); + IFrame frame = new VSizeFrame(resultDisplayFrameMgr); IHyracksDatasetReader reader = hds.createReader(jobId, ccb.getResultSetId()); - IFrameTupleAccessor frameTupleAccessor = new ResultFrameTupleAccessor(spec.getFrameSize()); - buffer.clear(); + IFrameTupleAccessor frameTupleAccessor = new ResultFrameTupleAccessor(); res.result = ""; - while (reader.read(buffer) > 0) { - buffer.clear(); - res.result += ResultUtils.getStringFromBuffer(buffer, frameTupleAccessor); + while (reader.read(frame) > 0) { + res.result += ResultUtils.getStringFromBuffer(frame.getBuffer(), frameTupleAccessor); + frame.getBuffer().clear(); } res.result.trim(); hcc.waitForCompletion(jobId); @@ -196,4 +200,4 @@ public class TestRunner { nc1.stop(); cc.stop(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java index 1910f84..197e9ae 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java @@ -56,4 +56,4 @@ public class TestRunnerFactory { public void close() throws Exception { tr.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java index c7c3b2c..530befc 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XMLFileReporterImpl.java @@ -48,4 +48,4 @@ public class XMLFileReporterImpl implements ResultReporter { out.println("</results>"); out.close(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java index 0e2a6e0..b216240 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java @@ -109,4 +109,4 @@ public class XTest { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/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 80fdd65..854cbf8 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 @@ -76,4 +76,4 @@ public class XTestOptions { @Option(name = "-showresult", usage = "Show query result.") boolean showResult; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java index 5d05035..63fce8b 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/util/DiskPerformance.java @@ -52,8 +52,8 @@ import org.apache.vxquery.xtest.util.tests.Stream; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; -import edu.uci.ics.hyracks.algebricks.common.utils.Pair; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.utils.Pair; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class DiskPerformance { XMLReader parser; @@ -77,7 +77,7 @@ public class DiskPerformance { List<SequenceType> childSeq = new ArrayList<SequenceType>(); NameTest nt = new NameTest(createUTF8String(""), createUTF8String("data")); childSeq.add(SequenceType.create(new ElementType(nt, AnyType.INSTANCE, false), Quantifier.QUANT_ONE)); - handler = new SAXContentHandler(false, new TreeNodeIdProvider((short) 0), null, null, childSeq); + handler = new SAXContentHandler(false, new TreeNodeIdProvider((short) 0), null, childSeq); parser.setContentHandler(handler); parser.setProperty("http://xml.org/sax/properties/lexical-handler";, handler); return new Pair<XMLReader, SAXContentHandler>(parser, handler); http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/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 e1ea215..fea80e8 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 @@ -41,4 +41,4 @@ public class JUnitTestCaseFactory extends AbstractTestCaseFactory { return testCases; } -} \ No newline at end of file +}
