zentol closed pull request #6150: [FLINK-9562] [flink-optimizer] Wrong wording
in flink-optimizer module
URL: https://github.com/apache/flink/pull/6150
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 7c854bf7e57..3b8f6f74439 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 int compareTo(Costs o) {
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 1f98a117ea0..bd88234d898 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 @@
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 DagConnection(OptimizerNode source, OptimizerNode
target,
*
* @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 8037533f293..b4879821cbd 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 GlobalProperties
computeGlobalProperties(GlobalProperties gProps) {
@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 48815dc9a1c..64363d01179 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 void
computeInterestingPropertiesForInputs(CostEstimator estimator) {
}
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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
