Skip to content

[FLINK-37240][table] RowDataSerializer relaxes NOT NULL to NULL as a state compatibility change. #28074

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

Open
Au-Miner wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[FLINK-37240][table] RowDataSerializer relaxes NOT NULL to NULL as a state compatibility change. #28074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d922445
[FLINK-37240][table] RowDataSerializer relaxes NOT NULL to NULL as a …
Au-Miner Apr 30, 2026
e0dbacf
solve comments
Au-Miner May 8, 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
13 changes: 9 additions & 4 deletions ...java/org/apache/flink/table/runtime/typeutils/serializers/python/ArrayDataSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@

import java.io.IOException;

import static org.apache.flink.table.runtime.typeutils.SerializerCheckUtils.isSerializerCompatibleAfterNullabilityWidening;
import static org.apache.flink.table.types.logical.utils.LogicalTypeUtils.isTypeCompatibleAfterNullabilityWidening;

/**
* A {@link TypeSerializer} for {@link ArrayData}. It should be noted that the header will not be
* encoded. Currently Python doesn't support BinaryArrayData natively, so we can't use
Expand Down Expand Up @@ -182,13 +185,15 @@ public TypeSerializerSchemaCompatibility<ArrayData> resolveSchemaCompatibility(

ArrayDataSerializerSnapshot oldArrayDataSerializerSnapshot =
(ArrayDataSerializerSnapshot) oldSerializerSnapshot;
if (!elementType.equals(oldArrayDataSerializerSnapshot.elementType)
|| !elementTypeSerializer.equals(

if (!isTypeCompatibleAfterNullabilityWidening(
elementType, oldArrayDataSerializerSnapshot.elementType)
|| !isSerializerCompatibleAfterNullabilityWidening(
elementTypeSerializer,
oldArrayDataSerializerSnapshot.elementTypeSerializer)) {
return TypeSerializerSchemaCompatibility.incompatible();
} else {
return TypeSerializerSchemaCompatibility.compatibleAsIs();
}
return TypeSerializerSchemaCompatibility.compatibleAsIs();
}
}
}
19 changes: 13 additions & 6 deletions ...n/java/org/apache/flink/table/runtime/typeutils/serializers/python/MapDataSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@

import java.io.IOException;

import static org.apache.flink.table.runtime.typeutils.SerializerCheckUtils.isSerializerCompatibleAfterNullabilityWidening;
import static org.apache.flink.table.types.logical.utils.LogicalTypeUtils.isTypeCompatibleAfterNullabilityWidening;

/**
* A {@link TypeSerializer} for {@link MapData}. It should be noted that the header will not be
* encoded. Currently Python doesn't support BinaryMapData natively, so we can't use
Expand Down Expand Up @@ -237,14 +240,18 @@ public TypeSerializerSchemaCompatibility<MapData> resolveSchemaCompatibility(

BaseMapSerializerSnapshot oldBaseMapDataSerializerSnapshot =
(BaseMapSerializerSnapshot) oldSerializerSnapshot;
if (!keyType.equals(oldBaseMapDataSerializerSnapshot.keyType)
|| !valueType.equals(oldBaseMapDataSerializerSnapshot.valueType)
|| !keySerializer.equals(oldBaseMapDataSerializerSnapshot.keySerializer)
|| !valueSerializer.equals(oldBaseMapDataSerializerSnapshot.valueSerializer)) {

if (!isTypeCompatibleAfterNullabilityWidening(
keyType, oldBaseMapDataSerializerSnapshot.keyType)
|| !isTypeCompatibleAfterNullabilityWidening(
valueType, oldBaseMapDataSerializerSnapshot.valueType)
|| !isSerializerCompatibleAfterNullabilityWidening(
keySerializer, oldBaseMapDataSerializerSnapshot.keySerializer)
|| !isSerializerCompatibleAfterNullabilityWidening(
valueSerializer, oldBaseMapDataSerializerSnapshot.valueSerializer)) {
return TypeSerializerSchemaCompatibility.incompatible();
} else {
return TypeSerializerSchemaCompatibility.compatibleAsIs();
}
return TypeSerializerSchemaCompatibility.compatibleAsIs();
}
}
}
11 changes: 6 additions & 5 deletions ...n/java/org/apache/flink/table/runtime/typeutils/serializers/python/RowDataSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
import org.apache.flink.util.InstantiationUtil;

import java.io.IOException;
import java.util.Arrays;
import java.util.stream.IntStream;

import static org.apache.flink.api.java.typeutils.runtime.MaskUtils.readIntoMask;
import static org.apache.flink.api.java.typeutils.runtime.MaskUtils.writeMask;
import static org.apache.flink.table.types.logical.utils.LogicalTypeUtils.areTypesCompatibleAfterNullabilityWidening;

/**
* A {@link TypeSerializer} for {@link RowData}. It should be noted that the row kind will be
Expand Down Expand Up @@ -199,13 +199,14 @@ public RowDataSerializer restoreSerializer() {
@Override
public TypeSerializerSchemaCompatibility<RowData> resolveSchemaCompatibility(
TypeSerializerSnapshot<RowData> oldSerializerSnapshot) {
if (!(oldSerializerSnapshot instanceof RowDataSerializerSnapshot)) {
if (!(oldSerializerSnapshot
instanceof RowDataSerializerSnapshot oldRowDataSerializerSnapshot)) {
return TypeSerializerSchemaCompatibility.incompatible();
}

RowDataSerializerSnapshot oldRowDataSerializerSnapshot =
(RowDataSerializerSnapshot) oldSerializerSnapshot;
if (!Arrays.equals(types, oldRowDataSerializerSnapshot.types)) {
// Allow NOT NULL -> NULL widening; reject NULL -> NOT NULL narrowing.
if (!areTypesCompatibleAfterNullabilityWidening(
types, oldRowDataSerializerSnapshot.types)) {
return TypeSerializerSchemaCompatibility.incompatible();
}

Expand Down
Loading