Skip to content

[BP-2.0][FLINK-40157][state/ForSt] Fix MapState putAll value serialization #28771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zakelly merged 1 commit into from
Jul 21, 2026
+4 −18
Merged

[BP-2.0][FLINK-40157][state/ForSt] Fix MapState putAll value serialization #28771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions ...statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBBunchPutRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
package org.apache.flink.state.forst;

import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.core.memory.DataInputDeserializer;
import org.apache.flink.core.memory.DataOutputSerializer;
import org.apache.flink.core.state.InternalStateFuture;

import org.forstdb.RocksDB;
Expand All @@ -43,14 +40,7 @@
*/
public class ForStDBBunchPutRequest<K, N, UK, UV> extends ForStDBPutRequest<K, N, Map<UK, UV>> {

/** Serializer for the user values. */
final TypeSerializer<UV> userValueSerializer;

/** The data outputStream used for value serializer, which should be thread-safe. */
final ThreadLocal<DataOutputSerializer> valueSerializerView;

/** The data inputStream used for value deserializer, which should be thread-safe. */
final ThreadLocal<DataInputDeserializer> valueDeserializerView;
private final ForStMapState<K, N, UK, UV> mapState;

final int keyGroupPrefixBytes;

Expand All @@ -60,9 +50,7 @@ public ForStDBBunchPutRequest(
ForStMapState<K, N, UK, UV> table,
InternalStateFuture<Void> future) {
super(key, value, false, (ForStInnerTable<K, N, Map<UK, UV>>) table, future);
this.userValueSerializer = table.userValueSerializer;
this.valueSerializerView = table.valueSerializerView;
this.valueDeserializerView = table.valueDeserializerView;
this.mapState = table;
this.keyGroupPrefixBytes = table.getKeyGroupPrefixBytes();
}

Expand Down Expand Up @@ -98,10 +86,7 @@ public byte[] buildSerializedKey(UK userKey) throws IOException {
}

public byte[] buildSerializedValue(UV singleValue) throws IOException {
DataOutputSerializer outputView = valueSerializerView.get();
outputView.clear();
userValueSerializer.serialize(singleValue, outputView);
return outputView.getCopyOfBuffer();
return mapState.serializeValue(singleValue);
}

// --------------- For testing usage ---------------
Expand Down
1 change: 1 addition & 0 deletions ...ackend-forst/src/test/java/org/apache/flink/state/forst/ForStWriteBatchOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ void testMapStateWriteBatch() throws Exception {
byte[] valueBytes = db.get(request.getColumnFamilyHandle(), keyBytes);
assertArrayEquals(
valueBytes, bunchPutRequest.buildSerializedValue(en.getValue()));
assertThat(mapState1.deserializeValue(valueBytes)).isEqualTo(en.getValue());
}
} else {
byte[] keyBytes = request.buildSerializedKey();
Expand Down