Skip to content

[Fix] Swap canConvert argument order in CdcActionCommonUtils.schemaCompatible #8369

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
0dunay0 wants to merge 1 commit into
base: master
Choose a base branch
from
+60 −6
Open

[Fix] Swap canConvert argument order in CdcActionCommonUtils.schemaCompatible #8369

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
17 changes: 11 additions & 6 deletions ...imon-flink-cdc/src/main/java/org/apache/paimon/flink/action/cdc/CdcActionCommonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,19 @@ public static boolean schemaCompatible(
return false;
}
DataType type = paimonSchema.fields().get(idx).type();
if (UpdatedDataFieldsProcessFunction.canConvert(
field.type(), type, TypeMapping.defaultMapping())
!= UpdatedDataFieldsProcessFunction.ConvertAction.CONVERT) {
UpdatedDataFieldsProcessFunction.ConvertAction sourceToPaimon =
UpdatedDataFieldsProcessFunction.canConvert(
field.type(), type, TypeMapping.defaultMapping());
UpdatedDataFieldsProcessFunction.ConvertAction paimonToSource =
UpdatedDataFieldsProcessFunction.canConvert(
type, field.type(), TypeMapping.defaultMapping());
if (sourceToPaimon != UpdatedDataFieldsProcessFunction.ConvertAction.CONVERT
&& paimonToSource != UpdatedDataFieldsProcessFunction.ConvertAction.CONVERT) {
LOG.info(
"Cannot convert field '{}' from source table type '{}' to Paimon type '{}'.",
"Cannot convert field '{}': Paimon type '{}' and source table type '{}' are incompatible.",
field.name(),
field.type(),
type);
type,
field.type());
return false;
}
}
Expand Down
49 changes: 49 additions & 0 deletions ...aimon-flink-cdc/src/test/java/org/apache/paimon/flink/action/cdc/SchemaEvolutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.paimon.table.FileStoreTableFactory;
import org.apache.paimon.table.TableTestBase;
import org.apache.paimon.types.BigIntType;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataTypes;
import org.apache.paimon.types.DecimalType;
import org.apache.paimon.types.DoubleType;
Expand All @@ -50,6 +51,9 @@
import java.util.Arrays;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

/** Used to test schema evolution related logic. */
public class SchemaEvolutionTest extends TableTestBase {

Expand Down Expand Up @@ -201,6 +205,51 @@ public void before() throws Exception {
table = FileStoreTableFactory.create(LocalFileIO.create(), tablePath, tableSchema);
}

@Test
public void testSchemaCompatibleTypeWidening() throws Exception {
FileIO fileIO = LocalFileIO.create();
Path tablePath =
new Path(String.format("%s/%s.db/%s", warehouse, database, "WideningTable"));
// Paimon table has id INT, quantity INT, name STRING.
Schema baseSchema =
Schema.newBuilder()
.column("id", DataTypes.INT())
.column("quantity", DataTypes.INT())
.column("name", DataTypes.STRING())
.primaryKey("id")
.build();
TableSchema tableSchema =
SchemaUtils.forceCommit(new SchemaManager(fileIO, tablePath), baseSchema);

// Paimon INT, source BIGINT: Paimon can evolve INT -> BIGINT, compatible.
List<DataField> bigintFields =
Arrays.asList(
new DataField(0, "id", DataTypes.INT()),
new DataField(1, "quantity", DataTypes.BIGINT()));
assertTrue(CdcActionCommonUtils.schemaCompatible(tableSchema, bigintFields));

// Paimon INT, source SMALLINT: source fits in Paimon INT as-is, compatible.
List<DataField> smallintFields =
Arrays.asList(
new DataField(0, "id", DataTypes.INT()),
new DataField(1, "quantity", DataTypes.SMALLINT()));
assertTrue(CdcActionCommonUtils.schemaCompatible(tableSchema, smallintFields));

// Paimon STRING, source VARCHAR(20): source fits in Paimon STRING, compatible.
List<DataField> varcharFields =
Arrays.asList(
new DataField(0, "id", DataTypes.INT()),
new DataField(1, "name", new VarCharType(true, 20)));
assertTrue(CdcActionCommonUtils.schemaCompatible(tableSchema, varcharFields));

// Paimon INT, source STRING: incompatible type families.
List<DataField> incompatibleFields =
Arrays.asList(
new DataField(0, "id", DataTypes.INT()),
new DataField(1, "quantity", DataTypes.STRING()));
assertFalse(CdcActionCommonUtils.schemaCompatible(tableSchema, incompatibleFields));
}

@Test
public void testSchemaEvolution() throws Exception {
final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down
Loading