Skip to content

Fix data race in JsonPayloadSerializerProvider. #38265

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
stankiewicz merged 2 commits into from
Apr 27, 2026
Merged

Fix data race in JsonPayloadSerializerProvider. #38265

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03f56f6
JsonPayloadSerializerProvider
stankiewicz Apr 22, 2026
ba2ce60
Apply recommended changes to JsonPayloadSerializer: mark fields volat…
stankiewicz Apr 24, 2026
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
53 changes: 46 additions & 7 deletions .../src/main/java/org/apache/beam/sdk/schemas/io/payloads/JsonPayloadSerializerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import org.apache.beam.sdk.util.RowJson.RowJsonDeserializer;
import org.apache.beam.sdk.util.RowJson.RowJsonSerializer;
import org.apache.beam.sdk.util.RowJsonUtils;
import org.apache.beam.sdk.values.Row;
import org.checkerframework.checker.nullness.qual.Nullable;

@Internal
@AutoService(PayloadSerializerProvider.class)
Expand All @@ -38,12 +40,49 @@ public String identifier() {

@Override
public PayloadSerializer getSerializer(Schema schema, Map<String, Object> tableParams) {
ObjectMapper deserializeMapper =
RowJsonUtils.newObjectMapperWith(RowJsonDeserializer.forSchema(schema));
ObjectMapper serializeMapper =
RowJsonUtils.newObjectMapperWith(RowJsonSerializer.forSchema(schema));
return PayloadSerializer.of(
row -> RowJsonUtils.rowToJson(serializeMapper, row).getBytes(UTF_8),
bytes -> RowJsonUtils.jsonToRow(deserializeMapper, new String(bytes, UTF_8)));
return new JsonPayloadSerializer(schema);
}

private static class JsonPayloadSerializer implements PayloadSerializer {
private final Schema schema;
private transient volatile @Nullable ObjectMapper deserializeMapper;
private transient volatile @Nullable ObjectMapper serializeMapper;

public JsonPayloadSerializer(Schema schema) {
this.schema = schema;
}
Comment thread
stankiewicz marked this conversation as resolved.

private ObjectMapper getDeserializeMapper() {
if (deserializeMapper == null) {
synchronized (this) {
if (deserializeMapper == null) {
deserializeMapper =
RowJsonUtils.newObjectMapperWith(RowJsonDeserializer.forSchema(schema));
}
}
}
return deserializeMapper;
}

private ObjectMapper getSerializeMapper() {
if (serializeMapper == null) {
synchronized (this) {
if (serializeMapper == null) {
serializeMapper = RowJsonUtils.newObjectMapperWith(RowJsonSerializer.forSchema(schema));
}
}
}
return serializeMapper;
}

@Override
public byte[] serialize(Row row) {
return RowJsonUtils.rowToJson(getSerializeMapper(), row).getBytes(UTF_8);
}

@Override
public Row deserialize(byte[] bytes) {
return RowJsonUtils.jsonToRow(getDeserializeMapper(), new String(bytes, UTF_8));
}
}
}
Loading