yoheimuta commented on code in PR #3876: URL: https://github.com/apache/flink-cdc/pull/3876#discussion_r1924784146
########## flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlRenameTablesSchemaFixITCase.java: ########## @@ -0,0 +1,385 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.cdc.connectors.mysql.source; + +import org.apache.flink.api.common.eventtime.WatermarkStrategy; +import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.cdc.common.utils.TestCaseUtils; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.TestTable; +import org.apache.flink.cdc.connectors.mysql.testutils.TestTableSchemas; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.core.execution.JobClient; +import org.apache.flink.core.execution.SavepointFormatType; +import org.apache.flink.runtime.jobgraph.SavepointConfigOptions; +import org.apache.flink.streaming.api.CheckpointingMode; +import org.apache.flink.streaming.api.datastream.DataStream; +import org.apache.flink.streaming.api.datastream.DataStreamSource; +import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; +import org.apache.flink.streaming.api.operators.collect.CollectResultIterator; +import org.apache.flink.streaming.api.operators.collect.CollectSinkOperator; +import org.apache.flink.streaming.api.operators.collect.CollectSinkOperatorFactory; +import org.apache.flink.streaming.api.operators.collect.CollectStreamSink; +import org.apache.flink.test.junit5.MiniClusterExtension; +import org.apache.flink.util.FlinkRuntimeException; + +import io.debezium.connector.mysql.MySqlConnection; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.rules.TemporaryFolder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.output.Slf4jLogConsumer; + +import java.io.File; +import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.time.ZoneId; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; +import java.util.UUID; + +/** + * Integration tests for handling schema changes regard to renaming multiple tables within a single + * statement. + */ +public class MySqlRenameTablesSchemaFixITCase { + private static final Logger LOG = + LoggerFactory.getLogger(MySqlRenameTablesSchemaFixITCase.class); + @RegisterExtension static MiniClusterExtension miniCluster = new MiniClusterExtension(); + + @SuppressWarnings("unchecked") + private final MySqlContainer mysql = + (MySqlContainer) + new MySqlContainer() + .withConfigurationOverride( + buildMySqlConfigWithTimezone( + getResourceFolder(), getSystemTimeZone())) + .withSetupSQL("docker/setup.sql") + .withDatabaseName("flink-test") + .withUsername("flinkuser") + .withPassword("flinkpw") + .withLogConsumer(new Slf4jLogConsumer(LOG)); + + private final UniqueDatabase customDatabase = + new UniqueDatabase(mysql, "customer", "mysqluser", "mysqlpw"); + private final TestTable customers = + new TestTable(customDatabase, "customers", TestTableSchemas.CUSTOMERS); + + private MySqlConnection connection; + + @BeforeEach + void prepare() throws Exception { + mysql.start(); + connection = getConnection(); + customDatabase.createAndInitialize(); + flushLogs(); + } + + @AfterEach + void tearDown() throws Exception { + customDatabase.dropDatabase(); + connection.close(); + mysql.stop(); + } + + /** + * Tests handling of renaming multiple tables within a single SQL statement in a Flink CDC job. + * + * <p>This integration test validates that schema changes involving multiple table renames, such + * as {@code RENAME TABLE table1 TO table1_old, table2 TO table1}, are correctly processed + * without data loss or inconsistency. + * + * <p>The test covers: + * + * <ul> + * <li>Initial validation of table contents before renaming. + * <li>Steps to rename tables, including schema changes like column drops. + * <li>Ensuring data integrity during savepoints and job restarts. + * <li>Validation of data consumption before and after savepoints to confirm state + * correctness. + * </ul> + * + * <p>This ensures that the connector can accurately process and persist schema changes when + * tables are swapped, addressing potential issues with table filtering or mismatched table IDs + * during schema updates. + */ + @Test + void testRenameTablesWithinSingleStatement() throws Exception { + // Build Flink job + StreamExecutionEnvironment env = getExecutionEnvironment(); + MySqlSource<String> source = getSourceBuilder().build(); + DataStreamSource<String> stream = + env.fromSource(source, WatermarkStrategy.noWatermarks(), "rename-tables-test"); + CollectResultIterator<String> iterator = addCollector(env, stream); + + // Copy transformations into another env + StreamExecutionEnvironment restoredEnv = getExecutionEnvironment(); + duplicateTransformations(env, restoredEnv); + + // Execute job and validate results + JobClient jobClient = env.executeAsync(); + iterator.setJobClient(jobClient); + + { + String[] expected = + new String[] { + "{\"id\":101,\"name\":\"user_1\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":102,\"name\":\"user_2\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":103,\"name\":\"user_3\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":109,\"name\":\"user_4\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":110,\"name\":\"user_5\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":111,\"name\":\"user_6\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":118,\"name\":\"user_7\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":121,\"name\":\"user_8\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":123,\"name\":\"user_9\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1009,\"name\":\"user_10\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1010,\"name\":\"user_11\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1011,\"name\":\"user_12\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1012,\"name\":\"user_13\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1013,\"name\":\"user_14\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1014,\"name\":\"user_15\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1015,\"name\":\"user_16\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1016,\"name\":\"user_17\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1017,\"name\":\"user_18\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1018,\"name\":\"user_19\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":1019,\"name\":\"user_20\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + "{\"id\":2000,\"name\":\"user_21\",\"address\":\"Shanghai\",\"phone_number\":\"123567891234\"}", + }; + List<String> rows = fetchRow(iterator, 21); + TestCaseUtils.repeatedCheck( + () -> Arrays.stream(expected).allMatch(rows.toString()::contains)); + } + + { + LOG.info("Step 1: Create a copy of the target table"); + executeStatements( + String.format( + "CREATE TABLE %s_copy LIKE %s;", + customers.getTableId(), customers.getTableId())); + + LOG.info("Step 2: Alter the copied table to drop a column"); + executeStatements( + String.format( + "ALTER TABLE %s_copy DROP COLUMN phone_number;", + customers.getTableId())); + + LOG.info("Step 3: Swap the tables"); + executeStatements( + String.format( + "RENAME TABLE %s TO %s_old, %s_copy TO %s;", + customers.getTableId(), + customers.getTableId(), + customers.getTableId(), + customers.getTableId())); Review Comment: 📝 This issue does not occur when two separate RENAME TABLE statements are executed. The following test diff demonstrates how to confirm this behavior before fixing the source code: ```diff diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlRenameTablesSchemaFixITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlRenameTablesSchemaFixITCase.java index 7d885c47..5e773ddd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlRenameTablesSchemaFixITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlRenameTablesSchemaFixITCase.java @@ -198,11 +198,13 @@ public class MySqlRenameTablesSchemaFixITCase { LOG.info("Step 3: Swap the tables"); executeStatements( String.format( - "RENAME TABLE %s TO %s_old, %s_copy TO %s;", - customers.getTableId(), - customers.getTableId(), - customers.getTableId(), - customers.getTableId())); + "RENAME TABLE %s TO %s_old;", + customers.getTableId(), customers.getTableId())); + + executeStatements( + String.format( + "RENAME TABLE %s_copy TO %s;", + customers.getTableId(), customers.getTableId())); LOG.info("Step 4: Insert data into the altered table before the savepoint"); executeStatements( ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
