flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [3/3] incubator-flink git commit: [runtime] Quick fix for error with unsupported ship strategy
Date Wed, 26 Nov 2014 12:00:26 GMT
[runtime] Quick fix for error with unsupported ship strategy


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

Branch: refs/heads/master
Commit: 87497b7235088b2220aa356a14cbff9d43d5dffb
Parents: 392683f
Author: Stephan Ewen <sewen@apache.org>
Authored: Tue Nov 25 21:14:38 2014 +0100
Committer: Stephan Ewen <sewen@apache.org>
Committed: Tue Nov 25 21:14:38 2014 +0100

----------------------------------------------------------------------
 .../flink/runtime/operators/shipping/RecordOutputEmitter.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/87497b72/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java
index 9d06aad..455ebbf 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/RecordOutputEmitter.java
@@ -103,6 +103,7 @@ public class RecordOutputEmitter implements ChannelSelector<Record>
{
 		
 		switch (strategy) {
 		case FORWARD:
+		case PARTITION_FORCED_REBALANCE:
 		case PARTITION_HASH:
 		case PARTITION_RANGE:
 		case PARTITION_RANDOM:
@@ -115,7 +116,7 @@ public class RecordOutputEmitter implements ChannelSelector<Record>
{
 			throw new IllegalArgumentException("Invalid shipping strategy for OutputEmitter: " + strategy.name());
 		}
 		
-		if ((strategy == ShipStrategyType.PARTITION_RANGE) && distr == null) {
+		if (strategy == ShipStrategyType.PARTITION_RANGE && distr == null) {
 			throw new NullPointerException("Data distribution must not be null when the ship strategy
is range partitioning.");
 		}
 		if (strategy == ShipStrategyType.PARTITION_CUSTOM && partitioner == null) {


Mime
View raw message