http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignBelowUnionAllRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignBelowUnionAllRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignBelowUnionAllRule.java index bbb01dd..43c58e2 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignBelowUnionAllRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignBelowUnionAllRule.java @@ -110,8 +110,8 @@ public class PushAssignBelowUnionAllRule implements IAlgebraicRewriteRule { for (int j = 0; j < assignVars.size(); j++) { LogicalVariable first = newAssignOps[0].getVariables().get(j); LogicalVariable second = newAssignOps[1].getVariables().get(j); - Triple<LogicalVariable, LogicalVariable, LogicalVariable> varMapping = new Triple<LogicalVariable, LogicalVariable, LogicalVariable>( - first, second, assignVars.get(j)); + Triple<LogicalVariable, LogicalVariable, LogicalVariable> varMapping = + new Triple<LogicalVariable, LogicalVariable, LogicalVariable>(first, second, assignVars.get(j)); unionOp.getVariableMappings().add(varMapping); } context.computeAndSetTypeEnvironmentForOperator(unionOp); @@ -127,7 +127,7 @@ public class PushAssignBelowUnionAllRule implements IAlgebraicRewriteRule { private AssignOperator createAssignBelowUnionAllBranch(UnionAllOperator unionOp, int inputIndex, AssignOperator originalAssignOp, Set<LogicalVariable> assignUsedVars, IOptimizationContext context) - throws AlgebricksException { + throws AlgebricksException { AssignOperator newAssignOp = cloneAssignOperator(originalAssignOp, context); newAssignOp.getInputs() .add(new MutableObject<ILogicalOperator>(unionOp.getInputs().get(inputIndex).getValue()));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignDownThroughProductRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignDownThroughProductRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignDownThroughProductRule.java index f3f0e02..edd7e23 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignDownThroughProductRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushAssignDownThroughProductRule.java @@ -37,7 +37,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class PushAssignDownThroughProductRule implements IAlgebraicRewriteRule { @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushFunctionsBelowJoin.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushFunctionsBelowJoin.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushFunctionsBelowJoin.java index c04a9d5..d7090d2 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushFunctionsBelowJoin.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushFunctionsBelowJoin.java @@ -84,7 +84,8 @@ public class PushFunctionsBelowJoin implements IAlgebraicRewriteRule { } @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushGroupByIntoSortRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushGroupByIntoSortRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushGroupByIntoSortRule.java index 7ea1327..192e318 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushGroupByIntoSortRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushGroupByIntoSortRule.java @@ -46,7 +46,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class PushGroupByIntoSortRule implements IAlgebraicRewriteRule { @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { return false; } @@ -67,8 +68,8 @@ public class PushGroupByIntoSortRule implements IAlgebraicRewriteRule { Mutable<ILogicalOperator> op2Ref = op.getInputs().get(0).getValue().getInputs().get(0); AbstractLogicalOperator op2 = (AbstractLogicalOperator) op2Ref.getValue(); if (op2.getPhysicalOperator().getOperatorTag() == PhysicalOperatorTag.STABLE_SORT) { - AbstractStableSortPOperator sortPhysicalOperator = (AbstractStableSortPOperator) op2 - .getPhysicalOperator(); + AbstractStableSortPOperator sortPhysicalOperator = + (AbstractStableSortPOperator) op2.getPhysicalOperator(); if (groupByOperator.getNestedPlans().size() != 1) { //Sort group-by currently works only for one nested plan with one root containing //an aggregate and a nested-tuple-source. @@ -88,13 +89,14 @@ public class PushGroupByIntoSortRule implements IAlgebraicRewriteRule { continue; } AggregateOperator aggOp = (AggregateOperator) r0.getValue(); - AbstractLogicalOperator aggInputOp = (AbstractLogicalOperator) aggOp.getInputs().get(0) - .getValue(); + AbstractLogicalOperator aggInputOp = + (AbstractLogicalOperator) aggOp.getInputs().get(0).getValue(); if (aggInputOp.getOperatorTag() != LogicalOperatorTag.NESTEDTUPLESOURCE) { continue; } - boolean hasIntermediateAggregate = generateMergeAggregationExpressions(groupByOperator, context); + boolean hasIntermediateAggregate = + generateMergeAggregationExpressions(groupByOperator, context); if (!hasIntermediateAggregate) { continue; } @@ -132,8 +134,8 @@ public class PushGroupByIntoSortRule implements IAlgebraicRewriteRule { "External/sort group-by currently works only for one nested plan with one root containing" + "an aggregate and a nested-tuple-source."); } - IMergeAggregationExpressionFactory mergeAggregationExpressionFactory = context - .getMergeAggregationExpressionFactory(); + IMergeAggregationExpressionFactory mergeAggregationExpressionFactory = + context.getMergeAggregationExpressionFactory(); Mutable<ILogicalOperator> r0 = p0.getRoots().get(0); AggregateOperator aggOp = (AggregateOperator) r0.getValue(); List<Mutable<ILogicalExpression>> aggFuncRefs = aggOp.getExpressions(); @@ -141,8 +143,8 @@ public class PushGroupByIntoSortRule implements IAlgebraicRewriteRule { int n = aggOp.getExpressions().size(); List<Mutable<ILogicalExpression>> mergeExpressionRefs = new ArrayList<Mutable<ILogicalExpression>>(); for (int i = 0; i < n; i++) { - ILogicalExpression mergeExpr = mergeAggregationExpressionFactory.createMergeAggregation( - originalAggVars.get(i), aggFuncRefs.get(i).getValue(), context); + ILogicalExpression mergeExpr = mergeAggregationExpressionFactory + .createMergeAggregation(originalAggVars.get(i), aggFuncRefs.get(i).getValue(), context); if (mergeExpr == null) { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushMapOperatorDownThroughProductRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushMapOperatorDownThroughProductRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushMapOperatorDownThroughProductRule.java index f71af5a..3181459 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushMapOperatorDownThroughProductRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushMapOperatorDownThroughProductRule.java @@ -53,7 +53,7 @@ public class PushMapOperatorDownThroughProductRule implements IAlgebraicRewriteR if (!OperatorPropertiesUtil.isMovable(op1)) { return false; - }; + } ; Mutable<ILogicalOperator> op2Ref = op1.getInputs().get(0); AbstractLogicalOperator op2 = (AbstractLogicalOperator) op2Ref.getValue(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushNestedOrderByUnderPreSortedGroupByRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushNestedOrderByUnderPreSortedGroupByRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushNestedOrderByUnderPreSortedGroupByRule.java index fc7b98e..aa58985 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushNestedOrderByUnderPreSortedGroupByRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushNestedOrderByUnderPreSortedGroupByRule.java @@ -45,7 +45,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class PushNestedOrderByUnderPreSortedGroupByRule implements IAlgebraicRewriteRule { @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushProjectIntoDataSourceScanRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushProjectIntoDataSourceScanRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushProjectIntoDataSourceScanRule.java index e05619f..281093a 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushProjectIntoDataSourceScanRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushProjectIntoDataSourceScanRule.java @@ -32,7 +32,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class PushProjectIntoDataSourceScanRule implements IAlgebraicRewriteRule { @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushSubplanWithAggregateDownThroughProductRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushSubplanWithAggregateDownThroughProductRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushSubplanWithAggregateDownThroughProductRule.java index 54c5728..d135846 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushSubplanWithAggregateDownThroughProductRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushSubplanWithAggregateDownThroughProductRule.java @@ -41,7 +41,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class PushSubplanWithAggregateDownThroughProductRule implements IAlgebraicRewriteRule { @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughProductRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughProductRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughProductRule.java index 2da1343..4c2c4da 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughProductRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughProductRule.java @@ -37,7 +37,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class PushUnnestDownThroughProductRule implements IAlgebraicRewriteRule { @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughUnionRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughUnionRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughUnionRule.java index b6556e9..3ef37cd 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughUnionRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PushUnnestDownThroughUnionRule.java @@ -79,11 +79,11 @@ public class PushUnnestDownThroughUnionRule implements IAlgebraicRewriteRule { } LogicalVariable unnestVar1 = context.newVar(); - UnnestOperator unnest1 = new UnnestOperator(unnestVar1, new MutableObject<ILogicalExpression>(unnestOpRef - .getExpressionRef().getValue().cloneExpression())); + UnnestOperator unnest1 = new UnnestOperator(unnestVar1, + new MutableObject<ILogicalExpression>(unnestOpRef.getExpressionRef().getValue().cloneExpression())); LogicalVariable unnestVar2 = context.newVar(); - UnnestOperator unnest2 = new UnnestOperator(unnestVar2, new MutableObject<ILogicalExpression>(unnestOpRef - .getExpressionRef().getValue().cloneExpression())); + UnnestOperator unnest2 = new UnnestOperator(unnestVar2, + new MutableObject<ILogicalExpression>(unnestOpRef.getExpressionRef().getValue().cloneExpression())); //Getting the two topmost branched and adding them as an input to the unnests: Mutable<ILogicalOperator> branch1 = unionAbstractOp.getInputs().get(0); @@ -110,10 +110,11 @@ public class PushUnnestDownThroughUnionRule implements IAlgebraicRewriteRule { context.computeAndSetTypeEnvironmentForOperator(unnest2); //creating a new union operator with the updated logical variables - List<Triple<LogicalVariable, LogicalVariable, LogicalVariable>> varMap = new ArrayList<Triple<LogicalVariable, LogicalVariable, LogicalVariable>>( - 1); - Triple<LogicalVariable, LogicalVariable, LogicalVariable> union_triple_vars = new Triple<LogicalVariable, LogicalVariable, LogicalVariable>( - unnestVar1, unnestVar2, unnestOpRef.getVariables().get(0)); + List<Triple<LogicalVariable, LogicalVariable, LogicalVariable>> varMap = + new ArrayList<Triple<LogicalVariable, LogicalVariable, LogicalVariable>>(1); + Triple<LogicalVariable, LogicalVariable, LogicalVariable> union_triple_vars = + new Triple<LogicalVariable, LogicalVariable, LogicalVariable>(unnestVar1, unnestVar2, + unnestOpRef.getVariables().get(0)); varMap.add(union_triple_vars); UnionAllOperator unionOpFinal = new UnionAllOperator(varMap); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ReinferAllTypesRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ReinferAllTypesRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ReinferAllTypesRule.java index b43363a..bf649ab 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ReinferAllTypesRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ReinferAllTypesRule.java @@ -37,7 +37,8 @@ public class ReinferAllTypesRule implements IAlgebraicRewriteRule { } @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { if (context.checkIfInDontApplySet(this, opRef.getValue())) { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantProjectionRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantProjectionRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantProjectionRule.java index 38e97d7..fbaab78 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantProjectionRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantProjectionRule.java @@ -53,7 +53,8 @@ public class RemoveRedundantProjectionRule implements IAlgebraicRewriteRule { } @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { AbstractLogicalOperator op1 = (AbstractLogicalOperator) opRef.getValue(); if (op1.getOperatorTag() == LogicalOperatorTag.PROJECT) { Mutable<ILogicalOperator> opRef2 = op1.getInputs().get(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantVariablesRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantVariablesRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantVariablesRule.java index 2f0913b..5386193 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantVariablesRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveRedundantVariablesRule.java @@ -69,7 +69,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class RemoveRedundantVariablesRule implements IAlgebraicRewriteRule { private final VariableSubstitutionVisitor substVisitor = new VariableSubstitutionVisitor(); - private final Map<LogicalVariable, List<LogicalVariable>> equivalentVarsMap = new HashMap<LogicalVariable, List<LogicalVariable>>(); + private final Map<LogicalVariable, List<LogicalVariable>> equivalentVarsMap = + new HashMap<LogicalVariable, List<LogicalVariable>>(); @Override public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnnecessarySortMergeExchange.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnnecessarySortMergeExchange.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnnecessarySortMergeExchange.java index 84d7c9d..e42c067 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnnecessarySortMergeExchange.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnnecessarySortMergeExchange.java @@ -110,8 +110,8 @@ public class RemoveUnnecessarySortMergeExchange implements IAlgebraicRewriteRule for (OrderColumn oc : sme.getSortColumns()) { ocList.add(oc); } - HashPartitionMergeExchangePOperator hpme = new HashPartitionMergeExchangePOperator(ocList, - hpe.getHashFields(), hpe.getDomain()); + HashPartitionMergeExchangePOperator hpme = + new HashPartitionMergeExchangePOperator(ocList, hpe.getHashFields(), hpe.getDomain()); op1.setPhysicalOperator(hpme); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnusedAssignAndAggregateRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnusedAssignAndAggregateRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnusedAssignAndAggregateRule.java index 5bf4e68..e197814 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnusedAssignAndAggregateRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/RemoveUnusedAssignAndAggregateRule.java @@ -126,8 +126,8 @@ public class RemoveUnusedAssignAndAggregateRule implements IAlgebraicRewriteRule // since we are sure that the output of UNIONALL operator is used // afterwards. if (opRef.getValue().getOperatorTag() == LogicalOperatorTag.UNIONALL) { - Iterator<Triple<LogicalVariable, LogicalVariable, LogicalVariable>> iter = ((UnionAllOperator) opRef - .getValue()).getVariableMappings().iterator(); + Iterator<Triple<LogicalVariable, LogicalVariable, LogicalVariable>> iter = + ((UnionAllOperator) opRef.getValue()).getVariableMappings().iterator(); while (iter.hasNext()) { Triple<LogicalVariable, LogicalVariable, LogicalVariable> varMapping = iter.next(); survivedUnionSourceVarSet.add(varMapping.first); @@ -240,8 +240,8 @@ public class RemoveUnusedAssignAndAggregateRule implements IAlgebraicRewriteRule } private boolean removeUnusedVarsFromUnionAll(UnionAllOperator unionOp, Set<LogicalVariable> toRemove) { - Iterator<Triple<LogicalVariable, LogicalVariable, LogicalVariable>> iter = unionOp.getVariableMappings() - .iterator(); + Iterator<Triple<LogicalVariable, LogicalVariable, LogicalVariable>> iter = + unionOp.getVariableMappings().iterator(); boolean modified = false; if (toRemove != null && !toRemove.isEmpty()) { while (iter.hasNext()) { @@ -361,8 +361,8 @@ public class RemoveUnusedAssignAndAggregateRule implements IAlgebraicRewriteRule } else { // A decor var mapping can have a variable reference expression without a new variable // definition, which is for rebinding the referred variable. - VariableReferenceExpression varExpr = (VariableReferenceExpression) decorMapping.second - .getValue(); + VariableReferenceExpression varExpr = + (VariableReferenceExpression) decorMapping.second.getValue(); LogicalVariable reboundDecorVar = varExpr.getVariableReference(); assignVarsSetInThisOp.add(reboundDecorVar); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/SetAlgebricksPhysicalOperatorsRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/SetAlgebricksPhysicalOperatorsRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/SetAlgebricksPhysicalOperatorsRule.java index 84961d6..5b6285a 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/SetAlgebricksPhysicalOperatorsRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/SetAlgebricksPhysicalOperatorsRule.java @@ -172,8 +172,7 @@ public class SetAlgebricksPhysicalOperatorsRule implements IAlgebraicRewriteRule boolean hasIntermediateAgg = generateMergeAggregationExpressions(gby, context); if (hasIntermediateAgg) { ExternalGroupByPOperator externalGby = new ExternalGroupByPOperator( - gby.getGroupByList(), - physicalOptimizationConfig.getMaxFramesForGroupBy(), + gby.getGroupByList(), physicalOptimizationConfig.getMaxFramesForGroupBy(), (long) physicalOptimizationConfig.getMaxFramesForGroupBy() * physicalOptimizationConfig.getFrameSize()); op.setPhysicalOperator(externalGby); @@ -354,8 +353,9 @@ public class SetAlgebricksPhysicalOperatorsRule implements IAlgebraicRewriteRule prevSecondaryKeys = new ArrayList<LogicalVariable>(); getKeys(opInsDel.getPrevSecondaryKeyExprs(), prevSecondaryKeys); if (opInsDel.getPrevAdditionalFilteringExpression() != null) { - prevAdditionalFilteringKey = ((VariableReferenceExpression) (opInsDel - .getPrevAdditionalFilteringExpression()).getValue()).getVariableReference(); + prevAdditionalFilteringKey = + ((VariableReferenceExpression) (opInsDel.getPrevAdditionalFilteringExpression()) + .getValue()).getVariableReference(); } } op.setPhysicalOperator(new IndexInsertDeleteUpsertPOperator(primaryKeys, secondaryKeys, @@ -441,8 +441,8 @@ public class SetAlgebricksPhysicalOperatorsRule implements IAlgebraicRewriteRule "External group-by currently works only for one nested plan with one root containing" + "an aggregate and a nested-tuple-source."); } - IMergeAggregationExpressionFactory mergeAggregationExpressionFactory = context - .getMergeAggregationExpressionFactory(); + IMergeAggregationExpressionFactory mergeAggregationExpressionFactory = + context.getMergeAggregationExpressionFactory(); Mutable<ILogicalOperator> r0 = p0.getRoots().get(0); AbstractLogicalOperator r0Logical = (AbstractLogicalOperator) r0.getValue(); if (r0Logical.getOperatorTag() != LogicalOperatorTag.AGGREGATE) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanRule.java index 32c7e03..4cd15a0 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanRule.java @@ -74,8 +74,8 @@ public class EliminateSubplanRule implements IAlgebraicRewriteRule { private boolean elimOneSubplanWithNoFreeVars(Mutable<ILogicalOperator> opRef) { SubplanOperator subplan = (SubplanOperator) opRef.getValue(); - AbstractLogicalOperator rootOp = (AbstractLogicalOperator) subplan.getNestedPlans().get(0).getRoots().get(0) - .getValue(); + AbstractLogicalOperator rootOp = + (AbstractLogicalOperator) subplan.getNestedPlans().get(0).getRoots().get(0).getValue(); if (rootOp.getOperatorTag() == LogicalOperatorTag.EMPTYTUPLESOURCE || rootOp.getOperatorTag() == LogicalOperatorTag.NESTEDTUPLESOURCE) { opRef.setValue(subplan.getInputs().get(0).getValue()); @@ -115,8 +115,8 @@ public class EliminateSubplanRule implements IAlgebraicRewriteRule { if (topOp == null) { topOp = r.getValue(); } else { - InnerJoinOperator j = new InnerJoinOperator( - new MutableObject<ILogicalExpression>(ConstantExpression.TRUE)); + InnerJoinOperator j = + new InnerJoinOperator(new MutableObject<ILogicalExpression>(ConstantExpression.TRUE)); j.getInputs().add(new MutableObject<ILogicalOperator>(topOp)); j.getInputs().add(r); ctx.setOutputTypeEnvironment(j, j.computeOutputTypeEnvironment(ctx)); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanWithInputCardinalityOneRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanWithInputCardinalityOneRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanWithInputCardinalityOneRule.java index 607ea1f..e2576ba 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanWithInputCardinalityOneRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/EliminateSubplanWithInputCardinalityOneRule.java @@ -122,8 +122,8 @@ public class EliminateSubplanWithInputCardinalityOneRule implements IAlgebraicRe // Replaces all Nts' in the nested plan with the Subplan input operator or its deep copy. ILogicalOperator topOperator = rootRefs.get(0).getValue(); - ReplaceNtsWithSubplanInputOperatorVisitor visitor = new ReplaceNtsWithSubplanInputOperatorVisitor(context, - subplan); + ReplaceNtsWithSubplanInputOperatorVisitor visitor = + new ReplaceNtsWithSubplanInputOperatorVisitor(context, subplan); ILogicalOperator newTopOperator = topOperator.accept(visitor, null); currentOpRef.setValue(newTopOperator); OperatorManipulationUtil.computeTypeEnvironmentBottomUp(newTopOperator, context); @@ -168,7 +168,7 @@ public class EliminateSubplanWithInputCardinalityOneRule implements IAlgebraicRe */ private void isCardinalityOne(Mutable<ILogicalOperator> opRef, Set<LogicalVariable> freeVars, Set<LogicalVariable> varsWithCardinalityOne, Set<LogicalVariable> varsLiveAtUnnestAndJoin) - throws AlgebricksException { + throws AlgebricksException { AbstractLogicalOperator operator = (AbstractLogicalOperator) opRef.getValue(); List<LogicalVariable> liveVars = new ArrayList<>(); VariableUtilities.getLiveVariables(operator, liveVars); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java index 942f181..c4ea604 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java @@ -236,8 +236,8 @@ public class IntroduceGroupByForSubplanRule implements IAlgebraicRewriteRule { } if (testForNull == null) { testForNull = context.newVar(); - AssignOperator tmpAsgn = new AssignOperator(testForNull, - new MutableObject<ILogicalExpression>(ConstantExpression.TRUE)); + AssignOperator tmpAsgn = + new AssignOperator(testForNull, new MutableObject<ILogicalExpression>(ConstantExpression.TRUE)); tmpAsgn.getInputs().add(new MutableObject<ILogicalOperator>(rightRef.getValue())); rightRef.setValue(tmpAsgn); context.computeAndSetTypeEnvironmentForOperator(tmpAsgn); @@ -247,10 +247,10 @@ public class IntroduceGroupByForSubplanRule implements IAlgebraicRewriteRule { ILogicalExpression isNullTest = new ScalarFunctionCallExpression(finfoEq, new MutableObject<ILogicalExpression>(new VariableReferenceExpression(testForNull))); IFunctionInfo finfoNot = context.getMetadataProvider().lookupFunction(AlgebricksBuiltinFunctions.NOT); - ScalarFunctionCallExpression nonNullTest = new ScalarFunctionCallExpression(finfoNot, - new MutableObject<ILogicalExpression>(isNullTest)); - SelectOperator selectNonNull = new SelectOperator(new MutableObject<ILogicalExpression>(nonNullTest), false, - null); + ScalarFunctionCallExpression nonNullTest = + new ScalarFunctionCallExpression(finfoNot, new MutableObject<ILogicalExpression>(isNullTest)); + SelectOperator selectNonNull = + new SelectOperator(new MutableObject<ILogicalExpression>(nonNullTest), false, null); GroupByOperator g = new GroupByOperator(); Mutable<ILogicalOperator> newSubplanRef = new MutableObject<ILogicalOperator>(subplan); NestedTupleSourceOperator nts = new NestedTupleSourceOperator(new MutableObject<ILogicalOperator>(g)); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/MoveFreeVariableOperatorOutOfSubplanRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/MoveFreeVariableOperatorOutOfSubplanRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/MoveFreeVariableOperatorOutOfSubplanRule.java index fa893d5..94cae74 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/MoveFreeVariableOperatorOutOfSubplanRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/MoveFreeVariableOperatorOutOfSubplanRule.java @@ -125,7 +125,7 @@ public class MoveFreeVariableOperatorOutOfSubplanRule extends AbstractDecorrelat LogicalOperatorTag operatorTag = currentOperator.getOperatorTag(); if (operatorTag == LogicalOperatorTag.AGGREGATE || operatorTag == LogicalOperatorTag.RUNNINGAGGREGATE || operatorTag == LogicalOperatorTag.GROUP) { - return false; + return false; } if (operatorTag == LogicalOperatorTag.PROJECT) { Set<LogicalVariable> producedVars = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/NestedSubplanToJoinRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/NestedSubplanToJoinRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/NestedSubplanToJoinRule.java index 35c7e4e..d9acf53 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/NestedSubplanToJoinRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/NestedSubplanToJoinRule.java @@ -109,8 +109,8 @@ public class NestedSubplanToJoinRule implements IAlgebraicRewriteRule { **/ Mutable<ILogicalExpression> expr = new MutableObject<ILogicalExpression>(ConstantExpression.TRUE); Mutable<ILogicalOperator> nestedRootRef = nestedRoots.get(0); - ILogicalOperator join = new InnerJoinOperator(expr, new MutableObject<ILogicalOperator>(subplanInput), - nestedRootRef); + ILogicalOperator join = + new InnerJoinOperator(expr, new MutableObject<ILogicalOperator>(subplanInput), nestedRootRef); /** rewrite the nested tuple source to be empty tuple source */ rewriteNestedTupleSource(nestedRootRef, context); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/PushSubplanIntoGroupByRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/PushSubplanIntoGroupByRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/PushSubplanIntoGroupByRule.java index af95ecd..9d3b311 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/PushSubplanIntoGroupByRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/PushSubplanIntoGroupByRule.java @@ -154,8 +154,8 @@ public class PushSubplanIntoGroupByRule implements IAlgebraicRewriteRule { // Sets the nts for a original subplan. Mutable<ILogicalOperator> originalGbyRootOpRef = gbyNestedPlan.getRoots().get(rootIndex); Mutable<ILogicalOperator> originalGbyNtsRef = downToNts(originalGbyRootOpRef); - NestedTupleSourceOperator originalNts = (NestedTupleSourceOperator) originalGbyNtsRef - .getValue(); + NestedTupleSourceOperator originalNts = + (NestedTupleSourceOperator) originalGbyNtsRef.getValue(); originalNts.setDataSourceReference(new MutableObject<>(gby)); // Pushes a new subplan if possible. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/ReplaceNtsWithSubplanInputOperatorVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/ReplaceNtsWithSubplanInputOperatorVisitor.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/ReplaceNtsWithSubplanInputOperatorVisitor.java index 080828d..35aa984 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/ReplaceNtsWithSubplanInputOperatorVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/ReplaceNtsWithSubplanInputOperatorVisitor.java @@ -141,8 +141,8 @@ class ReplaceNtsWithSubplanInputOperatorVisitor implements IQueryOperatorVisitor isOriginalCopyUsed = true; return subplanInputOperator; } - LogicalOperatorDeepCopyWithNewVariablesVisitor visitor = new LogicalOperatorDeepCopyWithNewVariablesVisitor(ctx, - ctx); + LogicalOperatorDeepCopyWithNewVariablesVisitor visitor = + new LogicalOperatorDeepCopyWithNewVariablesVisitor(ctx, ctx); ILogicalOperator copiedSubplanInputOperator = visitor.deepCopy(subplanInputOperator); varMap.putAll(visitor.getInputToOutputVariableMapping()); return copiedSubplanInputOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/SubplanOutOfGroupRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/SubplanOutOfGroupRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/SubplanOutOfGroupRule.java index 049e853..b9b2cee 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/SubplanOutOfGroupRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/SubplanOutOfGroupRule.java @@ -51,7 +51,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class SubplanOutOfGroupRule implements IAlgebraicRewriteRule { @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/PhysicalOptimizationsUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/PhysicalOptimizationsUtil.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/PhysicalOptimizationsUtil.java index 99480bf..15ae32a 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/PhysicalOptimizationsUtil.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/PhysicalOptimizationsUtil.java @@ -41,15 +41,16 @@ public class PhysicalOptimizationsUtil { visitOperatorAndItsDescendants(op, visitor, ctx); } - public static <R> void visitOperatorAndItsDescendants(ILogicalOperator op, ILogicalOperatorVisitor<R, IOptimizationContext> visitor, - IOptimizationContext ctx) throws AlgebricksException { + public static <R> void visitOperatorAndItsDescendants(ILogicalOperator op, + ILogicalOperatorVisitor<R, IOptimizationContext> visitor, IOptimizationContext ctx) + throws AlgebricksException { Set<ILogicalOperator> visitSet = new HashSet<ILogicalOperator>(); computeFDsAndEqClassesWithVisitorRec(op, ctx, visitor, visitSet); } private static <R> void computeFDsAndEqClassesWithVisitorRec(ILogicalOperator op, IOptimizationContext ctx, ILogicalOperatorVisitor<R, IOptimizationContext> visitor, Set<ILogicalOperator> visitSet) - throws AlgebricksException { + throws AlgebricksException { visitSet.add(op); for (Mutable<ILogicalOperator> i : op.getInputs()) { computeFDsAndEqClassesWithVisitorRec((AbstractLogicalOperator) i.getValue(), ctx, visitor, visitSet); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/aggreg/SerializableAggregatorDescriptorFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/aggreg/SerializableAggregatorDescriptorFactory.java b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/aggreg/SerializableAggregatorDescriptorFactory.java index 1e06c76..28590ec 100644 --- a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/aggreg/SerializableAggregatorDescriptorFactory.java +++ b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/aggreg/SerializableAggregatorDescriptorFactory.java @@ -93,8 +93,8 @@ public class SerializableAggregatorDescriptorFactory extends AbstractAccumulatin int fieldSlotLength = stateAccessor.getFieldSlotsLength(); for (int i = 0; i < aggs.length; i++) { byte[] data = stateAccessor.getBuffer().array(); - int start = stateAccessor.getFieldStartOffset(stateTupleIndex, i + keys.length) - + stateTupleStart + fieldSlotLength; + int start = stateAccessor.getFieldStartOffset(stateTupleIndex, i + keys.length) + stateTupleStart + + fieldSlotLength; aggs[i].step(ftr, data, start, stateFieldLength[i]); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/meta/SubplanRuntimeFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/meta/SubplanRuntimeFactory.java b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/meta/SubplanRuntimeFactory.java index f6a349f..7e04750 100644 --- a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/meta/SubplanRuntimeFactory.java +++ b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/meta/SubplanRuntimeFactory.java @@ -73,8 +73,8 @@ public class SubplanRuntimeFactory extends AbstractOneInputOneOutputRuntimeFacto RecordDescriptor pipelineOutputRecordDescriptor = null; - final PipelineAssembler pa = new PipelineAssembler(pipeline, 1, 1, inputRecordDesc, - pipelineOutputRecordDescriptor); + final PipelineAssembler pa = + new PipelineAssembler(pipeline, 1, 1, inputRecordDesc, pipelineOutputRecordDescriptor); final IMissingWriter[] nullWriters = new IMissingWriter[missingWriterFactories.length]; for (int i = 0; i < missingWriterFactories.length; i++) { nullWriters[i] = missingWriterFactories[i].createMissingWriter(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/sort/InMemorySortRuntimeFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/sort/InMemorySortRuntimeFactory.java b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/sort/InMemorySortRuntimeFactory.java index bb8223d..f251bb7 100644 --- a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/sort/InMemorySortRuntimeFactory.java +++ b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/sort/InMemorySortRuntimeFactory.java @@ -44,10 +44,9 @@ public class InMemorySortRuntimeFactory extends AbstractOneInputOneOutputRuntime public InMemorySortRuntimeFactory(int[] sortFields, INormalizedKeyComputerFactory firstKeyNormalizerFactory, IBinaryComparatorFactory[] comparatorFactories, int[] projectionList) { - this(sortFields, - firstKeyNormalizerFactory != null ? new INormalizedKeyComputerFactory[] { firstKeyNormalizerFactory } - : null, - comparatorFactories, projectionList); + this(sortFields, firstKeyNormalizerFactory != null + ? new INormalizedKeyComputerFactory[] { firstKeyNormalizerFactory } : null, comparatorFactories, + projectionList); } public InMemorySortRuntimeFactory(int[] sortFields, INormalizedKeyComputerFactory[] keyNormalizerFactories, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/serializer/ResultSerializerFactoryProvider.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/serializer/ResultSerializerFactoryProvider.java b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/serializer/ResultSerializerFactoryProvider.java index 0e49d22..763e6ff 100644 --- a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/serializer/ResultSerializerFactoryProvider.java +++ b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/serializer/ResultSerializerFactoryProvider.java @@ -47,8 +47,8 @@ public class ResultSerializerFactoryProvider implements IResultSerializerFactory @Override public IResultSerializer createResultSerializer(RecordDescriptor inputRecordDesc, PrintStream printStream) { - final IAWriter writer = writerFactory.createWriter(fields, printStream, printerFactories, - inputRecordDesc); + final IAWriter writer = + writerFactory.createWriter(fields, printStream, printerFactories, inputRecordDesc); return new IResultSerializer() { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-tests/src/main/java/org/apache/hyracks/algebricks/tests/pushruntime/IntegerConstantEvalFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-tests/src/main/java/org/apache/hyracks/algebricks/tests/pushruntime/IntegerConstantEvalFactory.java b/hyracks-fullstack/algebricks/algebricks-tests/src/main/java/org/apache/hyracks/algebricks/tests/pushruntime/IntegerConstantEvalFactory.java index 26790c5..afbff40 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/src/main/java/org/apache/hyracks/algebricks/tests/pushruntime/IntegerConstantEvalFactory.java +++ b/hyracks-fullstack/algebricks/algebricks-tests/src/main/java/org/apache/hyracks/algebricks/tests/pushruntime/IntegerConstantEvalFactory.java @@ -48,7 +48,7 @@ public class IntegerConstantEvalFactory implements IScalarEvaluatorFactory { private ArrayBackedValueStorage buf = new ArrayBackedValueStorage(); { - IntegerSerializerDeserializer.INSTANCE.serialize(value, buf.getDataOutput()); + IntegerSerializerDeserializer.INSTANCE.serialize(value, buf.getDataOutput()); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java index cc4c1b9..40e2ec6 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java +++ b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java @@ -141,9 +141,9 @@ public class PushRuntimeTest { PrinterRuntimeFactory printer = new PrinterRuntimeFactory(new int[] { 0, 1 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE, IntegerPrinterFactory.INSTANCE }, assignDesc); - AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 0, 0, - new IPushRuntimeFactory[] { ets, assign, printer }, - new RecordDescriptor[] { etsDesc, assignDesc, null }); + AlgebricksMetaOperatorDescriptor algebricksOp = + new AlgebricksMetaOperatorDescriptor(spec, 0, 0, new IPushRuntimeFactory[] { ets, assign, printer }, + new RecordDescriptor[] { etsDesc, assignDesc, null }); PartitionConstraintHelper.addAbsoluteLocationConstraint(spec, algebricksOp, DEFAULT_NODES); spec.addRoot(algebricksOp); AlgebricksHyracksIntegrationUtil.runJob(spec); @@ -168,9 +168,9 @@ public class PushRuntimeTest { new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE, IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, assignDesc); - AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 0, 0, - new IPushRuntimeFactory[] { ets, assign, writer }, - new RecordDescriptor[] { etsDesc, assignDesc, null }); + AlgebricksMetaOperatorDescriptor algebricksOp = + new AlgebricksMetaOperatorDescriptor(spec, 0, 0, new IPushRuntimeFactory[] { ets, assign, writer }, + new RecordDescriptor[] { etsDesc, assignDesc, null }); PartitionConstraintHelper.addAbsoluteLocationConstraint(spec, algebricksOp, DEFAULT_NODES); spec.addRoot(algebricksOp); AlgebricksHyracksIntegrationUtil.runJob(spec); @@ -187,28 +187,28 @@ public class PushRuntimeTest { // the scanner FileSplit[] intFileSplits = new FileSplit[1]; - intFileSplits[0] = new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, "data" + File.separator - + "simple" + File.separator + "int-part1.tbl"); + intFileSplits[0] = new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, + "data" + File.separator + "simple" + File.separator + "int-part1.tbl"); IFileSplitProvider intSplitProvider = new ConstantFileSplitProvider(intFileSplits); - RecordDescriptor intScannerDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor intScannerDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); IValueParserFactory[] valueParsers = new IValueParserFactory[] { IntegerParserFactory.INSTANCE }; FileScanOperatorDescriptor intScanner = new FileScanOperatorDescriptor(spec, intSplitProvider, new DelimitedDataTupleParserFactory(valueParsers, '|'), intScannerDesc); PartitionConstraintHelper.addAbsoluteLocationConstraint(spec, intScanner, DEFAULT_NODES); // the algebricks op. - IScalarEvaluatorFactory cond = new IntegerGreaterThanEvalFactory(new IntegerConstantEvalFactory(2), - new TupleFieldEvaluatorFactory(0)); + IScalarEvaluatorFactory cond = + new IntegerGreaterThanEvalFactory(new IntegerConstantEvalFactory(2), new TupleFieldEvaluatorFactory(0)); StreamSelectRuntimeFactory select = new StreamSelectRuntimeFactory(cond, new int[] { 0 }, BinaryBooleanInspectorImpl.FACTORY, false, -1, null); RecordDescriptor selectDesc = intScannerDesc; String filePath = PATH_ACTUAL + SEPARATOR + "scanSelectWrite.out"; File outFile = new File(filePath); - SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 0 }, - new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, - selectDesc); + SinkWriterRuntimeFactory writer = + new SinkWriterRuntimeFactory(new int[] { 0 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, + outFile, PrinterBasedWriterFactory.INSTANCE, selectDesc); AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 1, 0, new IPushRuntimeFactory[] { select, writer }, new RecordDescriptor[] { selectDesc, null }); @@ -240,14 +240,14 @@ public class PushRuntimeTest { RecordDescriptor assignDesc = new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }); StreamProjectRuntimeFactory project = new StreamProjectRuntimeFactory(new int[] { 1 }); - RecordDescriptor projectDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor projectDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); String filePath = PATH_ACTUAL + SEPARATOR + "etsAssignProjectWrite.out"; File outFile = new File(filePath); - SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 0 }, - new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, - projectDesc); + SinkWriterRuntimeFactory writer = + new SinkWriterRuntimeFactory(new int[] { 0 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, + outFile, PrinterBasedWriterFactory.INSTANCE, projectDesc); AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 0, 0, new IPushRuntimeFactory[] { ets, assign, project, writer }, @@ -270,8 +270,8 @@ public class PushRuntimeTest { // the scanner FileSplit[] fileSplits = new FileSplit[1]; - fileSplits[0] = new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, "data" + File.separator - + "tpch0.001" + File.separator + "customer.tbl"); + fileSplits[0] = new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, + "data" + File.separator + "tpch0.001" + File.separator + "customer.tbl"); IFileSplitProvider splitProvider = new ConstantFileSplitProvider(fileSplits); RecordDescriptor scannerDesc = new RecordDescriptor(new ISerializerDeserializer[] { @@ -290,14 +290,14 @@ public class PushRuntimeTest { // the algebricks op. StreamLimitRuntimeFactory limit = new StreamLimitRuntimeFactory(new IntegerConstantEvalFactory(2), null, new int[] { 0 }, BinaryIntegerInspectorImpl.FACTORY); - RecordDescriptor limitDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor limitDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); String filePath = PATH_ACTUAL + SEPARATOR + "scanLimitWrite.out"; File outFile = new File(filePath); - SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 0 }, - new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, - limitDesc); + SinkWriterRuntimeFactory writer = + new SinkWriterRuntimeFactory(new int[] { 0 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, + outFile, PrinterBasedWriterFactory.INSTANCE, limitDesc); AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 1, 0, new IPushRuntimeFactory[] { limit, writer }, new RecordDescriptor[] { limitDesc, null }); @@ -323,18 +323,18 @@ public class PushRuntimeTest { RecordDescriptor etsDesc = new RecordDescriptor(new ISerializerDeserializer[] {}); IUnnestingEvaluatorFactory aggregFactory = new IntArrayUnnester(new int[] { 100, 200, 300 }); UnnestRuntimeFactory unnest = new UnnestRuntimeFactory(0, aggregFactory, new int[] { 0 }, false, null); - RecordDescriptor unnestDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor unnestDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); String filePath = PATH_ACTUAL + SEPARATOR + "etsUnnestWrite.out"; File outFile = new File(filePath); - SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 0 }, - new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, - unnestDesc); + SinkWriterRuntimeFactory writer = + new SinkWriterRuntimeFactory(new int[] { 0 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, + outFile, PrinterBasedWriterFactory.INSTANCE, unnestDesc); - AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 0, 0, - new IPushRuntimeFactory[] { ets, unnest, writer }, - new RecordDescriptor[] { etsDesc, unnestDesc, null }); + AlgebricksMetaOperatorDescriptor algebricksOp = + new AlgebricksMetaOperatorDescriptor(spec, 0, 0, new IPushRuntimeFactory[] { ets, unnest, writer }, + new RecordDescriptor[] { etsDesc, unnestDesc, null }); PartitionConstraintHelper.addAbsoluteLocationConstraint(spec, algebricksOp, new String[] { AlgebricksHyracksIntegrationUtil.NC1_ID }); spec.addRoot(algebricksOp); @@ -373,14 +373,14 @@ public class PushRuntimeTest { // the algebricks op. AggregateRuntimeFactory agg = new AggregateRuntimeFactory( new IAggregateEvaluatorFactory[] { new TupleCountAggregateFunctionFactory() }); - RecordDescriptor aggDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor aggDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); String filePath = PATH_ACTUAL + SEPARATOR + "scanAggregateWrite.out"; File outFile = new File(filePath); - SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 0 }, - new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, - aggDesc); + SinkWriterRuntimeFactory writer = + new SinkWriterRuntimeFactory(new int[] { 0 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, + outFile, PrinterBasedWriterFactory.INSTANCE, aggDesc); AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 1, 0, new IPushRuntimeFactory[] { agg, writer }, new RecordDescriptor[] { aggDesc, null }); @@ -404,8 +404,8 @@ public class PushRuntimeTest { // the scanner FileSplit[] fileSplits = new FileSplit[1]; - fileSplits[0] = new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, "data" + File.separator - + "tpch0.001" + File.separator + "customer.tbl"); + fileSplits[0] = new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, + "data" + File.separator + "tpch0.001" + File.separator + "customer.tbl"); IFileSplitProvider splitProvider = new ConstantFileSplitProvider(fileSplits); RecordDescriptor scannerDesc = new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, new UTF8StringSerializerDeserializer(), @@ -436,8 +436,8 @@ public class PushRuntimeTest { RecordDescriptor ntsDesc = sortDesc; AggregateRuntimeFactory agg = new AggregateRuntimeFactory( new IAggregateEvaluatorFactory[] { new TupleCountAggregateFunctionFactory() }); - RecordDescriptor aggDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor aggDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); AlgebricksPipeline pipeline = new AlgebricksPipeline(new IPushRuntimeFactory[] { nts, agg }, new RecordDescriptor[] { ntsDesc, aggDesc }); NestedPlansAccumulatingAggregatorFactory npaaf = new NestedPlansAccumulatingAggregatorFactory( @@ -452,18 +452,18 @@ public class PushRuntimeTest { new String[] { AlgebricksHyracksIntegrationUtil.NC1_ID }); // the algebricks op. - IScalarEvaluatorFactory cond = new IntegerEqualsEvalFactory(new IntegerConstantEvalFactory(3), - new TupleFieldEvaluatorFactory(0)); // Canadian customers + IScalarEvaluatorFactory cond = + new IntegerEqualsEvalFactory(new IntegerConstantEvalFactory(3), new TupleFieldEvaluatorFactory(0)); // Canadian customers StreamSelectRuntimeFactory select = new StreamSelectRuntimeFactory(cond, new int[] { 1 }, BinaryBooleanInspectorImpl.FACTORY, false, -1, null); - RecordDescriptor selectDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor selectDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); String filePath = PATH_ACTUAL + SEPARATOR + "scanSortGbySelectWrite.out"; File outFile = new File(filePath); - SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 0 }, - new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, - selectDesc); + SinkWriterRuntimeFactory writer = + new SinkWriterRuntimeFactory(new int[] { 0 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, + outFile, PrinterBasedWriterFactory.INSTANCE, selectDesc); AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 1, 0, new IPushRuntimeFactory[] { select, writer }, new RecordDescriptor[] { selectDesc, null }); @@ -491,8 +491,8 @@ public class PushRuntimeTest { RecordDescriptor etsDesc = new RecordDescriptor(new ISerializerDeserializer[] {}); IUnnestingEvaluatorFactory aggregFactory = new IntArrayUnnester(new int[] { 100, 200, 300 }); UnnestRuntimeFactory unnest = new UnnestRuntimeFactory(0, aggregFactory, new int[] { 0 }, false, null); - RecordDescriptor unnestDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor unnestDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); RunningAggregateRuntimeFactory ragg = new RunningAggregateRuntimeFactory(new int[] { 1 }, new IRunningAggregateEvaluatorFactory[] { new TupleCountRunningAggregateFunctionFactory() }, @@ -502,9 +502,9 @@ public class PushRuntimeTest { String filePath = PATH_ACTUAL + SEPARATOR + "etsUnnestRunningaggregateWrite.out"; File outFile = new File(filePath); - SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 1 }, - new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, - raggDesc); + SinkWriterRuntimeFactory writer = + new SinkWriterRuntimeFactory(new int[] { 1 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, + outFile, PrinterBasedWriterFactory.INSTANCE, raggDesc); AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 0, 0, new IPushRuntimeFactory[] { ets, unnest, ragg, writer }, @@ -584,13 +584,13 @@ public class PushRuntimeTest { String inputFileName = "data" + File.separator + "tpch0.001" + File.separator + "customer.tbl"; - FileSplit[] inputSplits = new FileSplit[] { - new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, inputFileName) }; + FileSplit[] inputSplits = + new FileSplit[] { new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, inputFileName) }; DelimitedDataTupleParserFactory stringParser = new DelimitedDataTupleParserFactory( new IValueParserFactory[] { UTF8StringParserFactory.INSTANCE }, '\u0000'); - RecordDescriptor stringRec = new RecordDescriptor( - new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), }); + RecordDescriptor stringRec = + new RecordDescriptor(new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), }); FileScanOperatorDescriptor scanOp = new FileScanOperatorDescriptor(spec, new ConstantFileSplitProvider(inputSplits), stringParser, stringRec); @@ -624,8 +624,8 @@ public class PushRuntimeTest { AlgebricksHyracksIntegrationUtil.runJob(spec); for (int i = 0; i < outputArity; i++) { - compareFiles("data" + File.separator + "device0" + File.separator + inputFileName, outputFile[i] - .getAbsolutePath()); + compareFiles("data" + File.separator + "device0" + File.separator + inputFileName, + outputFile[i].getAbsolutePath()); } } @@ -643,8 +643,8 @@ public class PushRuntimeTest { JobSpecification spec = new JobSpecification(FRAME_SIZE); - String inputFileName[] = { "data" + File.separator + "simple" + File.separator + "int-string-part1.tbl", "data" - + File.separator + "simple" + File.separator + "int-string-part1-split-0.tbl", + String inputFileName[] = { "data" + File.separator + "simple" + File.separator + "int-string-part1.tbl", + "data" + File.separator + "simple" + File.separator + "int-string-part1-split-0.tbl", "data" + File.separator + "simple" + File.separator + "int-string-part1-split-1.tbl" }; File[] inputFiles = new File[inputFileName.length]; for (int i = 0; i < inputFileName.length; i++) { @@ -657,16 +657,15 @@ public class PushRuntimeTest { outputFile[i] = outputFileSplit[i].getFile(AlgebricksHyracksIntegrationUtil.nc1.getIoManager()); } - FileSplit[] inputSplits = new FileSplit[] { - new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, inputFileName[0]) }; + FileSplit[] inputSplits = + new FileSplit[] { new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, inputFileName[0]) }; IFileSplitProvider intSplitProvider = new ConstantFileSplitProvider(inputSplits); - RecordDescriptor scannerDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, - new UTF8StringSerializerDeserializer() }); + RecordDescriptor scannerDesc = new RecordDescriptor(new ISerializerDeserializer[] { + IntegerSerializerDeserializer.INSTANCE, new UTF8StringSerializerDeserializer() }); - IValueParserFactory[] valueParsers = new IValueParserFactory[] { IntegerParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE }; + IValueParserFactory[] valueParsers = + new IValueParserFactory[] { IntegerParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE }; FileScanOperatorDescriptor intScanner = new FileScanOperatorDescriptor(spec, intSplitProvider, new DelimitedDataTupleParserFactory(valueParsers, '|'), scannerDesc); @@ -697,8 +696,8 @@ public class PushRuntimeTest { AlgebricksHyracksIntegrationUtil.runJob(spec); for (int i = 0; i < outputArity; i++) { - compareFiles("data" + File.separator + "device0" + File.separator + inputFileName[i + 1], outputFile[i] - .getAbsolutePath()); + compareFiles("data" + File.separator + "device0" + File.separator + inputFileName[i + 1], + outputFile[i].getAbsolutePath()); } } @@ -708,8 +707,8 @@ public class PushRuntimeTest { // the scanner FileSplit[] fileSplits = new FileSplit[1]; - fileSplits[0] = new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, "data" + File.separator - + "tpch0.001" + File.separator + "nation.tbl"); + fileSplits[0] = new ManagedFileSplit(AlgebricksHyracksIntegrationUtil.NC1_ID, + "data" + File.separator + "tpch0.001" + File.separator + "nation.tbl"); IFileSplitProvider splitProvider = new ConstantFileSplitProvider(fileSplits); RecordDescriptor scannerDesc = new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, new UTF8StringSerializerDeserializer(), @@ -761,22 +760,24 @@ public class PushRuntimeTest { EmptyTupleSourceRuntimeFactory ets = new EmptyTupleSourceRuntimeFactory(); RecordDescriptor etsDesc = new RecordDescriptor(new ISerializerDeserializer[] {}); - AssignRuntimeFactory assign1 = new AssignRuntimeFactory(new int[] { 0 }, - new IScalarEvaluatorFactory[] { const1 }, new int[] { 0 }); - RecordDescriptor assign1Desc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + AssignRuntimeFactory assign1 = + new AssignRuntimeFactory(new int[] { 0 }, new IScalarEvaluatorFactory[] { const1 }, new int[] { 0 }); + RecordDescriptor assign1Desc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); NestedTupleSourceRuntimeFactory nts = new NestedTupleSourceRuntimeFactory(); - AssignRuntimeFactory assign2 = new AssignRuntimeFactory(new int[] { 1 }, - new IScalarEvaluatorFactory[] { new IntegerAddEvalFactory(new TupleFieldEvaluatorFactory(0), const2) }, - new int[] { 0, 1 }); + AssignRuntimeFactory assign2 = + new AssignRuntimeFactory(new int[] { 1 }, + new IScalarEvaluatorFactory[] { + new IntegerAddEvalFactory(new TupleFieldEvaluatorFactory(0), const2) }, + new int[] { 0, 1 }); RecordDescriptor assign2Desc = new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }); StreamProjectRuntimeFactory project1 = new StreamProjectRuntimeFactory(new int[] { 1 }); - RecordDescriptor project1Desc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor project1Desc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); AlgebricksPipeline pipeline = new AlgebricksPipeline(new IPushRuntimeFactory[] { nts, assign2, project1 }, new RecordDescriptor[] { assign1Desc, assign2Desc, project1Desc }); @@ -788,14 +789,14 @@ public class PushRuntimeTest { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }); StreamProjectRuntimeFactory project2 = new StreamProjectRuntimeFactory(new int[] { 1 }); - RecordDescriptor project2Desc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor project2Desc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); String filePath = PATH_ACTUAL + SEPARATOR + "etsAssignSubplanProjectWrite.out"; File outFile = new File(filePath); - SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 0 }, - new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, - project2Desc); + SinkWriterRuntimeFactory writer = + new SinkWriterRuntimeFactory(new int[] { 0 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, + outFile, PrinterBasedWriterFactory.INSTANCE, project2Desc); AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 0, 0, new IPushRuntimeFactory[] { ets, assign1, subplan, project2, writer }, @@ -847,31 +848,33 @@ public class PushRuntimeTest { RecordDescriptor ntsDesc = sortDesc; AggregateRuntimeFactory agg = new AggregateRuntimeFactory( new IAggregateEvaluatorFactory[] { new TupleCountAggregateFunctionFactory() }); - RecordDescriptor aggDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor aggDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); AlgebricksPipeline pipeline = new AlgebricksPipeline(new IPushRuntimeFactory[] { nts, agg }, new RecordDescriptor[] { ntsDesc, aggDesc }); NestedPlansAccumulatingAggregatorFactory npaaf = new NestedPlansAccumulatingAggregatorFactory( new AlgebricksPipeline[] { pipeline }, new int[] { 3 }, new int[] {}); RecordDescriptor gbyDesc = new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }); - MicroPreClusteredGroupRuntimeFactory gby = new MicroPreClusteredGroupRuntimeFactory(new int[] { 3 }, - new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory.of(IntegerPointable.FACTORY) }, npaaf, - sortDesc, gbyDesc, null); + MicroPreClusteredGroupRuntimeFactory gby = + new MicroPreClusteredGroupRuntimeFactory(new int[] { 3 }, + new IBinaryComparatorFactory[] { + PointableBinaryComparatorFactory.of(IntegerPointable.FACTORY) }, + npaaf, sortDesc, gbyDesc, null); // the algebricks op. - IScalarEvaluatorFactory cond = new IntegerEqualsEvalFactory(new IntegerConstantEvalFactory(3), - new TupleFieldEvaluatorFactory(0)); // Canadian customers + IScalarEvaluatorFactory cond = + new IntegerEqualsEvalFactory(new IntegerConstantEvalFactory(3), new TupleFieldEvaluatorFactory(0)); // Canadian customers StreamSelectRuntimeFactory select = new StreamSelectRuntimeFactory(cond, new int[] { 1 }, BinaryBooleanInspectorImpl.FACTORY, false, -1, null); - RecordDescriptor selectDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); + RecordDescriptor selectDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }); String filePath = PATH_ACTUAL + SEPARATOR + "scanSortGbySelectWrite.out"; File outFile = new File(filePath); - SinkWriterRuntimeFactory writer = new SinkWriterRuntimeFactory(new int[] { 0 }, - new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, outFile, PrinterBasedWriterFactory.INSTANCE, - selectDesc); + SinkWriterRuntimeFactory writer = + new SinkWriterRuntimeFactory(new int[] { 0 }, new IPrinterFactory[] { IntegerPrinterFactory.INSTANCE }, + outFile, PrinterBasedWriterFactory.INSTANCE, selectDesc); AlgebricksMetaOperatorDescriptor algebricksOp = new AlgebricksMetaOperatorDescriptor(spec, 1, 0, new IPushRuntimeFactory[] { sort, gby, select, writer },
