flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [4/6] flink git commit: [FLINK-8755] [network] Fix SpilledSubpartitionView relying on the backlog for determining whether more data is available
Date Fri, 09 Mar 2018 18:58:18 GMT
[FLINK-8755] [network] Fix SpilledSubpartitionView relying on the backlog for determining whether
more data is available

Fix SpilledSubpartitionView#getNextBuffer() to not only rely on the backlog:
instead it is sufficient to also return true if the next buffer is an event
since either there is a real buffer enqueued (reflected by the backlog) or at
least one event.


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

Branch: refs/heads/release-1.5
Commit: 5c7457aa2aece89b77e9a9402cc514f90e083a69
Parents: b3a93c5
Author: Nico Kruber <nico@data-artisans.com>
Authored: Fri Feb 23 10:19:58 2018 +0100
Committer: Stephan Ewen <sewen@apache.org>
Committed: Fri Mar 9 17:01:50 2018 +0100

----------------------------------------------------------------------
 .../runtime/io/network/partition/SpilledSubpartitionView.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5c7457aa/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionView.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionView.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionView.java
index 378b086..2a6a71f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionView.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/SpilledSubpartitionView.java
@@ -148,7 +148,7 @@ class SpilledSubpartitionView implements ResultSubpartitionView, NotificationLis
 		}
 
 		int newBacklog = parent.decreaseBuffersInBacklog(current);
-		return new BufferAndBacklog(current, newBacklog > 0, newBacklog, nextBufferIsEvent);
+		return new BufferAndBacklog(current, newBacklog > 0 || nextBufferIsEvent, newBacklog,
nextBufferIsEvent);
 	}
 
 	@Nullable


Mime
View raw message