From 4922a99f661237b041d60ed13c67e1fbb7bf8d2a Mon Sep 17 00:00:00 2001 From: Ferenc Csaky Date: Thu, 16 Jan 2025 13:38:13 +0100 Subject: [PATCH 1/2] [FLINK-37152][build] Update Flink version to 1.20 --- .../apache/flink/cdc/cli/CliFrontendTest.java | 2 +- .../pom.xml | 5 +++-- .../mongodb/LegacyMongoDBTestBase.java | 4 ++-- .../connectors/mysql/LegacyMySqlTestBase.java | 4 ++-- .../polardbx/PolardbxSourceTestBase.java | 4 ++-- .../connectors/oceanbase/OceanBaseTestBase.java | 4 ++-- .../connectors/postgres/PostgresTestBase.java | 4 ++-- .../connectors/sqlserver/SqlServerTestBase.java | 4 ++-- .../flink/cdc/connectors/tidb/TiDBTestBase.java | 4 ++-- .../cdc/connectors/vitess/VitessTestBase.java | 4 ++-- .../runtime/serializer/SerializerTestBase.java | 17 ++++++++++------- pom.xml | 4 ++-- 12 files changed, 32 insertions(+), 28 deletions(-) diff --git a/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java b/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java index 426de119653..4bdf1a16833 100644 --- a/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java +++ b/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java @@ -20,7 +20,7 @@ import org.apache.flink.cdc.composer.PipelineComposer; import org.apache.flink.cdc.composer.PipelineExecution; import org.apache.flink.cdc.composer.definition.PipelineDef; -import org.apache.flink.runtime.jobgraph.RestoreMode; +import org.apache.flink.core.execution.RestoreMode; import org.apache.flink.shaded.guava31.com.google.common.io.Resources; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml index db198c97367..2848a010d95 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml @@ -28,7 +28,8 @@ limitations under the License. flink-cdc-pipeline-connector-starrocks - 1.2.10_flink-${flink.major.version} + + 1.2.10_flink-1.19 @@ -108,4 +109,4 @@ limitations under the License. - \ No newline at end of file + diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java index 9e95779d503..b5c6523b0b7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java @@ -17,7 +17,7 @@ package org.apache.flink.cdc.connectors.mongodb; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import com.mongodb.ConnectionString; import com.mongodb.MongoClientSettings; @@ -41,7 +41,7 @@ * Basic class for testing MongoDB source, this contains a MongoDB container which enables change * streams. */ -public class LegacyMongoDBTestBase extends AbstractTestBase { +public class LegacyMongoDBTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(LegacyMongoDBTestBase.class); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java index 08377c1d7f3..5885d820f85 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.cdc.connectors.mysql; import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -33,7 +33,7 @@ * Basic class for testing MySQL binlog source, this contains a MySQL container which enables * binlog. */ -public abstract class LegacyMySqlTestBase extends AbstractTestBase { +public abstract class LegacyMySqlTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(LegacyMySqlTestBase.class); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java index 43c3c678393..2bf7fdeaa1c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.cdc.connectors.polardbx; import org.apache.flink.table.planner.factories.TestValuesTableFactory; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.apache.flink.types.Row; import com.github.dockerjava.api.model.ExposedPort; @@ -61,7 +61,7 @@ import static org.junit.Assert.assertTrue; /** Basic class for testing Database Polardbx which supported the mysql protocol. */ -public abstract class PolardbxSourceTestBase extends AbstractTestBase { +public abstract class PolardbxSourceTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(PolardbxSourceTestBase.class); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); protected static final Integer PORT = 8527; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java index 9766da91601..ca97e1a181c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java @@ -20,7 +20,7 @@ import org.apache.flink.cdc.connectors.oceanbase.testutils.OceanBaseCdcMetadata; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.utils.LegacyRowResource; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.junit.ClassRule; @@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue; /** Basic class for testing OceanBase source. */ -public abstract class OceanBaseTestBase extends AbstractTestBase { +public abstract class OceanBaseTestBase extends AbstractTestBaseJUnit4 { private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java index c63dec1e7a2..aa72c36433e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java @@ -21,7 +21,7 @@ import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase; import org.apache.flink.table.planner.factories.TestValuesTableFactory; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.apache.flink.types.Row; import io.debezium.config.Configuration; @@ -63,7 +63,7 @@ * Basic class for testing PostgreSQL source, this contains a PostgreSQL container which enables wal * log. */ -public abstract class PostgresTestBase extends AbstractTestBase { +public abstract class PostgresTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(PostgresTestBase.class); public static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); public static final String DEFAULT_DB = "postgres"; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java index d107ea5f489..66bf9ddac2d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.cdc.connectors.sqlserver; import org.apache.flink.table.planner.factories.TestValuesTableFactory; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.awaitility.Awaitility; import org.awaitility.core.ConditionTimeoutException; @@ -49,7 +49,7 @@ import static org.junit.Assert.assertNotNull; /** Utility class for sqlserver tests. */ -public class SqlServerTestBase extends AbstractTestBase { +public class SqlServerTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(SqlServerTestBase.class); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/tidb/TiDBTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/tidb/TiDBTestBase.java index 7c32539e4d9..584143eb3b9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/tidb/TiDBTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/tidb/TiDBTestBase.java @@ -17,7 +17,7 @@ package org.apache.flink.cdc.connectors.tidb; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import com.alibaba.dcm.DnsCacheManipulator; import org.apache.commons.lang3.RandomUtils; @@ -53,7 +53,7 @@ import static org.junit.Assert.assertNotNull; /** Utility class for tidb tests. */ -public class TiDBTestBase extends AbstractTestBase { +public class TiDBTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(TiDBTestBase.class); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java index 494c77987c4..38aa7bb797b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.cdc.connectors.vitess; import org.apache.flink.cdc.connectors.vitess.container.VitessContainer; -import org.apache.flink.test.util.AbstractTestBase; +import org.apache.flink.test.util.AbstractTestBaseJUnit4; import org.junit.BeforeClass; import org.slf4j.Logger; @@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull; /** Basic class for testing Vitess source, this contains a Vitess container. */ -public abstract class VitessTestBase extends AbstractTestBase { +public abstract class VitessTestBase extends AbstractTestBaseJUnit4 { private static final Logger LOG = LoggerFactory.getLogger(VitessTestBase.class); private static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java index db91c4a8c9b..43f6e7ea638 100644 --- a/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java @@ -50,9 +50,9 @@ import java.util.List; import java.util.concurrent.CyclicBarrier; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -486,7 +486,9 @@ public void testDuplicate() throws Exception { // -------------------------------------------------------------------------------------------- private void deepEquals(String message, T should, T is) { - assertThat(message, is, CustomEqualityMatcher.deeplyEquals(should).withChecker(checker)); + assertThat(is) + .as(message) + .matches(CustomEqualityMatcher.deeplyEquals(should).withChecker(checker)); } // -------------------------------------------------------------------------------------------- @@ -580,11 +582,12 @@ public void run() { T serdeTestItem = serializer.deserialize(dataInputDeserializer); T copySerdeTestItem = serializer.copy(serdeTestItem); dataOutputSerializer.clear(); - - assertThat( - "Serialization/Deserialization cycle resulted in an object that are not equal to the original.", - copySerdeTestItem, - CustomEqualityMatcher.deeplyEquals(testItem).withChecker(checker)); + assertThat(copySerdeTestItem) + .as( + "Serialization/Deserialization cycle resulted in an object that are not equal to the original.") + .matches( + CustomEqualityMatcher.deeplyEquals(testItem) + .withChecker(checker)); // try to enforce some upper bound to the test time if (System.nanoTime() >= endTimeNanos) { diff --git a/pom.xml b/pom.xml index a3b6b0c4b84..188d61363c6 100644 --- a/pom.xml +++ b/pom.xml @@ -67,8 +67,8 @@ limitations under the License. true - 1.19.1 - 1.19 + 1.20.0 + 1.20 17.0 1.9.8.Final 3.2.0 From f4f9f89b959c736ee161bd43f44f780ad4cb06c0 Mon Sep 17 00:00:00 2001 From: Ferenc Csaky Date: Thu, 16 Jan 2025 17:13:32 +0100 Subject: [PATCH 2/2] enable debug log for CI --- .../src/test/resources/log4j2-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/resources/log4j2-test.properties b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/resources/log4j2-test.properties index 32df1c0251c..296e3772ca8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/resources/log4j2-test.properties +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/resources/log4j2-test.properties @@ -15,7 +15,7 @@ # Set root logger level to ERROR to not flood build logs # set manually to INFO for debugging purposes -rootLogger.level=ERROR +rootLogger.level=DEBUG rootLogger.appenderRef.test.ref = TestLogger appender.testlogger.name = TestLogger