You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by za...@apache.org on 2025/03/04 11:55:27 UTC
(flink) 05/07: [hotfix] Make some improper static method become instance method
This is an automated email from the ASF dual-hosted git repository.
zakelly pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 88c75d50e8efc0727bbc66dfa2094d7a75d7eb9b
Author: wangfeifan <zo...@163.com>
AuthorDate: Thu Feb 1 17:53:35 2024 +0800
[hotfix] Make some improper static method become instance method
---
.../checkpoint/metadata/MetadataV3Serializer.java | 26 +++++++++++-----------
.../flink/streaming/util/OperatorSnapshotUtil.java | 22 ++++++++++--------
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/metadata/MetadataV3Serializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/metadata/MetadataV3Serializer.java
index ed257b9d64d..012914ab14d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/metadata/MetadataV3Serializer.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/metadata/MetadataV3Serializer.java
@@ -268,39 +268,39 @@ public class MetadataV3Serializer extends MetadataV2V3SerializerBase implements
}
@VisibleForTesting
- public static void serializeOperatorStateHandleUtil(
+ public void serializeOperatorStateHandleUtil(
OperatorStateHandle stateHandle, DataOutputStream dos) throws IOException {
- INSTANCE.serializeOperatorStateHandle(stateHandle, dos);
+ serializeOperatorStateHandle(stateHandle, dos);
}
@VisibleForTesting
- public static OperatorStateHandle deserializeOperatorStateHandleUtil(DataInputStream dis)
+ public OperatorStateHandle deserializeOperatorStateHandleUtil(DataInputStream dis)
throws IOException {
- return INSTANCE.deserializeOperatorStateHandle(dis, null);
+ return deserializeOperatorStateHandle(dis, null);
}
@VisibleForTesting
- public static void serializeKeyedStateHandleUtil(
- KeyedStateHandle stateHandle, DataOutputStream dos) throws IOException {
- INSTANCE.serializeKeyedStateHandle(stateHandle, dos);
+ public void serializeKeyedStateHandleUtil(KeyedStateHandle stateHandle, DataOutputStream dos)
+ throws IOException {
+ serializeKeyedStateHandle(stateHandle, dos);
}
@VisibleForTesting
- public static KeyedStateHandle deserializeKeyedStateHandleUtil(DataInputStream dis)
+ public KeyedStateHandle deserializeKeyedStateHandleUtil(DataInputStream dis)
throws IOException {
- return INSTANCE.deserializeKeyedStateHandle(dis, null);
+ return deserializeKeyedStateHandle(dis, null);
}
@VisibleForTesting
- public static StateObjectCollection<InputStateHandle> deserializeInputStateHandle(
- DataInputStream dis) throws IOException {
- return INSTANCE.deserializeInputStateHandle(dis, null);
+ public StateObjectCollection<InputStateHandle> deserializeInputStateHandle(DataInputStream dis)
+ throws IOException {
+ return deserializeInputStateHandle(dis, null);
}
@VisibleForTesting
public StateObjectCollection<OutputStateHandle> deserializeOutputStateHandle(
DataInputStream dis) throws IOException {
- return INSTANCE.deserializeOutputStateHandle(dis, null);
+ return deserializeOutputStateHandle(dis, null);
}
static class SubtaskAndFinishedState {
diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java
index a2d4ef8beb1..f5eb53923ba 100644
--- a/flink-runtime/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java
+++ b/flink-runtime/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java
@@ -61,7 +61,8 @@ public class OperatorSnapshotUtil {
if (rawOperatorState != null) {
dos.writeInt(rawOperatorState.size());
for (OperatorStateHandle operatorStateHandle : rawOperatorState) {
- MetadataV3Serializer.serializeOperatorStateHandleUtil(operatorStateHandle, dos);
+ MetadataV3Serializer.INSTANCE.serializeOperatorStateHandleUtil(
+ operatorStateHandle, dos);
}
} else {
// this means no states, not even an empty list
@@ -72,7 +73,8 @@ public class OperatorSnapshotUtil {
if (managedOperatorState != null) {
dos.writeInt(managedOperatorState.size());
for (OperatorStateHandle operatorStateHandle : managedOperatorState) {
- MetadataV3Serializer.serializeOperatorStateHandleUtil(operatorStateHandle, dos);
+ MetadataV3Serializer.INSTANCE.serializeOperatorStateHandleUtil(
+ operatorStateHandle, dos);
}
} else {
// this means no states, not even an empty list
@@ -83,7 +85,8 @@ public class OperatorSnapshotUtil {
if (rawKeyedState != null) {
dos.writeInt(rawKeyedState.size());
for (KeyedStateHandle keyedStateHandle : rawKeyedState) {
- MetadataV3Serializer.serializeKeyedStateHandleUtil(keyedStateHandle, dos);
+ MetadataV3Serializer.INSTANCE.serializeKeyedStateHandleUtil(
+ keyedStateHandle, dos);
}
} else {
// this means no operator states, not even an empty list
@@ -94,7 +97,8 @@ public class OperatorSnapshotUtil {
if (managedKeyedState != null) {
dos.writeInt(managedKeyedState.size());
for (KeyedStateHandle keyedStateHandle : managedKeyedState) {
- MetadataV3Serializer.serializeKeyedStateHandleUtil(keyedStateHandle, dos);
+ MetadataV3Serializer.INSTANCE.serializeKeyedStateHandleUtil(
+ keyedStateHandle, dos);
}
} else {
// this means no operator states, not even an empty list
@@ -137,7 +141,7 @@ public class OperatorSnapshotUtil {
rawOperatorState = new ArrayList<>();
for (int i = 0; i < numRawOperatorStates; i++) {
OperatorStateHandle operatorState =
- MetadataV3Serializer.deserializeOperatorStateHandleUtil(dis);
+ MetadataV3Serializer.INSTANCE.deserializeOperatorStateHandleUtil(dis);
rawOperatorState.add(operatorState);
}
}
@@ -148,7 +152,7 @@ public class OperatorSnapshotUtil {
managedOperatorState = new ArrayList<>();
for (int i = 0; i < numManagedOperatorStates; i++) {
OperatorStateHandle operatorState =
- MetadataV3Serializer.deserializeOperatorStateHandleUtil(dis);
+ MetadataV3Serializer.INSTANCE.deserializeOperatorStateHandleUtil(dis);
managedOperatorState.add(operatorState);
}
}
@@ -159,7 +163,7 @@ public class OperatorSnapshotUtil {
rawKeyedState = new ArrayList<>();
for (int i = 0; i < numRawKeyedStates; i++) {
KeyedStateHandle keyedState =
- MetadataV3Serializer.deserializeKeyedStateHandleUtil(dis);
+ MetadataV3Serializer.INSTANCE.deserializeKeyedStateHandleUtil(dis);
rawKeyedState.add(keyedState);
}
}
@@ -170,14 +174,14 @@ public class OperatorSnapshotUtil {
managedKeyedState = new ArrayList<>();
for (int i = 0; i < numManagedKeyedStates; i++) {
KeyedStateHandle keyedState =
- MetadataV3Serializer.deserializeKeyedStateHandleUtil(dis);
+ MetadataV3Serializer.INSTANCE.deserializeKeyedStateHandleUtil(dis);
managedKeyedState.add(keyedState);
}
}
final StateObjectCollection<InputStateHandle> inputChannelStateHandles =
v == MetadataV3Serializer.VERSION
- ? MetadataV3Serializer.deserializeInputStateHandle(dis)
+ ? MetadataV3Serializer.INSTANCE.deserializeInputStateHandle(dis)
: StateObjectCollection.empty();
final StateObjectCollection<OutputStateHandle> resultSubpartitionStateHandles =