http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java index 16bc20d..f4ed7de 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateSubplanForSinglePathsRule.java @@ -21,13 +21,13 @@ import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext; import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.cardinality.Cardinality; import org.apache.vxquery.compiler.rewriter.rules.util.CardinalityRuleToolbox; -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.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; /** * The rule searches for subplans that only have one path of execution.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java index 0acd154..3dc412f 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSequencesRule.java @@ -19,20 +19,20 @@ package org.apache.vxquery.compiler.rewriter.rules; import org.apache.commons.lang3.mutable.Mutable; import org.apache.vxquery.functions.BuiltinOperators; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -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.IOptimizationContext; -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.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -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.UnnestOperator; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +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.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +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.UnnestOperator; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; /** * The rule searches for unnest followed by an aggregate operator with a http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java index 193b53d..faf6e09 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/EliminateUnnestAggregateSubplanRule.java @@ -20,21 +20,21 @@ import org.apache.commons.lang3.mutable.Mutable; import org.apache.vxquery.compiler.rewriter.rules.util.OperatorToolbox; import org.apache.vxquery.functions.BuiltinOperators; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -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.IOptimizationContext; -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.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -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.SubplanOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +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.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +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.SubplanOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; /** * The rule searches for unnest followed by subplan with the root operator an http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java index 9daafed..c7dd2ee 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceCollectionRule.java @@ -23,13 +23,13 @@ import org.apache.vxquery.types.AnyItemType; import org.apache.vxquery.types.Quantifier; import org.apache.vxquery.types.SequenceType; -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.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; /** * Find the default query plan created for collection and updated it to use @@ -90,4 +90,4 @@ public class IntroduceCollectionRule extends AbstractCollectionRule { return false; } -} \ 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/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java index d6f302c..4343522 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/IntroduceTwoStepAggregateRule.java @@ -23,20 +23,20 @@ import org.apache.commons.lang3.mutable.Mutable; import org.apache.vxquery.functions.BuiltinFunctions; import org.apache.vxquery.functions.BuiltinOperators; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.common.utils.Pair; -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.IOptimizationContext; -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.expressions.AbstractFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.common.utils.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.IOptimizationContext; +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.expressions.AbstractFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; /** * The rule searches for aggregate operators with an aggregate function http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java index 6b052bc..3ad068d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushChildIntoDataScanRule.java @@ -28,16 +28,16 @@ import org.apache.vxquery.metadata.VXQueryCollectionDataSource; import org.apache.vxquery.metadata.VXQueryMetadataProvider; import org.apache.vxquery.types.ElementType; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -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.IOptimizationContext; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag; +import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; /** * The rule searches for an unnest operator immediately following a data scan http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java index 96b36a5..d713c59 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/PushFunctionsOntoEqJoinBranches.java @@ -22,22 +22,22 @@ import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; import org.apache.vxquery.compiler.rewriter.rules.util.ExpressionToolbox; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -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.IOptimizationContext; -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.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -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.AssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +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.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class PushFunctionsOntoEqJoinBranches implements IAlgebraicRewriteRule { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java index ba129c0..ee0032a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantBooleanExpressionsRule.java @@ -22,7 +22,7 @@ import org.apache.vxquery.types.BuiltinTypeRegistry; import org.apache.vxquery.types.Quantifier; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; /** * The rule searches for where the xquery boolean function is used. When the http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java index 339feea..d3e3c1d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantCastExpressionsRule.java @@ -19,7 +19,7 @@ package org.apache.vxquery.compiler.rewriter.rules; import org.apache.vxquery.functions.BuiltinOperators; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; /** * The rule searches for where the xquery cast function is used. When the http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java index 97f98f5..e779601 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantDataExpressionsRule.java @@ -19,7 +19,7 @@ package org.apache.vxquery.compiler.rewriter.rules; import org.apache.vxquery.functions.BuiltinFunctions; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; /** * The rule searches for where the xquery data function is used. When the http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java index 3700abf..1ae5b46 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantPromoteExpressionsRule.java @@ -20,7 +20,7 @@ import org.apache.vxquery.functions.BuiltinOperators; import org.apache.vxquery.types.BuiltinTypeRegistry; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; /** * The rule searches for where the xquery promote function is used. When the http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java index 60058bc..b7c5fea 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveRedundantTreatExpressionsRule.java @@ -20,7 +20,7 @@ import org.apache.vxquery.functions.BuiltinOperators; import org.apache.vxquery.runtime.functions.type.SequenceTypeMatcher; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; /** * The rule searches for where the xquery treat function is used. When the http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java index 43e2603..55c8de0 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedSortDistinctNodesRule.java @@ -30,22 +30,22 @@ import org.apache.vxquery.compiler.rewriter.rules.util.CardinalityRuleToolbox; import org.apache.vxquery.functions.BuiltinOperators; import org.apache.vxquery.functions.Function; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -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.IOptimizationContext; -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.expressions.AbstractFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -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.NestedTupleSourceOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; -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.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +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.expressions.AbstractFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +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.NestedTupleSourceOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; +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.rewriter.base.IAlgebraicRewriteRule; /** * The rule searches for where the xquery sort distinct function is used and http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java index ceab6a9..946f854 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/RemoveUnusedUnnestIterateRule.java @@ -21,20 +21,20 @@ import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.documentor import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenodes.UniqueNodes; import org.apache.vxquery.functions.BuiltinOperators; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -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.IOptimizationContext; -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.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +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.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; /** * The rule searches for an unnest operator (1) immediately following an unnest http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java index ba6c2c0..c3cee5e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ReplaceSourceMapInDocExpression.java @@ -35,18 +35,18 @@ import org.apache.vxquery.types.BuiltinTypeRegistry; import org.apache.vxquery.types.Quantifier; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -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.IOptimizationContext; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; -import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; +import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream; /** * The rule searches for where the function_doc1 function is in the plan in place of XQuery function. @@ -165,4 +165,4 @@ public class ReplaceSourceMapInDocExpression implements IAlgebraicRewriteRule { constantExpression.setValue(vxqcv); return true; } -} \ 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/compiler/rewriter/rules/SetCollectionDataSourceRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java index 496a99c..936a12a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetCollectionDataSourceRule.java @@ -19,9 +19,9 @@ package org.apache.vxquery.compiler.rewriter.rules; import org.apache.commons.lang3.mutable.Mutable; import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext; -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 org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; /** * Find the collection functions and generate the data source objects. http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java index b810e39..82be94c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/SetVariableIdContextRule.java @@ -18,13 +18,13 @@ package org.apache.vxquery.compiler.rewriter.rules; 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.operators.logical.AbstractAssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; /** * Set the default context for the variable id in the optimization context. http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java index 9847c7f..9ae19f5 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/ExtractFunctionsFromJoinConditionRule.java @@ -22,22 +22,22 @@ import java.util.List; 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.ILogicalExpression; -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.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.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -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.AssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +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.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; /** * Factors out function expressions from each comparison function or similarity function in join condition by assigning them to a variables, and replacing the function expressions with references to those variables. http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java index ca0bc1c..16e3e98 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/InlineNestedVariablesRule.java @@ -20,19 +20,19 @@ 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.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.IOptimizationContext; -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.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineVariablesRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +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.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; +import org.apache.hyracks.algebricks.rewriter.rules.InlineVariablesRule; /** * Modifies the InlineVariablesRule to also process nested plans. http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java index 94b809d..34b10d6 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/algebricksalternatives/MoveFreeVariableOperatorOutOfSubplanRule.java @@ -22,17 +22,17 @@ import java.util.Set; 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.ILogicalPlan; -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.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities; -import edu.uci.ics.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.AbstractDecorrelationRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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.IOptimizationContext; +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.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities; +import org.apache.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil; +import org.apache.hyracks.algebricks.rewriter.rules.AbstractDecorrelationRule; /** * The rule searches for operators that can be moved outside the subplan. http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java index fdf555f..3b5266d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/ConstantPropertyPropagationPolicy.java @@ -34,4 +34,4 @@ public class ConstantPropertyPropagationPolicy<P> implements IPropertyPropagatio return property; } -} \ 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/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java index ee17378..4d37b3b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/IPropertyPropagationPolicy.java @@ -22,4 +22,4 @@ public interface IPropertyPropagationPolicy<P> { public P propagate(List<P> argProperties); -} \ 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/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java index 5f4a382..4f0780a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/InputPropertyPropagationPolicy.java @@ -34,4 +34,4 @@ public class InputPropertyPropagationPolicy<P> implements IPropertyPropagationPo return argProperties.get(inputIndex); } -} \ 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/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java index d906f0d..c4288ac 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java @@ -21,4 +21,4 @@ public enum Cardinality { ONE, MANY; -} \ 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/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java index b142014..c01d5e6 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java @@ -21,4 +21,4 @@ public enum DocumentOrder { YES, NO; -} \ 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/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java index 572e3dc..a09b741 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java @@ -24,4 +24,4 @@ public class DocumentOrderNOPropagationPolicy extends ConstantPropertyPropagatio super(DocumentOrder.NO); } -} \ 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/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java index c72a736..9641de6 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java @@ -24,4 +24,4 @@ public class DocumentOrderYESPropagationPolicy extends ConstantPropertyPropagati super(DocumentOrder.YES); } -} \ 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/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java index fca5864..a0ea383 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java @@ -21,4 +21,4 @@ public enum UniqueNodes { YES, NO; -} \ 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/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java index 85d9856..a5b8ac1 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java @@ -24,4 +24,4 @@ public class UniqueNodesNOPropagationPolicy extends ConstantPropertyPropagationP super(UniqueNodes.NO); } -} \ 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/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java index 4c4b7b9..f21a5cc 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java @@ -24,4 +24,4 @@ public class UniqueNodesYESPropagationPolicy extends ConstantPropertyPropagation super(UniqueNodes.YES); } -} \ 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/compiler/rewriter/rules/util/CardinalityRuleToolbox.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java index 5b4594e..7744eb2 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java @@ -19,10 +19,10 @@ package org.apache.vxquery.compiler.rewriter.rules.util; import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext; import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.cardinality.Cardinality; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; public class CardinalityRuleToolbox { /** http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java index 7e916d7..10a8dca 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java @@ -29,18 +29,18 @@ import org.apache.vxquery.types.AnyNodeType; import org.apache.vxquery.types.Quantifier; import org.apache.vxquery.types.SequenceType; -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.LogicalExpressionTag; -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.ConstantExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; +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.LogicalExpressionTag; +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.ConstantExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; +import org.apache.hyracks.data.std.primitive.IntegerPointable; public class ExpressionToolbox { public static Mutable<ILogicalExpression> findVariableExpression(Mutable<ILogicalExpression> mutableLe, http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java index 78cd80f..2c57c32 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java @@ -21,17 +21,17 @@ import java.util.List; import org.apache.commons.lang3.mutable.Mutable; -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.LogicalOperatorTag; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator; -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.AbstractScanOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SelectOperator; +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.LogicalOperatorTag; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator; public class OperatorToolbox { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java index 84bde33..3d763d5 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java @@ -33,4 +33,4 @@ public class DefaultDocumentURIResolverImpl implements DocumentURIResolver { if (! file.isAbsolute()) file = new File(base + "/" + href); return new FileInputStream(file); } -} \ 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/context/DelegatingStaticContextImpl.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java index dec7d81..bffcd25 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java @@ -295,4 +295,4 @@ public abstract class DelegatingStaticContextImpl implements StaticContext { public void setOrderingModeProperty(OrderingModeProperty orderingMode) { parent.setOrderingModeProperty(orderingMode); } -} \ 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/context/DocumentURIResolver.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java index de68016..5df5a86 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java @@ -21,4 +21,4 @@ import java.io.InputStream; public interface DocumentURIResolver { public InputStream resolveDocumentURI(String base, String href) throws IOException; -} \ 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/context/DynamicContext.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java index da85b33..2b3ec8a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java @@ -18,8 +18,8 @@ package org.apache.vxquery.context; import javax.xml.namespace.QName; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IValueReference; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IValueReference; public interface DynamicContext { public IDynamicContextFactory createFactory(); @@ -33,4 +33,4 @@ public interface DynamicContext { public void bindVariable(QName var, IValueReference vReference); public void lookupVariable(QName var, IPointable value); -} \ 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/context/DynamicContextImpl.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java index 9f59644..6a2a930 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java @@ -21,9 +21,9 @@ import java.util.Map; import javax.xml.namespace.QName; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IValueReference; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IValueReference; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class DynamicContextImpl implements DynamicContext { private StaticContext sCtx; @@ -82,4 +82,4 @@ public class DynamicContextImpl implements DynamicContext { Map<QName, ArrayBackedValueStorage> getVariableMap() { return variables; } -} \ 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/context/DynamicContextImplFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java index a8fd821..a30c5ad 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java @@ -23,9 +23,9 @@ import javax.xml.namespace.QName; import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable; -import edu.uci.ics.hyracks.api.context.IHyracksJobletContext; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.api.context.IHyracksJobletContext; +import org.apache.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; class DynamicContextImplFactory implements IDynamicContextFactory { private static final long serialVersionUID = 1L; @@ -91,4 +91,4 @@ class DynamicContextImplFactory implements IDynamicContextFactory { return new DynamicContextImplFactory(scFactory, currentDateTime, variableNames, valueOffsets, Arrays.copyOfRange(abvs.getByteArray(), abvs.getStartOffset(), abvs.getLength())); } -} \ 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/context/IDynamicContextFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java index c004357..2e8a7b3 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java @@ -18,8 +18,8 @@ package org.apache.vxquery.context; import java.io.Serializable; -import edu.uci.ics.hyracks.api.context.IHyracksJobletContext; +import org.apache.hyracks.api.context.IHyracksJobletContext; public interface IDynamicContextFactory extends Serializable { public DynamicContext createDynamicContext(IHyracksJobletContext ctx); -} \ 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/context/IStaticContextFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java index bf46935..c74ddd7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java @@ -20,4 +20,4 @@ import java.io.Serializable; public interface IStaticContextFactory extends Serializable { public StaticContext createStaticContext(); -} \ 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/context/ModuleURIResolver.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java b/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java index 9b5d927..20ca42a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java @@ -20,4 +20,4 @@ import java.io.InputStream; public interface ModuleURIResolver { public InputStream[] resolve(String moduleUri, String baseUri, String[] locationHints); -} \ 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/context/RootStaticContextFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java index 48ddbcf..b766f05 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java @@ -28,4 +28,4 @@ public class RootStaticContextFactory implements IStaticContextFactory { public StaticContext createStaticContext() { return RootStaticContextImpl.INSTANCE; } -} \ 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/context/RootStaticContextImpl.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java index a219dab..cd80824 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java @@ -218,4 +218,4 @@ public final class RootStaticContextImpl extends StaticContextImpl { public IStaticContextFactory createFactory() { return RootStaticContextFactory.INSTANCE; } -} \ 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/context/StaticContext.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java index 31693ee..815cf78 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java @@ -162,4 +162,4 @@ public interface StaticContext { } public IStaticContextFactory createFactory(); -} \ 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/context/StaticContextImpl.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java index 09cfaff..c3aeda9 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java @@ -654,4 +654,4 @@ public class StaticContextImpl implements StaticContext { } } } -} \ 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/context/StaticContextImplFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java index 879c84d..12d3c33 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java @@ -47,4 +47,4 @@ class StaticContextImplFactory implements IStaticContextFactory { return new StaticContextImplFactory(parentSCFactory, new ArrayList<SequenceType>( staticContextImpl.getSequenceTypeList())); } -} \ 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/context/ThinStaticContextImpl.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java index ea87dda..5873fcb 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java @@ -47,4 +47,4 @@ public class ThinStaticContextImpl extends DelegatingStaticContextImpl { public IStaticContextFactory createFactory() { return ThinStaticContextImplFactory.createInstance(this); } -} \ 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/context/ThinStaticContextImplFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java index 079f4af..b0fe514 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java @@ -34,4 +34,4 @@ class ThinStaticContextImplFactory implements IStaticContextFactory { IStaticContextFactory delegateSCFactory = staticContextImpl.getParent().createFactory(); return new ThinStaticContextImplFactory(delegateSCFactory); } -} \ 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/context/XQueryVariable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java b/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java index cdd79b2..15c7fc5 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java @@ -20,7 +20,7 @@ import javax.xml.namespace.QName; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; public class XQueryVariable { private final QName name; @@ -46,4 +46,4 @@ public class XQueryVariable { public LogicalVariable getLogicalVariable() { return var; } -} \ 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/datamodel/accessors/PointableCache.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java index c362e7d..adbe097 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java @@ -19,7 +19,7 @@ package org.apache.vxquery.datamodel.accessors; import java.util.ArrayList; import java.util.List; -import edu.uci.ics.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointable; public class PointableCache<T extends IPointable> { private final List<T> list; @@ -38,4 +38,4 @@ public class PointableCache<T extends IPointable> { public void giveBack(T pointable) { list.add(pointable); } -} \ 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/datamodel/accessors/PointablePool.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java index 4eccf33..1a85781 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java @@ -19,8 +19,8 @@ package org.apache.vxquery.datamodel.accessors; import java.util.HashMap; import java.util.Map; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; public class PointablePool { private final Map<Class<? extends IPointable>, IPointableFactory> pfMap; @@ -53,4 +53,4 @@ public class PointablePool { PointableCache<T> pc = (PointableCache<T>) pcMap.get(pointable.getClass()); pc.giveBack(pointable); } -} \ 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/datamodel/accessors/PointablePoolFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java index 7a5b6e8..9ec9bab 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java @@ -31,15 +31,15 @@ import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable; import org.apache.vxquery.datamodel.accessors.nodes.PINodePointable; import org.apache.vxquery.datamodel.accessors.nodes.TextOrCommentNodePointable; -import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.FloatPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.primitive.ShortPointable; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.data.std.primitive.BooleanPointable; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.primitive.ShortPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; public class PointablePoolFactory { public static final PointablePoolFactory INSTANCE = new PointablePoolFactory(); @@ -79,4 +79,4 @@ public class PointablePoolFactory { return pp; } -} \ No newline at end of file +}
