You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sr...@apache.org on 2018/01/23 13:05:35 UTC

[2/3] flink git commit: [FLINK-8411] [State Backend] HeapListState#add(null) will wipe out entire list state

[FLINK-8411] [State Backend] HeapListState#add(null) will wipe out entire list state

This closes #5300.


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

Branch: refs/heads/master
Commit: e157cfa77f83608a0cd6d7d41a96edb0ca1f97f6
Parents: e075da5
Author: Bowen Li <bo...@gmail.com>
Authored: Fri Jan 12 19:56:42 2018 +0100
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Tue Jan 23 14:05:03 2018 +0100

----------------------------------------------------------------------
 .../flink/contrib/streaming/state/RocksDBListState.java  |  4 ++++
 .../apache/flink/api/common/state/AppendingState.java    |  2 ++
 .../apache/flink/runtime/state/heap/HeapListState.java   |  5 ++---
 .../apache/flink/runtime/state/StateBackendTestBase.java | 11 +++++++++--
 4 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/e157cfa7/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBListState.java
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBListState.java b/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBListState.java
index 13f8d81..413615b 100644
--- a/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBListState.java
+++ b/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBListState.java
@@ -112,6 +112,10 @@ public class RocksDBListState<K, N, V>
 
 	@Override
 	public void add(V value) throws IOException {
+		if (value == null) {
+			return;
+		}
+
 		try {
 			writeCurrentKeyWithGroupAndNamespace();
 			byte[] key = keySerializationStream.toByteArray();

http://git-wip-us.apache.org/repos/asf/flink/blob/e157cfa7/flink-core/src/main/java/org/apache/flink/api/common/state/AppendingState.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/AppendingState.java b/flink-core/src/main/java/org/apache/flink/api/common/state/AppendingState.java
index bdf238c..9723654 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/state/AppendingState.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/state/AppendingState.java
@@ -63,6 +63,8 @@ public interface AppendingState<IN, OUT> extends State {
 	 * Updates the operator state accessible by {@link #get()} by adding the given value
 	 * to the list of values. The next time {@link #get()} is called (for the same state
 	 * partition) the returned state will represent the updated list.
+	 *
+	 * If `null` is passed in, the state value will remain unchanged
 	 * 
 	 * @param value The new value for the state.
 	 *            

http://git-wip-us.apache.org/repos/asf/flink/blob/e157cfa7/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapListState.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapListState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapListState.java
index c585807..dfc7362 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapListState.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapListState.java
@@ -67,13 +67,12 @@ public class HeapListState<K, N, V>
 
 	@Override
 	public void add(V value) {
-		final N namespace = currentNamespace;
-
 		if (value == null) {
-			clear();
 			return;
 		}
 
+		final N namespace = currentNamespace;
+
 		final StateTable<K, N, List<V>> map = stateTable;
 		List<V> list = map.get(namespace);
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e157cfa7/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java
index 5de7553..fe0d595 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java
@@ -1298,6 +1298,8 @@ public abstract class StateBackendTestBase<B extends AbstractStateBackend> exten
 
 			keyedBackend.setCurrentKey("abc");
 			assertNull(state.get());
+			state.add(null);
+			assertNull(state.get());
 
 			keyedBackend.setCurrentKey("def");
 			assertNull(state.get());
@@ -1312,6 +1314,8 @@ public abstract class StateBackendTestBase<B extends AbstractStateBackend> exten
 			assertNull(state.get());
 			state.update(Arrays.asList(10L, 16L));
 			assertThat(state.get(), containsInAnyOrder(16L, 10L));
+			state.add(null);
+			assertThat(state.get(), containsInAnyOrder(16L, 10L));
 
 			keyedBackend.setCurrentKey("abc");
 			assertNull(state.get());
@@ -1328,10 +1332,13 @@ public abstract class StateBackendTestBase<B extends AbstractStateBackend> exten
 			assertThat(state.get(), containsInAnyOrder(3L, 4L));
 			state.addAll(new ArrayList<>());
 			assertThat(state.get(), containsInAnyOrder(3L, 4L));
-			state.addAll(new ArrayList<>());
-			assertThat(state.get(), containsInAnyOrder(3L, 4L));
 			state.addAll(Arrays.asList(5L, 6L));
 			assertThat(state.get(), containsInAnyOrder(3L, 4L, 5L, 6L));
+			state.addAll(new ArrayList<>());
+			assertThat(state.get(), containsInAnyOrder(3L, 4L, 5L, 6L));
+
+			state.add(null);
+			assertThat(state.get(), containsInAnyOrder(3L, 4L, 5L, 6L));
 			state.update(Arrays.asList(1L, 2L));
 			assertThat(state.get(), containsInAnyOrder(1L, 2L));