Skip to content
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

Jump to bottom

[cdc-pipeline-connector][mysql] Ensure the inference of MEDIUMINT_UNSIGNED type matches table schema #2811

Merged
merged 2 commits into from
Dec 5, 2023
Merged

[cdc-pipeline-connector][mysql] Ensure the inference of MEDIUMINT_UNSIGNED type matches table schema #2811

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
d19fc91
[cdc-pipeline-connector][mysql] Ensure the inference of MEDIUMINT_UNS…
Jiabao-Sun Dec 5, 2023
ad2bad7
Address comments
Jiabao-Sun Dec 5, 2023
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
4 changes: 2 additions & 2 deletions ...onnector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/utils/MySqlTypeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ private static DataType convertFromColumn(Column column) {
case INT:
case INTEGER:
case MEDIUMINT:
case MEDIUMINT_UNSIGNED:
case MEDIUMINT_UNSIGNED_ZEROFILL:
case YEAR:
return DataTypes.INT();
case INT_UNSIGNED:
case INT_UNSIGNED_ZEROFILL:
case INTEGER_UNSIGNED:
case INTEGER_UNSIGNED_ZEROFILL:
case MEDIUMINT_UNSIGNED:
case MEDIUMINT_UNSIGNED_ZEROFILL:
case BIGINT:
return DataTypes.BIGINT();
case BIGINT_UNSIGNED:
Expand Down
372 changes: 372 additions & 0 deletions .../src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlMetadataAccessorITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,372 @@
/*
* Copyright 2023 Ververica Inc.
*
* Licensed 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 com.ververica.cdc.connectors.mysql.source;

import org.apache.flink.api.common.restartstrategy.RestartStrategies;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;

import com.ververica.cdc.common.event.TableId;
import com.ververica.cdc.common.schema.Schema;
import com.ververica.cdc.common.types.DataType;
import com.ververica.cdc.common.types.DataTypes;
import com.ververica.cdc.common.types.RowType;
import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig;
import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory;
import com.ververica.cdc.connectors.mysql.table.StartupOptions;
import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer;
import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion;
import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.testcontainers.lifecycle.Startables;

import java.time.ZoneId;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_PASSWORD;
import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_USER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

/** IT cases for {@link MySqlMetadataAccessor}. */
public class MySqlMetadataAccessorITCase extends MySqlSourceTestBase {

private static final MySqlContainer MYSQL8_CONTAINER =
createMySqlContainer(MySqlVersion.V8_0, "docker/server-gtids/expire-seconds/my.cnf");

private final UniqueDatabase fullTypesMySql57Database =
new UniqueDatabase(MYSQL_CONTAINER, "column_type_test", TEST_USER, TEST_PASSWORD);

private final UniqueDatabase fullTypesMySql8Database =
new UniqueDatabase(
MYSQL8_CONTAINER, "column_type_test_mysql8", TEST_USER, TEST_PASSWORD);

private final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();

@BeforeClass
public static void beforeClass() {
LOG.info("Starting MySql8 containers...");
Startables.deepStart(Stream.of(MYSQL8_CONTAINER)).join();
LOG.info("Container MySql8 is started.");
}

@AfterClass
public static void afterClass() {
LOG.info("Stopping MySql8 containers...");
MYSQL8_CONTAINER.stop();
LOG.info("Container MySql8 is stopped.");
}

@Before
public void before() {
env.setParallelism(DEFAULT_PARALLELISM);
env.enableCheckpointing(200);
env.setRestartStrategy(RestartStrategies.noRestart());
}

@Test
public void testMysql57AccessDatabaseAndTable() {
testAccessDatabaseAndTable(fullTypesMySql57Database);
}

@Test
public void testMysql8AccessDatabaseAndTable() {
testAccessDatabaseAndTable(fullTypesMySql8Database);
}

@Test
public void testMysql57AccessCommonTypesSchema() {
testAccessCommonTypesSchema(fullTypesMySql57Database);
}

@Test
public void testMysql8AccessCommonTypesSchema() {
testAccessCommonTypesSchema(fullTypesMySql8Database);
}

@Test
public void testMysql57AccessTimeTypesSchema() {
fullTypesMySql57Database.createAndInitialize();

String[] tables = new String[] {"time_types"};
MySqlMetadataAccessor metadataAccessor =
getMetadataAccessor(tables, fullTypesMySql57Database);

Schema actualSchema =
metadataAccessor.getTableSchema(
TableId.tableId(fullTypesMySql57Database.getDatabaseName(), "time_types"));
Schema expectedSchema =
Schema.newBuilder()
.primaryKey("id")
.fromRowDataType(
RowType.of(
new DataType[] {
DataTypes.DECIMAL(20, 0).notNull(),
DataTypes.INT(),
DataTypes.DATE(),
DataTypes.TIME(0),
DataTypes.TIME(3),
DataTypes.TIME(6),
DataTypes.TIMESTAMP(0),
DataTypes.TIMESTAMP(3),
DataTypes.TIMESTAMP(6),
DataTypes.TIMESTAMP_LTZ(0)
},
new String[] {
"id",
"year_c",
"date_c",
"time_c",
"time_3_c",
"time_6_c",
"datetime_c",
"datetime3_c",
"datetime6_c",
"timestamp_c"
}))
.build();
assertThat(actualSchema).isEqualTo(expectedSchema);
}

@Test
public void testMysql8AccessTimeTypesSchema() {
fullTypesMySql8Database.createAndInitialize();

String[] tables = new String[] {"time_types"};
MySqlMetadataAccessor metadataAccessor =
getMetadataAccessor(tables, fullTypesMySql8Database);

Schema actualSchema =
metadataAccessor.getTableSchema(
TableId.tableId(fullTypesMySql8Database.getDatabaseName(), "time_types"));
Schema expectedSchema =
Schema.newBuilder()
.primaryKey("id")
.fromRowDataType(
RowType.of(
new DataType[] {
DataTypes.DECIMAL(20, 0).notNull(),
DataTypes.INT(),
DataTypes.DATE(),
DataTypes.TIME(0),
DataTypes.TIME(3),
DataTypes.TIME(6),
DataTypes.TIMESTAMP(0),
DataTypes.TIMESTAMP(3),
DataTypes.TIMESTAMP(6),
DataTypes.TIMESTAMP_LTZ(0),
DataTypes.TIMESTAMP_LTZ(3),
DataTypes.TIMESTAMP_LTZ(6)
},
new String[] {
"id",
"year_c",
"date_c",
"time_c",
"time_3_c",
"time_6_c",
"datetime_c",
"datetime3_c",
"datetime6_c",
"timestamp_c",
"timestamp3_c",
"timestamp6_c"
}))
.build();
assertThat(actualSchema).isEqualTo(expectedSchema);
}

private void testAccessDatabaseAndTable(UniqueDatabase database) {
database.createAndInitialize();

String[] tables = new String[] {"common_types", "time_types"};
MySqlMetadataAccessor metadataAccessor = getMetadataAccessor(tables, database);

assertThatThrownBy(metadataAccessor::listNamespaces)
.isInstanceOf(UnsupportedOperationException.class);

List<String> schemas = metadataAccessor.listSchemas(null);
assertThat(schemas).contains(database.getDatabaseName());

List<TableId> actualTables = metadataAccessor.listTables(null, database.getDatabaseName());
List<TableId> expectedTables =
Arrays.stream(tables)
.map(table -> TableId.tableId(database.getDatabaseName(), table))
.collect(Collectors.toList());
assertThat(actualTables).containsExactlyInAnyOrderElementsOf(expectedTables);
}

private void testAccessCommonTypesSchema(UniqueDatabase database) {
database.createAndInitialize();

String[] tables = new String[] {"common_types"};
MySqlMetadataAccessor metadataAccessor = getMetadataAccessor(tables, database);

Schema actualSchema =
metadataAccessor.getTableSchema(
TableId.tableId(database.getDatabaseName(), "common_types"));
Schema expectedSchema =
Schema.newBuilder()
.primaryKey("id")
.fromRowDataType(
RowType.of(
new DataType[] {
DataTypes.DECIMAL(20, 0).notNull(),
DataTypes.TINYINT(),
DataTypes.SMALLINT(),
DataTypes.SMALLINT(),
DataTypes.SMALLINT(),
DataTypes.INT(),
DataTypes.INT(),
DataTypes.INT(),
DataTypes.INT(),
DataTypes.INT(),
DataTypes.INT(),
DataTypes.BIGINT(),
DataTypes.BIGINT(),
DataTypes.INT(),
DataTypes.BIGINT(),
DataTypes.DECIMAL(20, 0),
DataTypes.DECIMAL(20, 0),
DataTypes.VARCHAR(255),
DataTypes.CHAR(3),
DataTypes.DOUBLE(),
DataTypes.FLOAT(),
DataTypes.FLOAT(),
DataTypes.FLOAT(),
DataTypes.DOUBLE(),
DataTypes.DOUBLE(),
DataTypes.DOUBLE(),
DataTypes.DECIMAL(8, 4),
DataTypes.DECIMAL(8, 4),
DataTypes.DECIMAL(8, 4),
DataTypes.DECIMAL(6, 0),
// Decimal precision larger than 38 will be treated as
// string.
DataTypes.STRING(),
DataTypes.BOOLEAN(),
DataTypes.BOOLEAN(),
DataTypes.BOOLEAN(),
DataTypes.BINARY(16),
DataTypes.BINARY(8),
DataTypes.STRING(),
DataTypes.BYTES(),
DataTypes.BYTES(),
DataTypes.BYTES(),
DataTypes.BYTES(),
DataTypes.INT(),
DataTypes.STRING(),
DataTypes.STRING(),
DataTypes.STRING(),
DataTypes.STRING(),
DataTypes.STRING(),
DataTypes.STRING(),
DataTypes.STRING(),
DataTypes.STRING(),
DataTypes.STRING(),
DataTypes.STRING()
},
new String[] {
"id",
"tiny_c",
"tiny_un_c",
"tiny_un_z_c",
"small_c",
"small_un_c",
"small_un_z_c",
"medium_c",
"medium_un_c",
"medium_un_z_c",
"int_c",
"int_un_c",
"int_un_z_c",
"int11_c",
"big_c",
"big_un_c",
"big_un_z_c",
"varchar_c",
"char_c",
"real_c",
"float_c",
"float_un_c",
"float_un_z_c",
"double_c",
"double_un_c",
"double_un_z_c",
"decimal_c",
"decimal_un_c",
"decimal_un_z_c",
"numeric_c",
"big_decimal_c",
"bit1_c",
"tiny1_c",
"boolean_c",
"file_uuid",
"bit_c",
"text_c",
"tiny_blob_c",
"blob_c",
"medium_blob_c",
"long_blob_c",
"year_c",
"enum_c",
"json_c",
"point_c",
"geometry_c",
"linestring_c",
"polygon_c",
"multipoint_c",
"multiline_c",
"multipolygon_c",
"geometrycollection_c"
}))
.build();
assertThat(actualSchema).isEqualTo(expectedSchema);
}

private MySqlMetadataAccessor getMetadataAccessor(String[] tables, UniqueDatabase database) {
MySqlSourceConfig sourceConfig = getConfig(tables, database);
return new MySqlMetadataAccessor(sourceConfig);
}

private MySqlSourceConfig getConfig(String[] captureTables, UniqueDatabase database) {
String[] captureTableIds =
Arrays.stream(captureTables)
.map(tableName -> database.getDatabaseName() + "." + tableName)
.toArray(String[]::new);

return new MySqlSourceConfigFactory()
.startupOptions(StartupOptions.latest())
.databaseList(database.getDatabaseName())
.tableList(captureTableIds)
.includeSchemaChanges(false)
.hostname(database.getHost())
.port(database.getDatabasePort())
.splitSize(10)
.fetchSize(2)
.username(database.getUsername())
.password(database.getPassword())
.serverTimeZone(ZoneId.of("UTC").toString())
.createConfig(0);
}
}
Loading