You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2014/09/25 17:19:12 UTC

[3/3] git commit: Fix Bug with forced repartitioning in DOP changes.

Fix Bug with forced repartitioning in DOP changes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/9cf24670
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/9cf24670
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/9cf24670

Branch: refs/heads/master
Commit: 9cf24670d8f88fb34b782d67b711d219909e90fd
Parents: c3c7e2d
Author: Stephan Ewen <se...@apache.org>
Authored: Wed Sep 24 18:37:01 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Sep 25 16:45:54 2014 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/flink/compiler/plan/Channel.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/9cf24670/flink-compiler/src/main/java/org/apache/flink/compiler/plan/Channel.java
----------------------------------------------------------------------
diff --git a/flink-compiler/src/main/java/org/apache/flink/compiler/plan/Channel.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/Channel.java
index fec9c80..5fb03f5 100644
--- a/flink-compiler/src/main/java/org/apache/flink/compiler/plan/Channel.java
+++ b/flink-compiler/src/main/java/org/apache/flink/compiler/plan/Channel.java
@@ -442,11 +442,12 @@ public class Channel implements EstimateProvider, Cloneable, DumpableConnection<
 		case FORWARD:
 			throw new CompilerException("Cannot use FORWARD strategy between operations " +
 					"with different number of parallel instances.");
-		case NONE: // excluded by sanity check. lust here for verification check completion
+		case NONE: // excluded by sanity check. left here for verification check completion
 		case BROADCAST:
 		case PARTITION_HASH:
 		case PARTITION_RANGE:
 		case PARTITION_RANDOM:
+		case PARTITION_FORCED_REBALANCE:
 			return;
 		}
 		throw new CompilerException("Unrecognized Ship Strategy Type: " + this.shipStrategy);