You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ha...@apache.org on 2023/09/08 04:17:56 UTC

[flink] branch master updated: [FLINK-30217] Replace ListState#clear along with following #add/addAll with a ListState#update (#23344)

This is an automated email from the ASF dual-hosted git repository.

hangxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 20c0acf60d1 [FLINK-30217] Replace ListState#clear along with following #add/addAll with a ListState#update (#23344)
20c0acf60d1 is described below

commit 20c0acf60d137cd613914503f1b40e7b2adb86c1
Author: Zakelly <za...@gmail.com>
AuthorDate: Fri Sep 1 01:00:47 2023 +0800

    [FLINK-30217] Replace ListState#clear along with following #add/addAll with a ListState#update (#23344)
---
 .../docs/dev/datastream/fault-tolerance/state.md        | 16 ++++------------
 .../docs/dev/datastream/fault-tolerance/state.md        | 16 ++++------------
 .../file/table/stream/PartitionTimeCommitTrigger.java   |  8 ++++----
 .../file/table/stream/ProcTimeCommitTrigger.java        |  4 ++--
 .../file/table/stream/compact/CompactCoordinator.java   |  4 ++--
 .../file/table/stream/compact/CompactOperator.java      |  4 ++--
 .../flink/streaming/tests/PeriodicStreamingJob.java     |  5 +++--
 .../flink/streaming/tests/SequenceGeneratorSource.java  |  4 ++--
 .../artificialstate/ArtificalOperatorStateMapper.java   |  4 ++--
 .../flink/connector/file/sink/FileSinkProgram.java      |  4 ++--
 .../tests/StickyAllocationAndLocalRecoveryTestJob.java  |  8 ++++----
 .../apache/flink/sql/tests/StreamSQLTestProgram.java    |  6 ++----
 ...netesHighAvailabilityRecoverFromSavepointITCase.java |  5 +++--
 .../state/api/DataSetSavepointReaderITTestBase.java     |  8 ++------
 .../flink/state/api/SavepointReaderITTestBase.java      |  8 ++------
 .../apache/flink/state/api/SavepointWriterITCase.java   |  6 ++----
 .../apache/flink/state/api/WritableSavepointITCase.java |  6 ++----
 .../runtime/arrow/sources/ArrowSourceFunction.java      |  6 ++----
 .../api/functions/sink/TwoPhaseCommitSinkFunction.java  | 13 +++++++------
 .../api/functions/sink/filesystem/Buckets.java          |  4 ++--
 .../source/ContinuousFileMonitoringFunction.java        |  3 +--
 .../functions/source/ContinuousFileReaderOperator.java  |  6 +-----
 .../api/functions/source/FromElementsFunction.java      |  4 ++--
 .../source/MessageAcknowledgingSourceBase.java          |  7 ++++---
 .../api/functions/source/StatefulSequenceSource.java    |  6 ++----
 .../api/functions/source/datagen/SequenceGenerator.java |  6 ++----
 .../api/operators/async/AsyncWaitOperator.java          |  3 +--
 .../api/operators/collect/CollectSinkFunction.java      |  6 ++----
 .../runtime/operators/GenericWriteAheadSink.java        |  9 +++------
 .../operators/windowing/EvictingWindowOperator.java     |  9 +++++----
 .../runtime/operators/windowing/MergingWindowSet.java   |  9 +++++----
 .../util/functions/StreamingFunctionUtils.java          |  8 +++-----
 .../operators/windowing/MergingWindowSetTest.java       | 17 +++++++++++++----
 .../planner/factories/TestValuesRuntimeFunctions.java   |  6 ++----
 .../planner/runtime/utils/FailingCollectionSource.java  |  4 ++--
 .../table/planner/runtime/utils/StreamTestSink.scala    |  5 +----
 .../table/planner/runtime/utils/TimeTestUtil.scala      |  3 +--
 .../runtime/operators/sort/StreamSortOperator.java      |  6 ++----
 .../operators/window/slicing/SlicingWindowOperator.java |  5 +++--
 .../checkpointing/CheckpointFailureManagerITCase.java   |  4 ++--
 .../flink/test/checkpointing/RegionFailoverITCase.java  |  6 ++----
 .../test/checkpointing/UnalignedCheckpointITCase.java   |  4 ++--
 .../checkpointing/UnalignedCheckpointStressITCase.java  |  4 ++--
 .../test/checkpointing/UnalignedCheckpointTestBase.java |  7 +++----
 .../apache/flink/test/recovery/LocalRecoveryITCase.java |  4 ++--
 .../flink/test/scheduling/AdaptiveSchedulerITCase.java  |  3 +--
 .../ReinterpretDataStreamAsKeyedStreamITCase.java       |  7 +++----
 .../migration/StatefulJobSavepointMigrationITCase.scala |  3 +--
 .../StatefulJobWBroadcastStateMigrationITCase.scala     |  3 +--
 49 files changed, 129 insertions(+), 177 deletions(-)

diff --git a/docs/content.zh/docs/dev/datastream/fault-tolerance/state.md b/docs/content.zh/docs/dev/datastream/fault-tolerance/state.md
index 9b9fdf13491..81aa4a774cd 100644
--- a/docs/content.zh/docs/dev/datastream/fault-tolerance/state.md
+++ b/docs/content.zh/docs/dev/datastream/fault-tolerance/state.md
@@ -685,10 +685,7 @@ public class BufferingSink
 
     @Override
     public void snapshotState(FunctionSnapshotContext context) throws Exception {
-        checkpointedState.clear();
-        for (Tuple2<String, Integer> element : bufferedElements) {
-            checkpointedState.add(element);
-        }
+        checkpointedState.update(bufferedElements);
     }
 
     @Override
@@ -731,10 +728,7 @@ class BufferingSink(threshold: Int = 0)
   }
 
   override def snapshotState(context: FunctionSnapshotContext): Unit = {
-    checkpointedState.clear()
-    for (element <- bufferedElements) {
-      checkpointedState.add(element)
-    }
+    checkpointedState.update(bufferedElements.asJava)
   }
 
   override def initializeState(context: FunctionInitializationContext): Unit = {
@@ -851,8 +845,7 @@ public static class CounterSource
 
     @Override
     public void snapshotState(FunctionSnapshotContext context) throws Exception {
-        state.clear();
-        state.add(offset);
+        state.update(Collections.singletonList(offset));
     }
 }
 ```
@@ -894,8 +887,7 @@ class CounterSource
   }
 
   override def snapshotState(context: FunctionSnapshotContext): Unit = {
-    state.clear()
-    state.add(offset)
+    state.update(java.util.Collections.singletonList(offset))
   }
 }
 ```
diff --git a/docs/content/docs/dev/datastream/fault-tolerance/state.md b/docs/content/docs/dev/datastream/fault-tolerance/state.md
index a41072916c1..f67986377e2 100644
--- a/docs/content/docs/dev/datastream/fault-tolerance/state.md
+++ b/docs/content/docs/dev/datastream/fault-tolerance/state.md
@@ -789,10 +789,7 @@ public class BufferingSink
 
     @Override
     public void snapshotState(FunctionSnapshotContext context) throws Exception {
-        checkpointedState.clear();
-        for (Tuple2<String, Integer> element : bufferedElements) {
-            checkpointedState.add(element);
-        }
+        checkpointedState.update(bufferedElements);
     }
 
     @Override
@@ -835,10 +832,7 @@ class BufferingSink(threshold: Int = 0)
   }
 
   override def snapshotState(context: FunctionSnapshotContext): Unit = {
-    checkpointedState.clear()
-    for (element <- bufferedElements) {
-      checkpointedState.add(element)
-    }
+    checkpointedState.update(bufferedElements.asJava)
   }
 
   override def initializeState(context: FunctionInitializationContext): Unit = {
@@ -966,8 +960,7 @@ public static class CounterSource
 
     @Override
     public void snapshotState(FunctionSnapshotContext context) throws Exception {
-        state.clear();
-        state.add(offset);
+        state.update(Collections.singletonList(offset));
     }
 }
 ```
@@ -1009,8 +1002,7 @@ class CounterSource
   }
 
   override def snapshotState(context: FunctionSnapshotContext): Unit = {
-    state.clear()
-    state.add(offset)
+    state.update(java.util.Collections.singletonList(offset))
   }
 }
 ```
diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/PartitionTimeCommitTrigger.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/PartitionTimeCommitTrigger.java
index 739dfbfbeb8..8cf434df6a9 100644
--- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/PartitionTimeCommitTrigger.java
+++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/PartitionTimeCommitTrigger.java
@@ -30,6 +30,7 @@ import org.apache.flink.connector.file.table.stream.PartitionCommitPredicate.Pre
 import org.apache.flink.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -144,12 +145,11 @@ public class PartitionTimeCommitTrigger implements PartitionCommitTrigger {
 
     @Override
     public void snapshotState(long checkpointId, long watermark) throws Exception {
-        pendingPartitionsState.clear();
-        pendingPartitionsState.add(new ArrayList<>(pendingPartitions));
+        pendingPartitionsState.update(
+                Collections.singletonList(new ArrayList<>(pendingPartitions)));
 
         watermarks.put(checkpointId, watermark);
-        watermarksState.clear();
-        watermarksState.add(new HashMap<>(watermarks));
+        watermarksState.update(Collections.singletonList(new HashMap<>(watermarks)));
     }
 
     @Override
diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/ProcTimeCommitTrigger.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/ProcTimeCommitTrigger.java
index ebd72932d70..873a6c4c6a8 100644
--- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/ProcTimeCommitTrigger.java
+++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/ProcTimeCommitTrigger.java
@@ -29,6 +29,7 @@ import org.apache.flink.streaming.runtime.tasks.ProcessingTimeService;
 import org.apache.flink.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -120,8 +121,7 @@ public class ProcTimeCommitTrigger implements PartitionCommitTrigger {
 
     @Override
     public void snapshotState(long checkpointId, long watermark) throws Exception {
-        pendingPartitionsState.clear();
-        pendingPartitionsState.add(new HashMap<>(pendingPartitions));
+        pendingPartitionsState.update(Collections.singletonList(new HashMap<>(pendingPartitions)));
     }
 
     @Override
diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/compact/CompactCoordinator.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/compact/CompactCoordinator.java
index b4ae2a8a5f3..f5b18340753 100644
--- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/compact/CompactCoordinator.java
+++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/compact/CompactCoordinator.java
@@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -197,9 +198,8 @@ public class CompactCoordinator extends AbstractStreamOperator<CoordinatorOutput
     public void snapshotState(StateSnapshotContext context) throws Exception {
         super.snapshotState(context);
 
-        inputFilesState.clear();
         inputFiles.put(context.getCheckpointId(), new HashMap<>(currentInputFiles));
-        inputFilesState.add(inputFiles);
+        inputFilesState.update(Collections.singletonList(inputFiles));
         currentInputFiles.clear();
     }
 }
diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/compact/CompactOperator.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/compact/CompactOperator.java
index fa51d4aa767..d47697be701 100644
--- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/compact/CompactOperator.java
+++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/stream/compact/CompactOperator.java
@@ -45,6 +45,7 @@ import org.apache.flink.util.function.SupplierWithException;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -168,9 +169,8 @@ public class CompactOperator<T> extends AbstractStreamOperator<PartitionCommitIn
     }
 
     private void snapshotState(long checkpointId) throws Exception {
-        expiredFilesState.clear();
         expiredFiles.put(checkpointId, new ArrayList<>(currentExpiredFiles));
-        expiredFilesState.add(expiredFiles);
+        expiredFilesState.update(Collections.singletonList(expiredFiles));
         currentExpiredFiles.clear();
     }
 
diff --git a/flink-end-to-end-tests/flink-cli-test/src/main/java/org/apache/flink/streaming/tests/PeriodicStreamingJob.java b/flink-end-to-end-tests/flink-cli-test/src/main/java/org/apache/flink/streaming/tests/PeriodicStreamingJob.java
index 6929fcd98a4..ba4b2e1b656 100644
--- a/flink-end-to-end-tests/flink-cli-test/src/main/java/org/apache/flink/streaming/tests/PeriodicStreamingJob.java
+++ b/flink-end-to-end-tests/flink-cli-test/src/main/java/org/apache/flink/streaming/tests/PeriodicStreamingJob.java
@@ -37,6 +37,8 @@ import org.apache.flink.streaming.api.functions.source.SourceFunction;
 import org.apache.flink.streaming.api.windowing.assigners.TumblingProcessingTimeWindows;
 import org.apache.flink.streaming.api.windowing.time.Time;
 
+import java.util.Collections;
+
 /**
  * This is a periodic streaming job that runs for CLI testing purposes.
  *
@@ -137,8 +139,7 @@ public class PeriodicStreamingJob {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            state.clear();
-            state.add(ms);
+            state.update(Collections.singletonList(ms));
         }
     }
 }
diff --git a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/SequenceGeneratorSource.java b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/SequenceGeneratorSource.java
index 6c3e56dc5db..51a5e3813e6 100644
--- a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/SequenceGeneratorSource.java
+++ b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/SequenceGeneratorSource.java
@@ -30,6 +30,7 @@ import org.apache.flink.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
@@ -192,8 +193,7 @@ public class SequenceGeneratorSource extends RichParallelSourceFunction<Event>
     public void snapshotState(FunctionSnapshotContext context) throws Exception {
         snapshotKeyRanges.update(keyRanges);
 
-        lastEventTimes.clear();
-        lastEventTimes.add(monotonousEventTime);
+        lastEventTimes.update(Collections.singletonList(monotonousEventTime));
     }
 
     @Override
diff --git a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/ArtificalOperatorStateMapper.java b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/ArtificalOperatorStateMapper.java
index 1695750fe3b..bca083a166f 100644
--- a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/ArtificalOperatorStateMapper.java
+++ b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/ArtificalOperatorStateMapper.java
@@ -31,6 +31,7 @@ import org.apache.flink.runtime.state.FunctionSnapshotContext;
 import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction;
 import org.apache.flink.util.Preconditions;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -176,8 +177,7 @@ public class ArtificalOperatorStateMapper<IN, OUT> extends RichMapFunction<IN, O
         }
 
         // each subtask only stores its own subtask index as a subset of the union set
-        unionElementsState.clear();
-        unionElementsState.add(thisSubtaskIndex);
+        unionElementsState.update(Collections.singletonList(thisSubtaskIndex));
     }
 
     private String getBroadcastStateEntryValue(int thisSubtaskIndex) {
diff --git a/flink-end-to-end-tests/flink-file-sink-test/src/main/java/org/apache/flink/connector/file/sink/FileSinkProgram.java b/flink-end-to-end-tests/flink-file-sink-test/src/main/java/org/apache/flink/connector/file/sink/FileSinkProgram.java
index d47f4373671..cc9cbf63f0f 100644
--- a/flink-end-to-end-tests/flink-file-sink-test/src/main/java/org/apache/flink/connector/file/sink/FileSinkProgram.java
+++ b/flink-end-to-end-tests/flink-file-sink-test/src/main/java/org/apache/flink/connector/file/sink/FileSinkProgram.java
@@ -40,6 +40,7 @@ import org.apache.flink.streaming.api.functions.sink.filesystem.rollingpolicies.
 import org.apache.flink.streaming.api.functions.source.SourceFunction;
 
 import java.io.PrintStream;
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -189,8 +190,7 @@ public enum FileSinkProgram {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            state.clear();
-            state.add(numRecordsEmitted);
+            state.update(Collections.singletonList(numRecordsEmitted));
         }
     }
 }
diff --git a/flink-end-to-end-tests/flink-local-recovery-and-allocation-test/src/main/java/org/apache/flink/streaming/tests/StickyAllocationAndLocalRecoveryTestJob.java b/flink-end-to-end-tests/flink-local-recovery-and-allocation-test/src/main/java/org/apache/flink/streaming/tests/StickyAllocationAndLocalRecoveryTestJob.java
index c0823ec303f..9b3a44de86c 100644
--- a/flink-end-to-end-tests/flink-local-recovery-and-allocation-test/src/main/java/org/apache/flink/streaming/tests/StickyAllocationAndLocalRecoveryTestJob.java
+++ b/flink-end-to-end-tests/flink-local-recovery-and-allocation-test/src/main/java/org/apache/flink/streaming/tests/StickyAllocationAndLocalRecoveryTestJob.java
@@ -46,6 +46,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -199,8 +200,7 @@ public class StickyAllocationAndLocalRecoveryTestJob {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            sourceCurrentKeyState.clear();
-            sourceCurrentKeyState.add(currentKey);
+            sourceCurrentKeyState.update(Collections.singletonList(currentKey));
         }
 
         @Override
@@ -366,8 +366,8 @@ public class StickyAllocationAndLocalRecoveryTestJob {
                             taskNameWithSubtasks,
                             allocationID);
 
-            schedulingAndFailureState.clear();
-            schedulingAndFailureState.add(currentSchedulingAndFailureInfo);
+            schedulingAndFailureState.update(
+                    Collections.singletonList(currentSchedulingAndFailureInfo));
         }
 
         @Override
diff --git a/flink-end-to-end-tests/flink-stream-sql-test/src/main/java/org/apache/flink/sql/tests/StreamSQLTestProgram.java b/flink-end-to-end-tests/flink-stream-sql-test/src/main/java/org/apache/flink/sql/tests/StreamSQLTestProgram.java
index ae388075dec..df57dfaec11 100644
--- a/flink-end-to-end-tests/flink-stream-sql-test/src/main/java/org/apache/flink/sql/tests/StreamSQLTestProgram.java
+++ b/flink-end-to-end-tests/flink-stream-sql-test/src/main/java/org/apache/flink/sql/tests/StreamSQLTestProgram.java
@@ -314,8 +314,7 @@ public class StreamSQLTestProgram {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            state.clear();
-            state.add(ms);
+            state.update(Collections.singletonList(ms));
         }
     }
 
@@ -367,8 +366,7 @@ public class StreamSQLTestProgram {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            state.clear();
-            state.add(saveRecordCnt);
+            state.update(Collections.singletonList(saveRecordCnt));
         }
     }
 }
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesHighAvailabilityRecoverFromSavepointITCase.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesHighAvailabilityRecoverFromSavepointITCase.java
index 679f5edc621..8f8e2b3c1c6 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesHighAvailabilityRecoverFromSavepointITCase.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesHighAvailabilityRecoverFromSavepointITCase.java
@@ -60,6 +60,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
@@ -245,9 +246,9 @@ class KubernetesHighAvailabilityRecoverFromSavepointITCase {
                 running = false;
             }
 
-            stateFromSavepoint.clear();
             // mark this subtask as executed before
-            stateFromSavepoint.add(getRuntimeContext().getIndexOfThisSubtask());
+            stateFromSavepoint.update(
+                    Collections.singletonList(getRuntimeContext().getIndexOfThisSubtask()));
         }
     }
 }
diff --git a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/DataSetSavepointReaderITTestBase.java b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/DataSetSavepointReaderITTestBase.java
index 56cb00f3554..c53f7501b01 100644
--- a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/DataSetSavepointReaderITTestBase.java
+++ b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/DataSetSavepointReaderITTestBase.java
@@ -294,13 +294,9 @@ public abstract class DataSetSavepointReaderITTestBase extends AbstractTestBase
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            listState.clear();
+            listState.update(elements);
 
-            listState.addAll(elements);
-
-            unionState.clear();
-
-            unionState.addAll(elements);
+            unionState.update(elements);
         }
 
         @Override
diff --git a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointReaderITTestBase.java b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointReaderITTestBase.java
index 0fdcc382f8f..919950869a8 100644
--- a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointReaderITTestBase.java
+++ b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointReaderITTestBase.java
@@ -293,13 +293,9 @@ public abstract class SavepointReaderITTestBase extends AbstractTestBase {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            listState.clear();
+            listState.update(elements);
 
-            listState.addAll(elements);
-
-            unionState.clear();
-
-            unionState.addAll(elements);
+            unionState.update(elements);
         }
 
         @Override
diff --git a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointWriterITCase.java b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointWriterITCase.java
index b33936de7d4..385dfeb46ce 100644
--- a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointWriterITCase.java
+++ b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointWriterITCase.java
@@ -332,8 +332,7 @@ public class SavepointWriterITCase extends AbstractTestBase {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            state.clear();
-            state.addAll(numbers);
+            state.update(numbers);
         }
 
         @Override
@@ -358,8 +357,7 @@ public class SavepointWriterITCase extends AbstractTestBase {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            state.clear();
-            state.addAll(numbers);
+            state.update(numbers);
         }
 
         @Override
diff --git a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/WritableSavepointITCase.java b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/WritableSavepointITCase.java
index c881096b178..ef36ea09096 100644
--- a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/WritableSavepointITCase.java
+++ b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/WritableSavepointITCase.java
@@ -329,8 +329,7 @@ public class WritableSavepointITCase extends AbstractTestBase {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            state.clear();
-            state.addAll(numbers);
+            state.update(numbers);
         }
 
         @Override
@@ -355,8 +354,7 @@ public class WritableSavepointITCase extends AbstractTestBase {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            state.clear();
-            state.addAll(numbers);
+            state.update(numbers);
         }
 
         @Override
diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunction.java b/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunction.java
index af4aa32df34..abd3de92296 100644
--- a/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunction.java
+++ b/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunction.java
@@ -54,6 +54,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.channels.Channels;
 import java.util.ArrayDeque;
+import java.util.ArrayList;
 import java.util.Deque;
 
 /**
@@ -183,10 +184,7 @@ public class ArrowSourceFunction extends RichParallelSourceFunction<RowData>
                 this.checkpointedState != null,
                 "The " + getClass().getSimpleName() + " state has not been properly initialized.");
 
-        this.checkpointedState.clear();
-        for (Tuple2<Integer, Integer> v : indexesToEmit) {
-            this.checkpointedState.add(v);
-        }
+        this.checkpointedState.update(new ArrayList<>(indexesToEmit));
     }
 
     @Override
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/TwoPhaseCommitSinkFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/TwoPhaseCommitSinkFunction.java
index 3cd766df128..ba02885b763 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/TwoPhaseCommitSinkFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/TwoPhaseCommitSinkFunction.java
@@ -45,6 +45,7 @@ import java.time.Clock;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -350,12 +351,12 @@ public abstract class TwoPhaseCommitSinkFunction<IN, TXN, CONTEXT> extends RichS
         }
         LOG.debug("{} - started new transaction '{}'", name(), currentTransactionHolder);
 
-        state.clear();
-        state.add(
-                new State<>(
-                        this.currentTransactionHolder,
-                        new ArrayList<>(pendingCommitTransactions.values()),
-                        userContext));
+        state.update(
+                Collections.singletonList(
+                        new State<>(
+                                this.currentTransactionHolder,
+                                new ArrayList<>(pendingCommitTransactions.values()),
+                                userContext)));
     }
 
     @Override
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/Buckets.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/Buckets.java
index 663aeb0273c..67a91f8869c 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/Buckets.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/Buckets.java
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
 import javax.annotation.Nullable;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -256,10 +257,9 @@ public class Buckets<IN, BucketID> {
                 maxPartCounter);
 
         bucketStatesContainer.clear();
-        partCounterStateContainer.clear();
 
         snapshotActiveBuckets(checkpointId, bucketStatesContainer);
-        partCounterStateContainer.add(maxPartCounter);
+        partCounterStateContainer.update(Collections.singletonList(maxPartCounter));
     }
 
     private void snapshotActiveBuckets(
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
index e3089df5700..2c32d276f47 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
@@ -412,8 +412,7 @@ public class ContinuousFileMonitoringFunction<OUT>
                 this.checkpointedState != null,
                 "The " + getClass().getSimpleName() + " state has not been properly initialized.");
 
-        this.checkpointedState.clear();
-        this.checkpointedState.add(this.globalModificationTime);
+        this.checkpointedState.update(Collections.singletonList(this.globalModificationTime));
 
         if (LOG.isDebugEnabled()) {
             LOG.debug("{} checkpointed {}.", getClass().getSimpleName(), globalModificationTime);
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java
index fbaabb7de9a..805cce50a97 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java
@@ -527,14 +527,10 @@ public class ContinuousFileReaderOperator<OUT, T extends TimestampedInputSplit>
 
         int subtaskIdx = getRuntimeContext().getIndexOfThisSubtask();
 
-        checkpointedState.clear();
-
         List<T> readerState = getReaderState();
 
         try {
-            for (T split : readerState) {
-                checkpointedState.add(split);
-            }
+            checkpointedState.update(readerState);
         } catch (Exception e) {
             checkpointedState.clear();
 
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromElementsFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromElementsFunction.java
index 40a78b57a88..4ece154abd7 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromElementsFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromElementsFunction.java
@@ -44,6 +44,7 @@ import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -271,8 +272,7 @@ public class FromElementsFunction<T>
                 this.checkpointedState != null,
                 "The " + getClass().getSimpleName() + " has not been properly initialized.");
 
-        this.checkpointedState.clear();
-        this.checkpointedState.add(this.numElementsEmitted);
+        this.checkpointedState.update(Collections.singletonList(this.numElementsEmitted));
     }
 
     // ------------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/MessageAcknowledgingSourceBase.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/MessageAcknowledgingSourceBase.java
index 753cc6b10ac..00ef3b836ed 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/MessageAcknowledgingSourceBase.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/MessageAcknowledgingSourceBase.java
@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -242,9 +243,9 @@ public abstract class MessageAcknowledgingSourceBase<Type, UId> extends RichSour
                 new Tuple2<>(context.getCheckpointId(), idsForCurrentCheckpoint));
         idsForCurrentCheckpoint = CollectionUtil.newHashSetWithExpectedSize(64);
 
-        this.checkpointedState.clear();
-        this.checkpointedState.add(
-                SerializedCheckpointData.fromDeque(pendingCheckpoints, idSerializer));
+        this.checkpointedState.update(
+                Collections.singletonList(
+                        SerializedCheckpointData.fromDeque(pendingCheckpoints, idSerializer)));
     }
 
     @Override
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/StatefulSequenceSource.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/StatefulSequenceSource.java
index a7bb526be97..a9f4d1e7023 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/StatefulSequenceSource.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/StatefulSequenceSource.java
@@ -28,6 +28,7 @@ import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction;
 import org.apache.flink.util.Preconditions;
 
 import java.util.ArrayDeque;
+import java.util.ArrayList;
 import java.util.Deque;
 
 /**
@@ -130,10 +131,7 @@ public class StatefulSequenceSource extends RichParallelSourceFunction<Long>
                 this.checkpointedState != null,
                 "The " + getClass().getSimpleName() + " state has not been properly initialized.");
 
-        this.checkpointedState.clear();
-        for (Long v : this.valuesToEmit) {
-            this.checkpointedState.add(v);
-        }
+        this.checkpointedState.update(new ArrayList<>(valuesToEmit));
     }
 
     private static int safeDivide(long left, long right) {
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/datagen/SequenceGenerator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/datagen/SequenceGenerator.java
index c516957be3d..fdefb2877ff 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/datagen/SequenceGenerator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/datagen/SequenceGenerator.java
@@ -31,6 +31,7 @@ import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
 import java.util.ArrayDeque;
+import java.util.ArrayList;
 import java.util.Deque;
 
 /**
@@ -100,10 +101,7 @@ public abstract class SequenceGenerator<T> implements DataGenerator<T> {
                 this.checkpointedState != null,
                 "The " + getClass().getSimpleName() + " state has not been properly initialized.");
 
-        this.checkpointedState.clear();
-        for (Long v : this.valuesToEmit) {
-            this.checkpointedState.add(v);
-        }
+        this.checkpointedState.update(new ArrayList<>(this.valuesToEmit));
     }
 
     @Override
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperator.java
index ede06b475b4..96be9f4acd9 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperator.java
@@ -293,10 +293,9 @@ public class AsyncWaitOperator<IN, OUT>
                 getOperatorStateBackend()
                         .getListState(
                                 new ListStateDescriptor<>(STATE_NAME, inStreamElementSerializer));
-        partitionableState.clear();
 
         try {
-            partitionableState.addAll(queue.values());
+            partitionableState.update(queue.values());
         } catch (Exception e) {
             partitionableState.clear();
 
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java
index 042bbb8e733..2f7d07f1d5b 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java
@@ -216,11 +216,9 @@ public class CollectSinkFunction<IN> extends RichSinkFunction<IN>
     public void snapshotState(FunctionSnapshotContext context) throws Exception {
         bufferLock.lock();
         try {
-            bufferState.clear();
-            bufferState.addAll(buffer);
+            bufferState.update(buffer);
 
-            offsetState.clear();
-            offsetState.add(offset);
+            offsetState.update(Collections.singletonList(offset));
 
             uncompletedCheckpointMap.put(context.getCheckpointId(), offset);
 
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/GenericWriteAheadSink.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/GenericWriteAheadSink.java
index a93c35dfb89..ca3647323fc 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/GenericWriteAheadSink.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/GenericWriteAheadSink.java
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
@@ -179,13 +180,9 @@ public abstract class GenericWriteAheadSink<IN> extends AbstractStreamOperator<I
 
         saveHandleInState(context.getCheckpointId(), context.getCheckpointTimestamp());
 
-        this.checkpointedState.clear();
-
         try {
-            for (PendingCheckpoint pendingCheckpoint : pendingCheckpoints) {
-                // create a new partition for each entry.
-                this.checkpointedState.add(pendingCheckpoint);
-            }
+            // create a new partition for each entry.
+            this.checkpointedState.update(new ArrayList<>(pendingCheckpoints));
         } catch (Exception e) {
             checkpointedState.clear();
 
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
index 505d6989336..c27c258b9d0 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
@@ -43,6 +43,7 @@ import org.apache.flink.shaded.guava31.com.google.common.collect.FluentIterable;
 import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables;
 
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 import static org.apache.flink.util.Preconditions.checkNotNull;
 
@@ -407,10 +408,10 @@ public class EvictingWindowOperator<K, IN, OUT, W extends Window>
         // work around to fix FLINK-4369, remove the evicted elements from the windowState.
         // this is inefficient, but there is no other way to remove elements from ListState, which
         // is an AppendingState.
-        windowState.clear();
-        for (TimestampedValue<IN> record : recordsWithTimestamp) {
-            windowState.add(record.getStreamRecord());
-        }
+        windowState.update(
+                recordsWithTimestamp.stream()
+                        .map(TimestampedValue::getStreamRecord)
+                        .collect(Collectors.toList()));
     }
 
     private void clearAllState(
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSet.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSet.java
index 5f8c2906637..ace2331789a 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSet.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSet.java
@@ -31,6 +31,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Utility for keeping track of merging {@link Window Windows} when using a {@link
@@ -97,10 +98,10 @@ public class MergingWindowSet<W extends Window> {
      */
     public void persist() throws Exception {
         if (!mapping.equals(initialMapping)) {
-            state.clear();
-            for (Map.Entry<W, W> window : mapping.entrySet()) {
-                state.add(new Tuple2<>(window.getKey(), window.getValue()));
-            }
+            state.update(
+                    mapping.entrySet().stream()
+                            .map((w) -> new Tuple2<>(w.getKey(), w.getValue()))
+                            .collect(Collectors.toList()));
         }
     }
 
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/functions/StreamingFunctionUtils.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/functions/StreamingFunctionUtils.java
index 31d8ab14634..1ca98158550 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/functions/StreamingFunctionUtils.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/functions/StreamingFunctionUtils.java
@@ -139,13 +139,9 @@ public final class StreamingFunctionUtils {
                             new JavaSerializer<>());
             ListState<Serializable> listState = backend.getListState(listStateDescriptor);
 
-            listState.clear();
-
             if (null != partitionableState) {
                 try {
-                    for (Serializable statePartition : partitionableState) {
-                        listState.add(statePartition);
-                    }
+                    listState.update(partitionableState);
                 } catch (Exception e) {
                     listState.clear();
 
@@ -153,6 +149,8 @@ public final class StreamingFunctionUtils {
                             "Could not write partitionable state to operator " + "state backend.",
                             e);
                 }
+            } else {
+                listState.clear();
             }
 
             return true;
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java
index 6171a2684cb..c8234ab05e8 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java
@@ -36,6 +36,7 @@ import org.junit.Test;
 import org.mockito.Matchers;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -460,10 +461,18 @@ public class MergingWindowSetTest {
 
         windowSet.persist();
 
-        verify(mockState).add(eq(new Tuple2<>(new TimeWindow(1, 2), new TimeWindow(1, 2))));
-        verify(mockState).add(eq(new Tuple2<>(new TimeWindow(17, 42), new TimeWindow(17, 42))));
-
-        verify(mockState, times(2)).add(Matchers.<Tuple2<TimeWindow, TimeWindow>>anyObject());
+        verify(mockState)
+                .update(
+                        eq(
+                                new ArrayList<>(
+                                        Arrays.asList(
+                                                new Tuple2<>(
+                                                        new TimeWindow(1, 2), new TimeWindow(1, 2)),
+                                                new Tuple2<>(
+                                                        new TimeWindow(17, 42),
+                                                        new TimeWindow(17, 42))))));
+
+        verify(mockState, times(1)).update(Matchers.anyObject());
     }
 
     @Test
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java
index 40a8c26c2bc..a381d573c41 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java
@@ -312,9 +312,8 @@ final class TestValuesRuntimeFunctions {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            rawResultState.clear();
             synchronized (LOCK) {
-                rawResultState.addAll(localRawResult);
+                rawResultState.update(localRawResult);
             }
         }
     }
@@ -512,9 +511,8 @@ final class TestValuesRuntimeFunctions {
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
             super.snapshotState(context);
-            retractResultState.clear();
             synchronized (LOCK) {
-                retractResultState.addAll(localRetractResult);
+                retractResultState.update(localRetractResult);
             }
         }
 
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/utils/FailingCollectionSource.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/utils/FailingCollectionSource.java
index 095d442404d..e3379c2bf33 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/utils/FailingCollectionSource.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/utils/FailingCollectionSource.java
@@ -36,6 +36,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -230,8 +231,7 @@ public class FailingCollectionSource<T>
                 this.checkpointedState != null,
                 "The " + getClass().getSimpleName() + " has not been properly initialized.");
 
-        this.checkpointedState.clear();
-        this.checkpointedState.add(this.numElementsEmitted);
+        this.checkpointedState.update(Collections.singletonList(this.numElementsEmitted));
         long checkpointId = context.getCheckpointId();
         checkpointedEmittedNums.put(checkpointId, numElementsEmitted);
     }
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamTestSink.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamTestSink.scala
index 3d601fe714d..60a25e6a275 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamTestSink.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/StreamTestSink.scala
@@ -105,10 +105,7 @@ abstract class AbstractExactlyOnceSink[T] extends RichSinkFunction[T] with Check
   }
 
   override def snapshotState(context: FunctionSnapshotContext): Unit = {
-    resultsState.clear()
-    for (value <- localResults) {
-      resultsState.add(value)
-    }
+    resultsState.update(localResults.asJava)
   }
 
   protected def clearAndStashGlobalResults(): Unit = {
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/TimeTestUtil.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/TimeTestUtil.scala
index cd0cbd4133e..b1ad73b7e21 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/TimeTestUtil.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/utils/TimeTestUtil.scala
@@ -69,8 +69,7 @@ object TimeTestUtil {
 
     override def snapshotState(context: StateSnapshotContext): Unit = {
       super.snapshotState(context)
-      watermarkState.clear()
-      watermarkState.add(currentWatermark)
+      watermarkState.update(java.util.Collections.singletonList(currentWatermark))
     }
 
     override def initializeState(context: StateInitializationContext): Unit = {
diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sort/StreamSortOperator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sort/StreamSortOperator.java
index 133f6e58698..d462b16e0ea 100644
--- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sort/StreamSortOperator.java
+++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sort/StreamSortOperator.java
@@ -123,14 +123,12 @@ public class StreamSortOperator extends TableStreamOperator<RowData>
     @Override
     public void snapshotState(StateSnapshotContext context) throws Exception {
         super.snapshotState(context);
-        // clear state first
-        bufferState.clear();
 
         List<Tuple2<RowData, Long>> dataToFlush = new ArrayList<>(inputBuffer.size());
         inputBuffer.forEach((key, value) -> dataToFlush.add(Tuple2.of(key, value)));
 
-        // batch put
-        bufferState.addAll(dataToFlush);
+        // batch update
+        bufferState.update(dataToFlush);
     }
 
     @Override
diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/slicing/SlicingWindowOperator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/slicing/SlicingWindowOperator.java
index 8a4bda0fc13..9cdf13b3773 100644
--- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/slicing/SlicingWindowOperator.java
+++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/slicing/SlicingWindowOperator.java
@@ -46,6 +46,8 @@ import org.apache.flink.table.data.RowData;
 import org.apache.flink.table.runtime.operators.TableStreamOperator;
 import org.apache.flink.table.runtime.operators.aggregate.window.processors.SliceSharedWindowAggProcessor;
 
+import java.util.Collections;
+
 import static org.apache.flink.util.Preconditions.checkNotNull;
 
 /**
@@ -203,8 +205,7 @@ public final class SlicingWindowOperator<K, W> extends TableStreamOperator<RowDa
     @Override
     public void snapshotState(StateSnapshotContext context) throws Exception {
         super.snapshotState(context);
-        this.watermarkState.clear();
-        this.watermarkState.add(currentWatermark);
+        this.watermarkState.update(Collections.singletonList(currentWatermark));
     }
 
     @Override
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/CheckpointFailureManagerITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/CheckpointFailureManagerITCase.java
index 7745f6ef18c..f98983c4258 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/CheckpointFailureManagerITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/CheckpointFailureManagerITCase.java
@@ -68,6 +68,7 @@ import org.junit.Test;
 import javax.annotation.Nonnull;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -147,8 +148,7 @@ public class CheckpointFailureManagerITCase extends TestLogger {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            listState.clear();
-            listState.add(emitted);
+            listState.update(Collections.singletonList(emitted));
         }
 
         @Override
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RegionFailoverITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RegionFailoverITCase.java
index 0bf295ba324..09545335027 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RegionFailoverITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RegionFailoverITCase.java
@@ -285,15 +285,13 @@ public class RegionFailoverITCase extends TestLogger {
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
             int indexOfThisSubtask = getRuntimeContext().getIndexOfThisSubtask();
             if (indexOfThisSubtask != 0) {
-                listState.clear();
-                listState.add(index);
+                listState.update(Collections.singletonList(index));
                 if (indexOfThisSubtask == NUM_OF_REGIONS - 1) {
                     lastRegionIndex = index;
                     snapshotIndicesOfSubTask.put(context.getCheckpointId(), lastRegionIndex);
                 }
             }
-            unionListState.clear();
-            unionListState.add(indexOfThisSubtask);
+            unionListState.update(Collections.singletonList(indexOfThisSubtask));
         }
 
         @Override
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java
index c290ba0e39f..265cc8a54b4 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java
@@ -49,6 +49,7 @@ import org.junit.runners.Parameterized;
 
 import java.time.Duration;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.stream.Stream;
 
 import static org.apache.flink.api.common.eventtime.WatermarkStrategy.noWatermarks;
@@ -469,8 +470,7 @@ public class UnalignedCheckpointITCase extends UnalignedCheckpointTestBase {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            stateList.clear();
-            stateList.add(state);
+            stateList.update(Collections.singletonList(state));
         }
 
         @Override
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java
index ff0d69f5204..5dd948937ea 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointStressITCase.java
@@ -75,6 +75,7 @@ import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.time.Duration;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
@@ -430,8 +431,7 @@ class UnalignedCheckpointStressITCase {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            nextState.clear();
-            nextState.add(nextValue);
+            nextState.update(Collections.singletonList(nextValue));
         }
 
         @Override
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java
index a3da7f7733e..7f1b234e783 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java
@@ -88,6 +88,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -1018,8 +1019,7 @@ public abstract class UnalignedCheckpointTestBase extends TestLogger {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            stateList.clear();
-            stateList.add(state);
+            stateList.update(Collections.singletonList(state));
             if (recovered) {
                 backpressureUntil = Deadline.fromNow(backpressureInterval);
             }
@@ -1070,8 +1070,7 @@ public abstract class UnalignedCheckpointTestBase extends TestLogger {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            stateList.clear();
-            stateList.add(state);
+            stateList.update(Collections.singletonList(state));
         }
 
         @Override
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/LocalRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/LocalRecoveryITCase.java
index c8e505c9c9f..eca8c5c3b41 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/LocalRecoveryITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/LocalRecoveryITCase.java
@@ -330,8 +330,8 @@ class LocalRecoveryITCase {
                 running = false;
             }
 
-            previousAllocations.clear();
-            previousAllocations.add(new TaskNameAllocationID(myName, allocationId));
+            previousAllocations.update(
+                    Collections.singletonList(new TaskNameAllocationID(myName, allocationId)));
         }
     }
 
diff --git a/flink-tests/src/test/java/org/apache/flink/test/scheduling/AdaptiveSchedulerITCase.java b/flink-tests/src/test/java/org/apache/flink/test/scheduling/AdaptiveSchedulerITCase.java
index a4124dfe08c..95d83267f7f 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/scheduling/AdaptiveSchedulerITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/scheduling/AdaptiveSchedulerITCase.java
@@ -420,8 +420,7 @@ public class AdaptiveSchedulerITCase extends TestLogger {
                 hasFailedBefore |= previousState;
             }
 
-            unionListState.clear();
-            unionListState.add(true);
+            unionListState.update(Collections.singletonList(true));
         }
     }
 
diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/api/datastream/ReinterpretDataStreamAsKeyedStreamITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/api/datastream/ReinterpretDataStreamAsKeyedStreamITCase.java
index c162d2889f6..446b9cf416c 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/streaming/api/datastream/ReinterpretDataStreamAsKeyedStreamITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/api/datastream/ReinterpretDataStreamAsKeyedStreamITCase.java
@@ -58,6 +58,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
@@ -278,8 +279,7 @@ public class ReinterpretDataStreamAsKeyedStreamITCase {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            positionState.clear();
-            positionState.add(position);
+            positionState.update(Collections.singletonList(position));
         }
 
         @Override
@@ -331,8 +331,7 @@ public class ReinterpretDataStreamAsKeyedStreamITCase {
 
         @Override
         public void snapshotState(FunctionSnapshotContext context) throws Exception {
-            sumState.clear();
-            sumState.add(runningSum);
+            sumState.update(Collections.singletonList(runningSum));
         }
 
         @Override
diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala
index b6a05ebed55..b4d2e484395 100644
--- a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala
+++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala
@@ -274,8 +274,7 @@ class StatefulJobSavepointMigrationITCase(snapshotSpec: SnapshotSpec)
     }
 
     override def snapshotState(context: FunctionSnapshotContext): Unit = {
-      state.clear()
-      state.add(CustomCaseClass("Here be dragons!", 123))
+      state.update(java.util.Collections.singletonList(CustomCaseClass("Here be dragons!", 123)))
     }
   }
 
diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala
index fcb7659846e..f65c18167c2 100644
--- a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala
+++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala
@@ -349,8 +349,7 @@ private class CheckpointedSource(val numElements: Int)
   }
 
   override def snapshotState(context: FunctionSnapshotContext): Unit = {
-    state.clear()
-    state.add(CustomCaseClass("Here be dragons!", 123))
+    state.update(java.util.Collections.singletonList(CustomCaseClass("Here be dragons!", 123)))
   }
 }