http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/UnionAllPOperator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/UnionAllPOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/UnionAllPOperator.java index d184161..a617064 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/UnionAllPOperator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/UnionAllPOperator.java @@ -62,12 +62,12 @@ public class UnionAllPOperator extends AbstractPhysicalOperator { @Override public PhysicalRequirements getRequiredPropertiesForChildren(ILogicalOperator op, IPhysicalPropertiesVector reqdByParent, IOptimizationContext context) { - StructuralPropertiesVector pv0 = OperatorPropertiesUtil.checkUnpartitionedAndGetPropertiesVector(op, - new StructuralPropertiesVector(new RandomPartitioningProperty(context.getComputationNodeDomain()), - null)); - StructuralPropertiesVector pv1 = OperatorPropertiesUtil.checkUnpartitionedAndGetPropertiesVector(op, - new StructuralPropertiesVector(new RandomPartitioningProperty(context.getComputationNodeDomain()), - null)); + StructuralPropertiesVector pv0 = + OperatorPropertiesUtil.checkUnpartitionedAndGetPropertiesVector(op, new StructuralPropertiesVector( + new RandomPartitioningProperty(context.getComputationNodeDomain()), null)); + StructuralPropertiesVector pv1 = + OperatorPropertiesUtil.checkUnpartitionedAndGetPropertiesVector(op, new StructuralPropertiesVector( + new RandomPartitioningProperty(context.getComputationNodeDomain()), null)); return new PhysicalRequirements(new StructuralPropertiesVector[] { pv0, pv1 }, IPartitioningRequirementsCoordinator.NO_COORDINATION); }
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/AlgebricksAppendable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/AlgebricksAppendable.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/AlgebricksAppendable.java index 7002493..f8929e0 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/AlgebricksAppendable.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/AlgebricksAppendable.java @@ -37,7 +37,8 @@ public class AlgebricksAppendable { return app; } - @Override public String toString() { + @Override + public String toString() { return app.toString(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java index 8318176..72f891a 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java @@ -27,48 +27,40 @@ import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionC import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor; - public class LogicalExpressionPrettyPrintVisitor implements ILogicalExpressionVisitor<String, Integer> { @Override - public String visitConstantExpression(ConstantExpression expr, Integer indent) - throws AlgebricksException { + public String visitConstantExpression(ConstantExpression expr, Integer indent) throws AlgebricksException { return expr.toString(); } @Override - public String visitVariableReferenceExpression( - VariableReferenceExpression expr, Integer indent) + public String visitVariableReferenceExpression(VariableReferenceExpression expr, Integer indent) throws AlgebricksException { return expr.toString(); } @Override - public String visitAggregateFunctionCallExpression( - AggregateFunctionCallExpression expr, Integer indent) + public String visitAggregateFunctionCallExpression(AggregateFunctionCallExpression expr, Integer indent) throws AlgebricksException { return expr.toString(); } @Override - public String visitScalarFunctionCallExpression( - ScalarFunctionCallExpression expr, Integer indent) + public String visitScalarFunctionCallExpression(ScalarFunctionCallExpression expr, Integer indent) throws AlgebricksException { return expr.toString(); } @Override - public String visitStatefulFunctionCallExpression( - StatefulFunctionCallExpression expr, Integer indent) + public String visitStatefulFunctionCallExpression(StatefulFunctionCallExpression expr, Integer indent) throws AlgebricksException { return expr.toString(); } @Override - public String visitUnnestingFunctionCallExpression( - UnnestingFunctionCallExpression expr, Integer indent) + public String visitUnnestingFunctionCallExpression(UnnestingFunctionCallExpression expr, Integer indent) throws AlgebricksException { return expr.toString(); } } - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java index 3e75c66..0ad3fea 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java @@ -394,8 +394,7 @@ public class LogicalOperatorPrettyPrintVisitor extends AbstractLogicalOperatorPr if (op.getOperation() == Kind.UPSERT) { buffer.append(" out: ([record-before-upsert:" + op.getBeforeOpRecordVar() + ((op.getBeforeOpAdditionalNonFilteringVars() != null) - ? (", additional-before-upsert: " + op.getBeforeOpAdditionalNonFilteringVars()) - : "") + ? (", additional-before-upsert: " + op.getBeforeOpAdditionalNonFilteringVars()) : "") + "]) "); } if (op.isBulkload()) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/IPartitioningRequirementsCoordinator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/IPartitioningRequirementsCoordinator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/IPartitioningRequirementsCoordinator.java index f4f5d7f..d515fcf 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/IPartitioningRequirementsCoordinator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/IPartitioningRequirementsCoordinator.java @@ -46,55 +46,57 @@ public interface IPartitioningRequirementsCoordinator { } }; - public static IPartitioningRequirementsCoordinator EQCLASS_PARTITIONING_COORDINATOR = new IPartitioningRequirementsCoordinator() { + public static IPartitioningRequirementsCoordinator EQCLASS_PARTITIONING_COORDINATOR = + new IPartitioningRequirementsCoordinator() { - @Override - public Pair<Boolean, IPartitioningProperty> coordinateRequirements(IPartitioningProperty rqdpp, - IPartitioningProperty firstDeliveredPartitioning, ILogicalOperator op, IOptimizationContext context) - throws AlgebricksException { - if (firstDeliveredPartitioning != null && rqdpp != null - && firstDeliveredPartitioning.getPartitioningType() == rqdpp.getPartitioningType()) { - switch (rqdpp.getPartitioningType()) { - case UNORDERED_PARTITIONED: { - UnorderedPartitionedProperty upp1 = (UnorderedPartitionedProperty) firstDeliveredPartitioning; - Set<LogicalVariable> set1 = upp1.getColumnSet(); - UnorderedPartitionedProperty uppreq = (UnorderedPartitionedProperty) rqdpp; - Set<LogicalVariable> modifuppreq = new ListSet<LogicalVariable>(); - Map<LogicalVariable, EquivalenceClass> eqmap = context.getEquivalenceClassMap(op); - Set<LogicalVariable> covered = new ListSet<LogicalVariable>(); + @Override + public Pair<Boolean, IPartitioningProperty> coordinateRequirements(IPartitioningProperty rqdpp, + IPartitioningProperty firstDeliveredPartitioning, ILogicalOperator op, + IOptimizationContext context) throws AlgebricksException { + if (firstDeliveredPartitioning != null && rqdpp != null + && firstDeliveredPartitioning.getPartitioningType() == rqdpp.getPartitioningType()) { + switch (rqdpp.getPartitioningType()) { + case UNORDERED_PARTITIONED: { + UnorderedPartitionedProperty upp1 = + (UnorderedPartitionedProperty) firstDeliveredPartitioning; + Set<LogicalVariable> set1 = upp1.getColumnSet(); + UnorderedPartitionedProperty uppreq = (UnorderedPartitionedProperty) rqdpp; + Set<LogicalVariable> modifuppreq = new ListSet<LogicalVariable>(); + Map<LogicalVariable, EquivalenceClass> eqmap = context.getEquivalenceClassMap(op); + Set<LogicalVariable> covered = new ListSet<LogicalVariable>(); - // coordinate from an existing partition property - // (firstDeliveredPartitioning) - for (LogicalVariable v : set1) { - EquivalenceClass ecFirst = eqmap.get(v); - for (LogicalVariable r : uppreq.getColumnSet()) { - EquivalenceClass ec = eqmap.get(r); - if (ecFirst == ec) { - covered.add(v); - modifuppreq.add(r); - break; + // coordinate from an existing partition property + // (firstDeliveredPartitioning) + for (LogicalVariable v : set1) { + EquivalenceClass ecFirst = eqmap.get(v); + for (LogicalVariable r : uppreq.getColumnSet()) { + EquivalenceClass ec = eqmap.get(r); + if (ecFirst == ec) { + covered.add(v); + modifuppreq.add(r); + break; + } + } } - } - } - if (!covered.equals(set1)) { - throw new AlgebricksException("Could not modify " + rqdpp - + " to agree with partitioning property " + firstDeliveredPartitioning - + " delivered by previous input operator."); + if (!covered.equals(set1)) { + throw new AlgebricksException("Could not modify " + rqdpp + + " to agree with partitioning property " + firstDeliveredPartitioning + + " delivered by previous input operator."); + } + UnorderedPartitionedProperty upp2 = + new UnorderedPartitionedProperty(modifuppreq, rqdpp.getNodeDomain()); + return new Pair<Boolean, IPartitioningProperty>(false, upp2); + } + case ORDERED_PARTITIONED: { + throw new NotImplementedException(); + } } - UnorderedPartitionedProperty upp2 = new UnorderedPartitionedProperty(modifuppreq, - rqdpp.getNodeDomain()); - return new Pair<Boolean, IPartitioningProperty>(false, upp2); - } - case ORDERED_PARTITIONED: { - throw new NotImplementedException(); } + return new Pair<Boolean, IPartitioningProperty>(true, rqdpp); } - } - return new Pair<Boolean, IPartitioningProperty>(true, rqdpp); - } - }; + }; public Pair<Boolean, IPartitioningProperty> coordinateRequirements(IPartitioningProperty requirements, IPartitioningProperty firstDeliveredPartitioning, ILogicalOperator op, IOptimizationContext context) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/LocalGroupingProperty.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/LocalGroupingProperty.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/LocalGroupingProperty.java index af91a3a..1cd7e64 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/LocalGroupingProperty.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/LocalGroupingProperty.java @@ -114,8 +114,8 @@ public class LocalGroupingProperty extends AbstractGroupingProperty implements I return null; } int numColumns = newColumns.size(); - List<LogicalVariable> newOrderEnforcer = preferredOrderEnforcer.size() > numColumns ? preferredOrderEnforcer - .subList(0, numColumns) : preferredOrderEnforcer; + List<LogicalVariable> newOrderEnforcer = preferredOrderEnforcer.size() > numColumns + ? preferredOrderEnforcer.subList(0, numColumns) : preferredOrderEnforcer; return new LocalGroupingProperty(newColumns, newOrderEnforcer); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/StructuralPropertiesVector.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/StructuralPropertiesVector.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/StructuralPropertiesVector.java index c6b4618..aa6afdb 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/StructuralPropertiesVector.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/StructuralPropertiesVector.java @@ -86,8 +86,8 @@ public class StructuralPropertiesVector implements IPhysicalPropertiesVector { if (reqdPart != null) { IPartitioningProperty normalizedReqPart = reqdPart.normalize(equivalenceClasses, mayExpandProperties ? fds : null); - IPartitioningProperty normalizedPropPart = propPartitioning.normalize(equivalenceClasses, - mayExpandProperties ? fds : null); + IPartitioningProperty normalizedPropPart = + propPartitioning.normalize(equivalenceClasses, mayExpandProperties ? fds : null); if (!PropertiesUtil.matchPartitioningProps(normalizedReqPart, normalizedPropPart, mayExpandProperties)) { diffPart = reqdPart; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/TypePropagationPolicy.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/TypePropagationPolicy.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/TypePropagationPolicy.java index 566c13e..9d60370 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/TypePropagationPolicy.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/TypePropagationPolicy.java @@ -71,8 +71,8 @@ public abstract class TypePropagationPolicy { // found in both inner and outer branches. Fix computeOutputTypeEnvironment() in ProjectOperator // and investigate why many test queries fail if only live variables' types are propagated. for (int i = n - 1; i >= 0; i--) { - Object t = typeEnvs[i].getTypeEnv().getVarType(var, nonNullVariableList, - correlatedNullableVariableLists); + Object t = + typeEnvs[i].getTypeEnv().getVarType(var, nonNullVariableList, correlatedNullableVariableLists); if (t == null) { continue; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorManipulationUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorManipulationUtil.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorManipulationUtil.java index 8d00696..249e66f 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorManipulationUtil.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorManipulationUtil.java @@ -40,8 +40,7 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.GroupByOpera import org.apache.hyracks.algebricks.core.algebra.operators.logical.LimitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.SubplanOperator; -import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors. - LogicalOperatorDeepCopyWithNewVariablesVisitor; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.LogicalOperatorDeepCopyWithNewVariablesVisitor; import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.OperatorDeepCopyVisitor; import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities; import org.apache.hyracks.algebricks.core.algebra.plan.ALogicalPlanImpl; @@ -102,8 +101,8 @@ public class OperatorManipulationUtil { } case NESTEDTUPLESOURCE: { NestedTupleSourceOperator nts = (NestedTupleSourceOperator) op; - AbstractLogicalOperator prevOp = (AbstractLogicalOperator) nts.getDataSourceReference().getValue() - .getInputs().get(0).getValue(); + AbstractLogicalOperator prevOp = + (AbstractLogicalOperator) nts.getDataSourceReference().getValue().getInputs().get(0).getValue(); if (prevOp.getExecutionMode() != AbstractLogicalOperator.ExecutionMode.UNPARTITIONED) { nts.setExecutionMode(AbstractLogicalOperator.ExecutionMode.LOCAL); } @@ -169,8 +168,8 @@ public class OperatorManipulationUtil { if (op.getOperatorTag() == LogicalOperatorTag.NESTEDTUPLESOURCE && goThroughNts) { NestedTupleSourceOperator nts = (NestedTupleSourceOperator) op; if (nts.getDataSourceReference() != null) { - AbstractLogicalOperator op2 = (AbstractLogicalOperator) nts.getDataSourceReference().getValue() - .getInputs().get(0).getValue(); + AbstractLogicalOperator op2 = + (AbstractLogicalOperator) nts.getDataSourceReference().getValue().getInputs().get(0).getValue(); substituteVarRec(op2, v1, v2, goThroughNts, ctx); } } @@ -202,8 +201,8 @@ public class OperatorManipulationUtil { public static Pair<ILogicalOperator, Map<LogicalVariable, LogicalVariable>> deepCopyWithNewVars( ILogicalOperator root, IOptimizationContext ctx) throws AlgebricksException { - LogicalOperatorDeepCopyWithNewVariablesVisitor deepCopyVisitor = new - LogicalOperatorDeepCopyWithNewVariablesVisitor(ctx, null, true); + LogicalOperatorDeepCopyWithNewVariablesVisitor deepCopyVisitor = + new LogicalOperatorDeepCopyWithNewVariablesVisitor(ctx, null, true); ILogicalOperator newRoot = deepCopyVisitor.deepCopy(root); return Pair.of(newRoot, deepCopyVisitor.getInputToOutputVariableMapping()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java index 9dd1ade..e0d806d 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/util/OperatorPropertiesUtil.java @@ -345,9 +345,8 @@ public class OperatorPropertiesUtil { StructuralPropertiesVector partitionedPropertiesVector) { ILogicalOperator leftChild = op.getInputs().get(0).getValue(); ILogicalOperator rightChild = op.getInputs().get(1).getValue(); - boolean unPartitioned = - leftChild.getExecutionMode().equals(AbstractLogicalOperator.ExecutionMode.UNPARTITIONED) && rightChild - .getExecutionMode().equals(AbstractLogicalOperator.ExecutionMode.UNPARTITIONED); + boolean unPartitioned = leftChild.getExecutionMode().equals(AbstractLogicalOperator.ExecutionMode.UNPARTITIONED) + && rightChild.getExecutionMode().equals(AbstractLogicalOperator.ExecutionMode.UNPARTITIONED); return unPartitioned ? StructuralPropertiesVector.EMPTY_PROPERTIES_VECTOR : partitionedPropertiesVector; } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/visitors/AbstractConstVarFunVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/visitors/AbstractConstVarFunVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/visitors/AbstractConstVarFunVisitor.java index 2fa4672..695630c 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/visitors/AbstractConstVarFunVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/visitors/AbstractConstVarFunVisitor.java @@ -39,7 +39,8 @@ public abstract class AbstractConstVarFunVisitor<R, T> implements ILogicalExpres return visitFunctionCallExpression(expr, arg); } - public R visitStatefulFunctionCallExpression(StatefulFunctionCallExpression expr, T arg) throws AlgebricksException { + public R visitStatefulFunctionCallExpression(StatefulFunctionCallExpression expr, T arg) + throws AlgebricksException { return visitFunctionCallExpression(expr, arg); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobBuilder.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobBuilder.java index 4c42db8..13eef09 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobBuilder.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobBuilder.java @@ -59,7 +59,8 @@ public class JobBuilder implements IHyracksJobBuilder { private final Map<ILogicalOperator, AlgebricksPartitionConstraint> pcForMicroOps = new HashMap<>(); private final Map<ILogicalOperator, Integer> algebraicOpBelongingToMetaAsterixOp = new HashMap<>(); - private final Map<Integer, List<Pair<IPushRuntimeFactory, RecordDescriptor>>> metaAsterixOpSkeletons = new HashMap<>(); + private final Map<Integer, List<Pair<IPushRuntimeFactory, RecordDescriptor>>> metaAsterixOpSkeletons = + new HashMap<>(); private final Map<Integer, AlgebricksMetaOperatorDescriptor> metaAsterixOps = new HashMap<>(); private final Map<IOperatorDescriptor, AlgebricksPartitionConstraint> partitionConstraintMap = new HashMap<>(); @@ -205,8 +206,8 @@ public class JobBuilder implements IHyracksJobBuilder { if (opInputs != null) { for (IConnectorDescriptor conn : opInputs) { ConnectorDescriptorId cid = conn.getConnectorId(); - org.apache.commons.lang3.tuple.Pair<org.apache.commons.lang3.tuple.Pair<IOperatorDescriptor, Integer>, org.apache.commons.lang3.tuple.Pair<IOperatorDescriptor, Integer>> p = jobSpec - .getConnectorOperatorMap().get(cid); + org.apache.commons.lang3.tuple.Pair<org.apache.commons.lang3.tuple.Pair<IOperatorDescriptor, Integer>, org.apache.commons.lang3.tuple.Pair<IOperatorDescriptor, Integer>> p = + jobSpec.getConnectorOperatorMap().get(cid); IOperatorDescriptor src = p.getLeft().getLeft(); TargetConstraint constraint = tgtConstraints.get(conn); if (constraint != null) { @@ -236,8 +237,8 @@ public class JobBuilder implements IHyracksJobBuilder { if (opInputs != null) { for (IConnectorDescriptor conn : opInputs) { ConnectorDescriptorId cid = conn.getConnectorId(); - org.apache.commons.lang3.tuple.Pair<org.apache.commons.lang3.tuple.Pair<IOperatorDescriptor, Integer>, org.apache.commons.lang3.tuple.Pair<IOperatorDescriptor, Integer>> p = jobSpec - .getConnectorOperatorMap().get(cid); + org.apache.commons.lang3.tuple.Pair<org.apache.commons.lang3.tuple.Pair<IOperatorDescriptor, Integer>, org.apache.commons.lang3.tuple.Pair<IOperatorDescriptor, Integer>> p = + jobSpec.getConnectorOperatorMap().get(cid); IOperatorDescriptor src = p.getLeft().getLeft(); // Pre-order DFS setPartitionConstraintsBottomup(src.getOperatorId(), tgtConstraints, opDesc, finalPass); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobGenHelper.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobGenHelper.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobGenHelper.java index 947bac1..b204bcb 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobGenHelper.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/JobGenHelper.java @@ -96,7 +96,7 @@ public final class JobGenHelper { public static IBinaryHashFunctionFactory[] variablesToBinaryHashFunctionFactories( Collection<LogicalVariable> varLogical, IVariableTypeEnvironment env, JobGenContext context) - throws AlgebricksException { + throws AlgebricksException { IBinaryHashFunctionFactory[] funFactories = new IBinaryHashFunctionFactory[varLogical.size()]; int i = 0; IBinaryHashFunctionFactoryProvider bhffProvider = context.getBinaryHashFunctionFactoryProvider(); @@ -109,7 +109,7 @@ public final class JobGenHelper { public static IBinaryHashFunctionFamily[] variablesToBinaryHashFunctionFamilies( Collection<LogicalVariable> varLogical, IVariableTypeEnvironment env, JobGenContext context) - throws AlgebricksException { + throws AlgebricksException { IBinaryHashFunctionFamily[] funFamilies = new IBinaryHashFunctionFamily[varLogical.size()]; int i = 0; IBinaryHashFunctionFamilyProvider bhffProvider = context.getBinaryHashFunctionFamilyProvider(); @@ -122,7 +122,7 @@ public final class JobGenHelper { public static IBinaryComparatorFactory[] variablesToAscBinaryComparatorFactories( Collection<LogicalVariable> varLogical, IVariableTypeEnvironment env, JobGenContext context) - throws AlgebricksException { + throws AlgebricksException { IBinaryComparatorFactory[] compFactories = new IBinaryComparatorFactory[varLogical.size()]; IBinaryComparatorFactoryProvider bcfProvider = context.getBinaryComparatorFactoryProvider(); int i = 0; @@ -146,7 +146,7 @@ public final class JobGenHelper { public static INormalizedKeyComputerFactory variablesToAscNormalizedKeyComputerFactory( Collection<LogicalVariable> varLogical, IVariableTypeEnvironment env, JobGenContext context) - throws AlgebricksException { + throws AlgebricksException { INormalizedKeyComputerFactoryProvider nkcfProvider = context.getNormalizedKeyComputerFactoryProvider(); if (nkcfProvider == null) return null; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/PlanCompiler.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/PlanCompiler.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/PlanCompiler.java index f817cd6..7409247 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/PlanCompiler.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/jobgen/impl/PlanCompiler.java @@ -37,7 +37,8 @@ import org.apache.hyracks.api.job.JobSpecification; public class PlanCompiler { private JobGenContext context; - private Map<Mutable<ILogicalOperator>, List<Mutable<ILogicalOperator>>> operatorVisitedToParents = new HashMap<Mutable<ILogicalOperator>, List<Mutable<ILogicalOperator>>>(); + private Map<Mutable<ILogicalOperator>, List<Mutable<ILogicalOperator>>> operatorVisitedToParents = + new HashMap<Mutable<ILogicalOperator>, List<Mutable<ILogicalOperator>>>(); public PlanCompiler(JobGenContext context) { this.context = context; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java index 0a4b298..4388032 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/HeuristicOptimizer.java @@ -37,13 +37,13 @@ import org.apache.logging.log4j.Level; public class HeuristicOptimizer { - public static PhysicalOperatorTag[] hyracksOperators = new PhysicalOperatorTag[] { - PhysicalOperatorTag.DATASOURCE_SCAN, PhysicalOperatorTag.BTREE_SEARCH, - PhysicalOperatorTag.EXTERNAL_GROUP_BY, PhysicalOperatorTag.HASH_GROUP_BY, PhysicalOperatorTag.HDFS_READER, - PhysicalOperatorTag.HYBRID_HASH_JOIN, PhysicalOperatorTag.IN_MEMORY_HASH_JOIN, - PhysicalOperatorTag.NESTED_LOOP, PhysicalOperatorTag.PRE_SORTED_DISTINCT_BY, - PhysicalOperatorTag.PRE_CLUSTERED_GROUP_BY, PhysicalOperatorTag.REPLICATE, PhysicalOperatorTag.STABLE_SORT, - PhysicalOperatorTag.UNION_ALL }; + public static PhysicalOperatorTag[] hyracksOperators = + new PhysicalOperatorTag[] { PhysicalOperatorTag.DATASOURCE_SCAN, PhysicalOperatorTag.BTREE_SEARCH, + PhysicalOperatorTag.EXTERNAL_GROUP_BY, PhysicalOperatorTag.HASH_GROUP_BY, + PhysicalOperatorTag.HDFS_READER, PhysicalOperatorTag.HYBRID_HASH_JOIN, + PhysicalOperatorTag.IN_MEMORY_HASH_JOIN, PhysicalOperatorTag.NESTED_LOOP, + PhysicalOperatorTag.PRE_SORTED_DISTINCT_BY, PhysicalOperatorTag.PRE_CLUSTERED_GROUP_BY, + PhysicalOperatorTag.REPLICATE, PhysicalOperatorTag.STABLE_SORT, PhysicalOperatorTag.UNION_ALL }; public static PhysicalOperatorTag[] hyraxOperatorsBelowWhichJobGenIsDisabled = new PhysicalOperatorTag[] {}; public static boolean isHyracksOp(PhysicalOperatorTag opTag) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatBuilder.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatBuilder.java index 10e3432..e782e4f 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatBuilder.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatBuilder.java @@ -79,7 +79,7 @@ public class DotFormatBuilder { public class Node { private final StringValue nodeId; - private HashMap<String,AttributeValue> attributes = new HashMap<>(); + private HashMap<String, AttributeValue> attributes = new HashMap<>(); // no instantiation private Node(StringValue nodeId, StringValue nodeLabel) { @@ -142,7 +142,7 @@ public class DotFormatBuilder { public class Edge { private final Node source; private final Node destination; - private final HashMap<String,AttributeValue> attributes = new HashMap<>(); + private final HashMap<String, AttributeValue> attributes = new HashMap<>(); // no instantiation private Edge(Node source, Node destination) { @@ -214,7 +214,7 @@ public class DotFormatBuilder { public static final class StringValue extends AttributeValue { // no instantiation - private StringValue (String value) { + private StringValue(String value) { super(value); } @@ -224,7 +224,7 @@ public class DotFormatBuilder { newValue = ""; } newValue = newValue.replace("\n", "\\n"); - return new StringValue("\"" + newValue.replace("\"","\'").trim() + "\""); + return new StringValue("\"" + newValue.replace("\"", "\'").trim() + "\""); } } @@ -233,7 +233,7 @@ public class DotFormatBuilder { public static final Color SKYBLUE = new Color("skyblue"); // no instantiation - private Color (String color) { + private Color(String color) { super(color); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatGenerator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatGenerator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatGenerator.java index 1ea2d19..8ada0ac 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatGenerator.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatGenerator.java @@ -56,8 +56,7 @@ public class DotFormatGenerator { * @return DOT format */ public static String generate(final JobActivityGraph jobActivityGraph) { - final DotFormatBuilder graphBuilder = - new DotFormatBuilder(DotFormatBuilder.StringValue.of("JobActivityGraph")); + final DotFormatBuilder graphBuilder = new DotFormatBuilder(DotFormatBuilder.StringValue.of("JobActivityGraph")); List<IConnectorDescriptor> connectors; IActivity activity; ActivityId fromActivityId; @@ -154,11 +153,10 @@ public class DotFormatGenerator { * @return DOT format */ public static String generate(final JobSpecification jobSpecification) { - final DotFormatBuilder graphBuilder = - new DotFormatBuilder(DotFormatBuilder.StringValue.of("JobSpecification")); + final DotFormatBuilder graphBuilder = new DotFormatBuilder(DotFormatBuilder.StringValue.of("JobSpecification")); final Map<ConnectorDescriptorId, IConnectorDescriptor> connectorMap = jobSpecification.getConnectorMap(); - final Map<ConnectorDescriptorId, Pair<Pair<IOperatorDescriptor, Integer>, Pair<IOperatorDescriptor, Integer>>> - cOp = jobSpecification.getConnectorOperatorMap(); + final Map<ConnectorDescriptorId, Pair<Pair<IOperatorDescriptor, Integer>, Pair<IOperatorDescriptor, Integer>>> cOp = + jobSpecification.getConnectorOperatorMap(); ConnectorDescriptorId connectorId; IConnectorDescriptor connector; IOperatorDescriptor leftOperator; @@ -168,24 +166,24 @@ public class DotFormatGenerator { String source; String destination; String edgeLabel; - for (Map.Entry<ConnectorDescriptorId, - Pair<Pair<IOperatorDescriptor, Integer>, Pair<IOperatorDescriptor, Integer>>> entry : cOp.entrySet()) { + for (Map.Entry<ConnectorDescriptorId, Pair<Pair<IOperatorDescriptor, Integer>, Pair<IOperatorDescriptor, Integer>>> entry : cOp + .entrySet()) { connectorId = entry.getKey(); connector = connectorMap.get(connectorId); edgeLabel = connector.getClass().getName().substring(connector.getClass().getName().lastIndexOf(".") + 1); edgeLabel += "-" + connectorId; leftOperator = entry.getValue().getLeft().getLeft(); rightOperator = entry.getValue().getRight().getLeft(); - source = leftOperator.getClass().getName().substring( - leftOperator.getClass().getName().lastIndexOf(".") + 1); - sourceNode = graphBuilder.createNode( - DotFormatBuilder.StringValue.of(leftOperator.getOperatorId().toString()), - DotFormatBuilder.StringValue.of(leftOperator.toString() + "-" + source)); - destination = rightOperator.getClass().getName().substring( - rightOperator.getClass().getName().lastIndexOf(".") + 1); - destinationNode = graphBuilder.createNode( - DotFormatBuilder.StringValue.of(rightOperator.getOperatorId().toString()), - DotFormatBuilder.StringValue.of(rightOperator.toString() + "-" + destination)); + source = leftOperator.getClass().getName() + .substring(leftOperator.getClass().getName().lastIndexOf(".") + 1); + sourceNode = + graphBuilder.createNode(DotFormatBuilder.StringValue.of(leftOperator.getOperatorId().toString()), + DotFormatBuilder.StringValue.of(leftOperator.toString() + "-" + source)); + destination = rightOperator.getClass().getName() + .substring(rightOperator.getClass().getName().lastIndexOf(".") + 1); + destinationNode = + graphBuilder.createNode(DotFormatBuilder.StringValue.of(rightOperator.getOperatorId().toString()), + DotFormatBuilder.StringValue.of(rightOperator.toString() + "-" + destination)); graphBuilder.createEdge(sourceNode, destinationNode).setLabel(DotFormatBuilder.StringValue.of(edgeLabel)); } @@ -209,17 +207,16 @@ public class DotFormatGenerator { } public static void generateNode(DotFormatBuilder dotBuilder, ILogicalOperator op, - LogicalOperatorDotVisitor dotVisitor, Set<ILogicalOperator> operatorsVisited) - throws AlgebricksException { + LogicalOperatorDotVisitor dotVisitor, Set<ILogicalOperator> operatorsVisited) throws AlgebricksException { DotFormatBuilder.StringValue destinationNodeLabel = formatStringOf(op, dotVisitor); - DotFormatBuilder.Node destinationNode = dotBuilder.createNode(DotFormatBuilder.StringValue.of( - Integer.toString(op.hashCode())), destinationNodeLabel); + DotFormatBuilder.Node destinationNode = dotBuilder + .createNode(DotFormatBuilder.StringValue.of(Integer.toString(op.hashCode())), destinationNodeLabel); DotFormatBuilder.StringValue sourceNodeLabel; DotFormatBuilder.Node sourceNode; for (Mutable<ILogicalOperator> child : op.getInputs()) { sourceNodeLabel = formatStringOf(child.getValue(), dotVisitor); - sourceNode = dotBuilder.createNode(DotFormatBuilder.StringValue.of( - Integer.toString(child.getValue().hashCode())), sourceNodeLabel); + sourceNode = dotBuilder.createNode( + DotFormatBuilder.StringValue.of(Integer.toString(child.getValue().hashCode())), sourceNodeLabel); dotBuilder.createEdge(sourceNode, destinationNode); if (!operatorsVisited.contains(child.getValue())) { generateNode(dotBuilder, child.getValue(), dotVisitor, operatorsVisited); @@ -230,10 +227,9 @@ public class DotFormatGenerator { for (ILogicalPlan nestedPlan : ((AbstractOperatorWithNestedPlans) op).getNestedPlans()) { nestedOperator = nestedPlan.getRoots().get(0).getValue(); sourceNodeLabel = formatStringOf(nestedOperator, dotVisitor); - sourceNode = dotBuilder.createNode(DotFormatBuilder.StringValue.of( - Integer.toString(nestedOperator.hashCode())), sourceNodeLabel); - dotBuilder.createEdge(sourceNode, destinationNode). - setLabel(DotFormatBuilder.StringValue.of("subplan")); + sourceNode = dotBuilder.createNode( + DotFormatBuilder.StringValue.of(Integer.toString(nestedOperator.hashCode())), sourceNodeLabel); + dotBuilder.createEdge(sourceNode, destinationNode).setLabel(DotFormatBuilder.StringValue.of("subplan")); if (!operatorsVisited.contains(nestedOperator)) { generateNode(dotBuilder, nestedOperator, dotVisitor, operatorsVisited); } @@ -251,8 +247,9 @@ public class DotFormatGenerator { for (int i = 0; i < replicateOperator.getOutputs().size(); i++) { replicateOutput = replicateOperator.getOutputs().get(i).getValue(); destinationNodeLabel = formatStringOf(replicateOutput, dotVisitor); - destinationNode = dotBuilder.createNode(DotFormatBuilder.StringValue.of( - Integer.toString(replicateOutput.hashCode())), destinationNodeLabel); + destinationNode = dotBuilder.createNode( + DotFormatBuilder.StringValue.of(Integer.toString(replicateOutput.hashCode())), + destinationNodeLabel); if (replicateOperator.getOutputMaterializationFlags()[i]) { dotBuilder.createEdge(sourceNode, destinationNode).setColor(DotFormatBuilder.Color.RED); } else { @@ -267,7 +264,7 @@ public class DotFormatGenerator { private static DotFormatBuilder.StringValue formatStringOf(ILogicalOperator operator, LogicalOperatorDotVisitor dotVisitor) throws AlgebricksException { String formattedString = operator.accept(dotVisitor, null).trim(); - IPhysicalOperator physicalOperator = ((AbstractLogicalOperator)operator).getPhysicalOperator(); + IPhysicalOperator physicalOperator = ((AbstractLogicalOperator) operator).getPhysicalOperator(); if (physicalOperator != null) { formattedString += "\\n" + physicalOperator.toString().trim() + " |" + operator.getExecutionMode() + "|"; } else { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/LogicalOperatorDotVisitor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/LogicalOperatorDotVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/LogicalOperatorDotVisitor.java index a54ff63..4649d6d 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/LogicalOperatorDotVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/LogicalOperatorDotVisitor.java @@ -350,7 +350,7 @@ public class LogicalOperatorDotVisitor implements ILogicalOperatorVisitor<String @Override public String visitScriptOperator(ScriptOperator op, Void noArgs) throws AlgebricksException { stringBuilder.setLength(0); - stringBuilder.append("script (in: ").append(op.getInputVariables()).append(") (out: " ) + stringBuilder.append("script (in: ").append(op.getInputVariables()).append(") (out: ") .append(op.getOutputVariables()).append(")"); return stringBuilder.toString(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java b/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java index 0992489..93dd3d5 100644 --- a/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java +++ b/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java @@ -24,6 +24,5 @@ import org.apache.hyracks.api.dataflow.value.IBinaryHashFunctionFamily; public interface IBinaryHashFunctionFamilyProvider { - public IBinaryHashFunctionFamily getBinaryHashFunctionFamily(Object type) - throws AlgebricksException; + public IBinaryHashFunctionFamily getBinaryHashFunctionFamily(Object type) throws AlgebricksException; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/utils/WriteValueTools.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/utils/WriteValueTools.java b/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/utils/WriteValueTools.java index 97e7d95..ba27c4e 100644 --- a/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/utils/WriteValueTools.java +++ b/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/utils/WriteValueTools.java @@ -26,10 +26,10 @@ import org.apache.hyracks.util.string.UTF8StringUtil; public final class WriteValueTools { - private final static int[] INT_INTERVALS = { 9, 99, 999, 9999, 99999, 999999, 9999999, 99999999, 999999999, - Integer.MAX_VALUE }; - private final static int[] INT_DIVIDERS = { 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, - 1000000000 }; + private final static int[] INT_INTERVALS = + { 9, 99, 999, 9999, 99999, 999999, 9999999, 99999999, 999999999, Integer.MAX_VALUE }; + private final static int[] INT_DIVIDERS = + { 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 }; private final static int[] DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; public static void writeInt(int i, OutputStream os) throws IOException { 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/AbstractIntroduceCombinerRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/AbstractIntroduceCombinerRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/AbstractIntroduceCombinerRule.java index 2870074..3f61cc0 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/AbstractIntroduceCombinerRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/AbstractIntroduceCombinerRule.java @@ -65,9 +65,8 @@ public abstract class AbstractIntroduceCombinerRule implements IAlgebraicRewrite } } - protected Pair<Boolean, Mutable<ILogicalOperator>> tryToPushAgg(AggregateOperator initAgg, - GroupByOperator newGbyOp, Set<SimilarAggregatesInfo> toReplaceSet, IOptimizationContext context) - throws AlgebricksException { + protected Pair<Boolean, Mutable<ILogicalOperator>> tryToPushAgg(AggregateOperator initAgg, GroupByOperator newGbyOp, + Set<SimilarAggregatesInfo> toReplaceSet, IOptimizationContext context) throws AlgebricksException { List<LogicalVariable> initVars = initAgg.getVariables(); List<Mutable<ILogicalExpression>> initExprs = initAgg.getExpressions(); 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/AbstractIntroduceGroupByCombinerRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/AbstractIntroduceGroupByCombinerRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/AbstractIntroduceGroupByCombinerRule.java index ed4196b..a921301 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/AbstractIntroduceGroupByCombinerRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/AbstractIntroduceGroupByCombinerRule.java @@ -212,7 +212,7 @@ public abstract class AbstractIntroduceGroupByCombinerRule extends AbstractIntro private Pair<Boolean, ILogicalPlan> tryToPushSubplan(ILogicalPlan nestedPlan, GroupByOperator oldGbyOp, GroupByOperator newGbyOp, BookkeepingInfo bi, List<LogicalVariable> gbyVars, IOptimizationContext context) - throws AlgebricksException { + throws AlgebricksException { List<Mutable<ILogicalOperator>> pushedRoots = new ArrayList<Mutable<ILogicalOperator>>(); Set<SimilarAggregatesInfo> toReplaceSet = new HashSet<SimilarAggregatesInfo>(); for (Mutable<ILogicalOperator> r : nestedPlan.getRoots()) { @@ -272,7 +272,7 @@ public abstract class AbstractIntroduceGroupByCombinerRule extends AbstractIntro private boolean tryToPushRoot(Mutable<ILogicalOperator> root, GroupByOperator oldGbyOp, GroupByOperator newGbyOp, BookkeepingInfo bi, List<LogicalVariable> gbyVars, IOptimizationContext context, List<Mutable<ILogicalOperator>> toPushAccumulate, Set<SimilarAggregatesInfo> toReplaceSet) - throws AlgebricksException { + throws AlgebricksException { AbstractLogicalOperator op1 = (AbstractLogicalOperator) root.getValue(); if (op1.getOperatorTag() != LogicalOperatorTag.AGGREGATE) { return false; @@ -399,8 +399,7 @@ public abstract class AbstractIntroduceGroupByCombinerRule extends AbstractIntro * @return the bottom-most reference of a select operator */ private Mutable<ILogicalOperator> findBottomOpRefStayInOldGby(GroupByOperator nestedGby, - Mutable<ILogicalOperator> currentOpRef) - throws AlgebricksException { + Mutable<ILogicalOperator> currentOpRef) throws AlgebricksException { Set<LogicalVariable> usedVarsInNestedGby = new HashSet<>(); // Collects used variables in nested pipelines. for (ILogicalPlan nestedPlan : nestedGby.getNestedPlans()) { 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/BreakSelectIntoConjunctsRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/BreakSelectIntoConjunctsRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/BreakSelectIntoConjunctsRule.java index f5bec22..d975cce 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/BreakSelectIntoConjunctsRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/BreakSelectIntoConjunctsRule.java @@ -43,7 +43,8 @@ public class BreakSelectIntoConjunctsRule implements IAlgebraicRewriteRule { } @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue(); if (op.getOperatorTag() != LogicalOperatorTag.SELECT) { 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/ComplexUnnestToProductRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ComplexUnnestToProductRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ComplexUnnestToProductRule.java index 2ab8520..fa35a98 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ComplexUnnestToProductRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ComplexUnnestToProductRule.java @@ -115,8 +115,8 @@ public class ComplexUnnestToProductRule implements IAlgebraicRewriteRule { outerRoot = buildOperatorChain(outerOps, null, context); context.computeAndSetTypeEnvironmentForOperator(outerRoot); - InnerJoinOperator product = new InnerJoinOperator( - new MutableObject<ILogicalExpression>(ConstantExpression.TRUE)); + InnerJoinOperator product = + new InnerJoinOperator(new MutableObject<ILogicalExpression>(ConstantExpression.TRUE)); // Outer branch. product.getInputs().add(new MutableObject<ILogicalOperator>(outerRoot)); // Inner branch. 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/CopyLimitDownRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/CopyLimitDownRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/CopyLimitDownRule.java index 372af26..53548e4 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/CopyLimitDownRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/CopyLimitDownRule.java @@ -91,8 +91,8 @@ public class CopyLimitDownRule implements IAlgebraicRewriteRule { // Need to add an offset to the given limit value // since the original topmost limit will use the offset value. // We can't apply the offset multiple times. - IFunctionInfo finfoAdd = context.getMetadataProvider() - .lookupFunction(AlgebricksBuiltinFunctions.NUMERIC_ADD); + IFunctionInfo finfoAdd = + context.getMetadataProvider().lookupFunction(AlgebricksBuiltinFunctions.NUMERIC_ADD); List<Mutable<ILogicalExpression>> addArgs = new ArrayList<>(); addArgs.add( new MutableObject<ILogicalExpression>(limitOp.getMaxObjects().getValue().cloneExpression())); 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/EnforceOrderByAfterSubplan.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceOrderByAfterSubplan.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceOrderByAfterSubplan.java index fcec50a..baad59b 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceOrderByAfterSubplan.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceOrderByAfterSubplan.java @@ -64,7 +64,8 @@ public class EnforceOrderByAfterSubplan 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; } @@ -108,7 +109,7 @@ public class EnforceOrderByAfterSubplan implements IAlgebraicRewriteRule { foundTarget = false; break; } - if(child.getOperatorTag() == LogicalOperatorTag.GROUP){ + if (child.getOperatorTag() == LogicalOperatorTag.GROUP) { foundTarget = false; break; } @@ -137,8 +138,8 @@ public class EnforceOrderByAfterSubplan implements IAlgebraicRewriteRule { return false; } } - List<Pair<IOrder, Mutable<ILogicalExpression>>> orderExprs = deepCopyOrderAndExpression(sourceOrderOp - .getOrderExpressions()); + List<Pair<IOrder, Mutable<ILogicalExpression>>> orderExprs = + deepCopyOrderAndExpression(sourceOrderOp.getOrderExpressions()); OrderOperator newOrderOp = new OrderOperator(orderExprs); context.addToDontApplySet(this, newOrderOp); inputs.set(i, new MutableObject<ILogicalOperator>(newOrderOp)); @@ -155,15 +156,17 @@ public class EnforceOrderByAfterSubplan implements IAlgebraicRewriteRule { } private Mutable<ILogicalExpression> deepCopyExpressionRef(Mutable<ILogicalExpression> oldExpr) { - return new MutableObject<ILogicalExpression>(((AbstractLogicalExpression) oldExpr.getValue()).cloneExpression()); + return new MutableObject<ILogicalExpression>( + ((AbstractLogicalExpression) oldExpr.getValue()).cloneExpression()); } private List<Pair<IOrder, Mutable<ILogicalExpression>>> deepCopyOrderAndExpression( List<Pair<IOrder, Mutable<ILogicalExpression>>> ordersAndExprs) { - List<Pair<IOrder, Mutable<ILogicalExpression>>> newOrdersAndExprs = new ArrayList<Pair<IOrder, Mutable<ILogicalExpression>>>(); + List<Pair<IOrder, Mutable<ILogicalExpression>>> newOrdersAndExprs = + new ArrayList<Pair<IOrder, Mutable<ILogicalExpression>>>(); for (Pair<IOrder, Mutable<ILogicalExpression>> pair : ordersAndExprs) - newOrdersAndExprs.add(new Pair<IOrder, Mutable<ILogicalExpression>>(pair.first, - deepCopyExpressionRef(pair.second))); + newOrdersAndExprs + .add(new Pair<IOrder, Mutable<ILogicalExpression>>(pair.first, deepCopyExpressionRef(pair.second))); return newOrdersAndExprs; } } 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/EnforceStructuralPropertiesRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceStructuralPropertiesRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceStructuralPropertiesRule.java index 6763e2b..da0466e 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceStructuralPropertiesRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/EnforceStructuralPropertiesRule.java @@ -149,8 +149,8 @@ public class EnforceStructuralPropertiesRule implements IAlgebraicRewriteRule { } AbstractLogicalOperator op = (AbstractLogicalOperator) root.getValue(); op.computeDeliveredPhysicalProperties(context); - AlgebricksConfig.ALGEBRICKS_LOGGER.trace(">>>> Structural properties for " + op.getPhysicalOperator() - + ": " + op.getDeliveredPhysicalProperties() + "\n"); + AlgebricksConfig.ALGEBRICKS_LOGGER.trace(">>>> Structural properties for " + op.getPhysicalOperator() + ": " + + op.getDeliveredPhysicalProperties() + "\n"); } return changed; } 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/ExtractCommonExpressionsRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractCommonExpressionsRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractCommonExpressionsRule.java index f51c9ea..b95d6e4 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractCommonExpressionsRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractCommonExpressionsRule.java @@ -89,7 +89,8 @@ public class ExtractCommonExpressionsRule implements IAlgebraicRewriteRule { private final List<ILogicalExpression> originalAssignExprs = new ArrayList<ILogicalExpression>(); private final CommonExpressionSubstitutionVisitor substVisitor = new CommonExpressionSubstitutionVisitor(); - private final Map<ILogicalExpression, ExprEquivalenceClass> exprEqClassMap = new HashMap<ILogicalExpression, ExprEquivalenceClass>(); + private final Map<ILogicalExpression, ExprEquivalenceClass> exprEqClassMap = + new HashMap<ILogicalExpression, ExprEquivalenceClass>(); // Set of operators for which common subexpression elimination should not be performed. private static final Set<LogicalOperatorTag> ignoreOps = new HashSet<LogicalOperatorTag>(6); @@ -310,8 +311,8 @@ public class ExtractCommonExpressionsRule implements IAlgebraicRewriteRule { return false; } // Place a Select operator beneath op that contains the enclosing expression. - SelectOperator selectOp = new SelectOperator(new MutableObject<ILogicalExpression>(enclosingExpr), - false, null); + SelectOperator selectOp = + new SelectOperator(new MutableObject<ILogicalExpression>(enclosingExpr), false, null); selectOp.getInputs().add(new MutableObject<ILogicalOperator>(op.getInputs().get(0).getValue())); op.getInputs().get(0).setValue(selectOp); // Set firstOp to be the select below op, since we want to assign the common subexpr there. 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/ExtractCommonOperatorsRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractCommonOperatorsRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractCommonOperatorsRule.java index 5a4cacd..923ffb5 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractCommonOperatorsRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractCommonOperatorsRule.java @@ -52,8 +52,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class ExtractCommonOperatorsRule implements IAlgebraicRewriteRule { - private final HashMap<Mutable<ILogicalOperator>, List<Mutable<ILogicalOperator>>> childrenToParents - = new HashMap<>(); + private final HashMap<Mutable<ILogicalOperator>, List<Mutable<ILogicalOperator>>> childrenToParents = + new HashMap<>(); private final List<Mutable<ILogicalOperator>> roots = new ArrayList<>(); private final List<List<Mutable<ILogicalOperator>>> equivalenceClasses = new ArrayList<>(); private final HashMap<Mutable<ILogicalOperator>, BitSet> opToCandidateInputs = new HashMap<>(); @@ -210,7 +210,8 @@ public class ExtractCommonOperatorsRule implements IAlgebraicRewriteRule { continue; } ArrayList<LogicalVariable> liveVars = new ArrayList<LogicalVariable>(); - Map<LogicalVariable, LogicalVariable> variableMappingBack = new HashMap<LogicalVariable, LogicalVariable>(); + Map<LogicalVariable, LogicalVariable> variableMappingBack = + new HashMap<LogicalVariable, LogicalVariable>(); IsomorphismUtilities.mapVariablesTopDown(ref.getValue(), candidate.getValue(), variableMappingBack); for (int i = 0; i < liveVarsNew.size(); i++) { liveVars.add(variableMappingBack.get(liveVarsNew.get(i))); @@ -240,8 +241,8 @@ public class ExtractCommonOperatorsRule implements IAlgebraicRewriteRule { for (Mutable<ILogicalOperator> parentOpRef : parentOpList) { AbstractLogicalOperator parentOp = (AbstractLogicalOperator) parentOpRef.getValue(); int index = parentOp.getInputs().indexOf(ref); - ILogicalOperator childOp = parentOp.getOperatorTag() == LogicalOperatorTag.PROJECT ? assignOperator - : projectOperator; + ILogicalOperator childOp = + parentOp.getOperatorTag() == LogicalOperatorTag.PROJECT ? assignOperator : projectOperator; if (!HeuristicOptimizer.isHyracksOp(parentOp.getPhysicalOperator().getOperatorTag())) { parentOp.getInputs().set(index, new MutableObject<ILogicalOperator>(childOp)); } else { @@ -263,7 +264,8 @@ public class ExtractCommonOperatorsRule implements IAlgebraicRewriteRule { } private void genCandidates(IOptimizationContext context) throws AlgebricksException { - List<List<Mutable<ILogicalOperator>>> previousEquivalenceClasses = new ArrayList<List<Mutable<ILogicalOperator>>>(); + List<List<Mutable<ILogicalOperator>>> previousEquivalenceClasses = + new ArrayList<List<Mutable<ILogicalOperator>>>(); while (equivalenceClasses.size() > 0) { previousEquivalenceClasses.clear(); for (List<Mutable<ILogicalOperator>> candidates : equivalenceClasses) { @@ -364,7 +366,8 @@ public class ExtractCommonOperatorsRule implements IAlgebraicRewriteRule { } private void prune(IOptimizationContext context) throws AlgebricksException { - List<List<Mutable<ILogicalOperator>>> previousEquivalenceClasses = new ArrayList<List<Mutable<ILogicalOperator>>>(); + List<List<Mutable<ILogicalOperator>>> previousEquivalenceClasses = + new ArrayList<List<Mutable<ILogicalOperator>>>(); for (List<Mutable<ILogicalOperator>> candidates : equivalenceClasses) { List<Mutable<ILogicalOperator>> candidatesCopy = new ArrayList<Mutable<ILogicalOperator>>(); candidatesCopy.addAll(candidates); 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/ExtractFunctionsFromJoinConditionRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractFunctionsFromJoinConditionRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractFunctionsFromJoinConditionRule.java index 71a00bf..198510a 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractFunctionsFromJoinConditionRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractFunctionsFromJoinConditionRule.java @@ -63,7 +63,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class ExtractFunctionsFromJoinConditionRule 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; } @@ -104,8 +105,8 @@ public class ExtractFunctionsFromJoinConditionRule implements IAlgebraicRewriteR for (Mutable<ILogicalExpression> exprRef : fexp.getArguments()) { if (exprRef.getValue().getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL) { LogicalVariable newVar = context.newVar(); - AssignOperator newAssign = new AssignOperator(newVar, new MutableObject<ILogicalExpression>(exprRef - .getValue().cloneExpression())); + AssignOperator newAssign = new AssignOperator(newVar, + new MutableObject<ILogicalExpression>(exprRef.getValue().cloneExpression())); newAssign.setExecutionMode(joinOp.getExecutionMode()); // Place assign below joinOp. 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/ExtractGroupByDecorVariablesRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractGroupByDecorVariablesRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractGroupByDecorVariablesRule.java index a2ad732..05cc7b6 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractGroupByDecorVariablesRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractGroupByDecorVariablesRule.java @@ -66,7 +66,7 @@ public class ExtractGroupByDecorVariablesRule implements IAlgebraicRewriteRule { for (Pair<LogicalVariable, Mutable<ILogicalExpression>> decorVarExpr : decorList) { Mutable<ILogicalExpression> exprRef = decorVarExpr.second; ILogicalExpression expr = exprRef.getValue(); - if (expr ==null || expr.getExpressionTag() == LogicalExpressionTag.VARIABLE) { + if (expr == null || expr.getExpressionTag() == LogicalExpressionTag.VARIABLE) { continue; } // Rewrites the decoration entry if the decoration expression is not a variable reference expression. 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/FactorRedundantGroupAndDecorVarsRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/FactorRedundantGroupAndDecorVarsRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/FactorRedundantGroupAndDecorVarsRule.java index 38776c6..2f28a84 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/FactorRedundantGroupAndDecorVarsRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/FactorRedundantGroupAndDecorVarsRule.java @@ -43,7 +43,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class FactorRedundantGroupAndDecorVarsRule 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; } @@ -77,8 +78,8 @@ public class FactorRedundantGroupAndDecorVarsRule implements IAlgebraicRewriteRu LogicalVariable lhs = varRhsToLhs.get(v); if (lhs != null) { if (p.first != null) { - AssignOperator assign = new AssignOperator(p.first, new MutableObject<ILogicalExpression>( - new VariableReferenceExpression(lhs))); + AssignOperator assign = new AssignOperator(p.first, + new MutableObject<ILogicalExpression>(new VariableReferenceExpression(lhs))); ILogicalOperator op = opRef.getValue(); assign.getInputs().add(new MutableObject<ILogicalOperator>(op)); opRef.setValue(assign); 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/InferTypesRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/InferTypesRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/InferTypesRule.java index a61b1a2..8d54a67 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/InferTypesRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/InferTypesRule.java @@ -28,7 +28,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class InferTypesRule 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/InlineSingleReferenceVariablesRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/InlineSingleReferenceVariablesRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/InlineSingleReferenceVariablesRule.java index 71fde61..2c825b7 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/InlineSingleReferenceVariablesRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/InlineSingleReferenceVariablesRule.java @@ -51,7 +51,8 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.Var public class InlineSingleReferenceVariablesRule extends InlineVariablesRule { // Maps from variable to a list of operators using that variable. - protected Map<LogicalVariable, List<ILogicalOperator>> usedVarsMap = new HashMap<LogicalVariable, List<ILogicalOperator>>(); + protected Map<LogicalVariable, List<ILogicalOperator>> usedVarsMap = + new HashMap<LogicalVariable, List<ILogicalOperator>>(); protected List<LogicalVariable> usedVars = new ArrayList<LogicalVariable>(); @Override 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/IntroJoinInsideSubplanRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/IntroJoinInsideSubplanRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/IntroJoinInsideSubplanRule.java index 641ccfe..081f199 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/IntroJoinInsideSubplanRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/IntroJoinInsideSubplanRule.java @@ -85,12 +85,12 @@ public class IntroJoinInsideSubplanRule extends AbstractDecorrelationRule { OperatorPropertiesUtil.getFreeVariablesInSelfOrDesc(op1, free1); if (!free1.isEmpty()) { OperatorManipulationUtil.ntsToEts(op2Ref, context); - NestedTupleSourceOperator nts = new NestedTupleSourceOperator( - new MutableObject<ILogicalOperator>(subplan)); + NestedTupleSourceOperator nts = + new NestedTupleSourceOperator(new MutableObject<ILogicalOperator>(subplan)); Mutable<ILogicalOperator> ntsRef = new MutableObject<ILogicalOperator>(nts); Mutable<ILogicalOperator> innerRef = new MutableObject<ILogicalOperator>(op2); - InnerJoinOperator join = new InnerJoinOperator(new MutableObject<ILogicalExpression>( - ConstantExpression.TRUE), ntsRef, innerRef); + InnerJoinOperator join = new InnerJoinOperator( + new MutableObject<ILogicalExpression>(ConstantExpression.TRUE), ntsRef, innerRef); op2Ref.setValue(join); context.computeAndSetTypeEnvironmentForOperator(nts); context.computeAndSetTypeEnvironmentForOperator(join); 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/PullSelectOutOfEqJoin.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PullSelectOutOfEqJoin.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PullSelectOutOfEqJoin.java index da85e0d..a5cc573 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PullSelectOutOfEqJoin.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/PullSelectOutOfEqJoin.java @@ -43,7 +43,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class PullSelectOutOfEqJoin 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; }
