This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push: new 68337d0 [FLINK-9562][optimizer] Fix typos/comments 68337d0 is described below commit 68337d04d4ab6a57cc0d91d8c740e8e5d07eeb1e Author: Alex Arkhipov <simeon.arkhi...@gmail.com> AuthorDate: Mon Aug 6 14:05:49 2018 +0300 [FLINK-9562][optimizer] Fix typos/comments --- .../src/main/java/org/apache/flink/optimizer/costs/Costs.java | 2 +- .../main/java/org/apache/flink/optimizer/dag/DagConnection.java | 9 ++++++--- .../java/org/apache/flink/optimizer/dag/SortPartitionNode.java | 2 +- .../main/java/org/apache/flink/optimizer/dag/TwoInputNode.java | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/Costs.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/Costs.java index 7c854bf..3b8f6f7 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/Costs.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/costs/Costs.java @@ -427,7 +427,7 @@ public class Costs implements Comparable<Costs>, Cloneable { return 1; } - // next, check the disk cost. again, if we have actual costs on both, use them, otherwise use the heuristic costs. + // next, check the CPU cost. again, if we have actual costs on both, use them, otherwise use the heuristic costs. if (this.cpuCost != UNKNOWN && o.cpuCost != UNKNOWN) { return this.cpuCost < o.cpuCost ? -1 : this.cpuCost > o.cpuCost ? 1 : 0; } else if (this.heuristicCpuCost < o.heuristicCpuCost) { diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DagConnection.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DagConnection.java index 1f98a11..bd88234 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DagConnection.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/DagConnection.java @@ -54,13 +54,14 @@ public class DagConnection implements EstimateProvider, DumpableConnection<Optim private boolean breakPipeline; // whether this connection should break the pipeline due to potential deadlocks /** - * Creates a new Connection between two nodes. The shipping strategy is by default <tt>NONE</tt>. - * The temp mode is by default <tt>NONE</tt>. + * Creates a new Connection between two nodes. The shipping strategy is by default <tt>null</tt>. * * @param source * The source node. * @param target * The target node. + * @param exchangeMode + * The data exchange mode (pipelined / batch / batch only for shuffles / ... ) */ public DagConnection(OptimizerNode source, OptimizerNode target, ExecutionMode exchangeMode) { this(source, target, null, exchangeMode); @@ -96,10 +97,12 @@ public class DagConnection implements EstimateProvider, DumpableConnection<Optim * * @param source * The source node. + * @param exchangeMode + * The data exchange mode (pipelined / batch / batch only for shuffles / ... ) */ public DagConnection(OptimizerNode source, ExecutionMode exchangeMode) { if (source == null) { - throw new NullPointerException("Source and target must not be null."); + throw new NullPointerException("Source must not be null."); } this.source = source; this.target = null; diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SortPartitionNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SortPartitionNode.java index 8037533..b487982 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SortPartitionNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/SortPartitionNode.java @@ -120,7 +120,7 @@ public class SortPartitionNode extends SingleInputNode { @Override public LocalProperties computeLocalProperties(LocalProperties lProps) { - // sort partition is a no-operation operation, such that all global properties are preserved. + // sort partition is a no-operation operation, such that all local properties are preserved. return lProps; } } diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java index e7c02b0..672cb31 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java @@ -428,7 +428,7 @@ public abstract class TwoInputNode extends OptimizerNode { } for (RequestedGlobalProperties igps2: intGlobal2) { - // create a candidate channel for the first input. mark it cached, if the connection says so + // create a candidate channel for the second input. mark it cached, if the connection says so final Channel c2 = new Channel(child2, this.input2.getMaterializationMode()); if (this.input2.getShipStrategy() == null) { // free to choose the ship strategy