You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/10/15 16:43:34 UTC

[3/5] flink git commit: [FLINK-7774][network] fix not clearing deserializers on closing an input

[FLINK-7774][network] fix not clearing deserializers on closing an input

This closes #4783.


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

Branch: refs/heads/master
Commit: 4b6f05585bb548d1538ada43ed33149acbc9e6d4
Parents: 47fe618
Author: Nico Kruber <ni...@data-artisans.com>
Authored: Mon Sep 4 17:21:52 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Sun Oct 15 16:40:53 2017 +0200

----------------------------------------------------------------------
 .../flink/runtime/io/network/api/reader/AbstractRecordReader.java   | 1 +
 .../org/apache/flink/streaming/runtime/io/StreamInputProcessor.java | 1 +
 .../apache/flink/streaming/runtime/io/StreamTwoInputProcessor.java  | 1 +
 3 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/4b6f0558/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractRecordReader.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractRecordReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractRecordReader.java
index c5aeef7..29f2b6d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractRecordReader.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/reader/AbstractRecordReader.java
@@ -120,6 +120,7 @@ abstract class AbstractRecordReader<T extends IOReadableWritable> extends Abstra
 			if (buffer != null && !buffer.isRecycled()) {
 				buffer.recycle();
 			}
+			deserializer.clear();
 		}
 	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/4b6f0558/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamInputProcessor.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamInputProcessor.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamInputProcessor.java
index 263077d..609f8b8 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamInputProcessor.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamInputProcessor.java
@@ -264,6 +264,7 @@ public class StreamInputProcessor<IN> {
 			if (buffer != null && !buffer.isRecycled()) {
 				buffer.recycle();
 			}
+			deserializer.clear();
 		}
 
 		// cleanup the barrier handler resources

http://git-wip-us.apache.org/repos/asf/flink/blob/4b6f0558/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessor.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessor.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessor.java
index a25540d..7874147 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessor.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessor.java
@@ -329,6 +329,7 @@ public class StreamTwoInputProcessor<IN1, IN2> {
 			if (buffer != null && !buffer.isRecycled()) {
 				buffer.recycle();
 			}
+			deserializer.clear();
 		}
 
 		// cleanup the barrier handler resources