From a749cf7aab546c9d494939a52dacf598fbf5219e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BC=8E=E6=98=95?= Date: Thu, 16 Jan 2025 13:21:58 +0800 Subject: [PATCH 1/4] fix: update maxcompute emulator version to 0.0.7 --- .../flink/cdc/connectors/maxcompute/EmulatorTestBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/src/test/java/org/apache/flink/cdc/connectors/maxcompute/EmulatorTestBase.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/src/test/java/org/apache/flink/cdc/connectors/maxcompute/EmulatorTestBase.java index 717058ec681..9062871fbca 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/src/test/java/org/apache/flink/cdc/connectors/maxcompute/EmulatorTestBase.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/src/test/java/org/apache/flink/cdc/connectors/maxcompute/EmulatorTestBase.java @@ -41,7 +41,7 @@ public class EmulatorTestBase { private static final Logger LOG = LoggerFactory.getLogger(EmulatorTestBase.class); public static final DockerImageName MAXCOMPUTE_IMAGE = - DockerImageName.parse("maxcompute/maxcompute-emulator:v0.0.4"); + DockerImageName.parse("maxcompute/maxcompute-emulator:v0.0.7"); @ClassRule public static GenericContainer maxcompute = From 8f2263cd51adf5263dc1b4f525479fb48fcedb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BC=8E=E6=98=95?= Date: Thu, 16 Jan 2025 13:30:02 +0800 Subject: [PATCH 2/4] feat: add maxcompute to flink_cdc_base.yml --- .github/workflows/flink_cdc_base.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flink_cdc_base.yml b/.github/workflows/flink_cdc_base.yml index 153002804b2..e45373f6223 100644 --- a/.github/workflows/flink_cdc_base.yml +++ b/.github/workflows/flink_cdc_base.yml @@ -58,7 +58,8 @@ env: flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-kafka,\ flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon,\ flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-elasticsearch,\ - flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-oceanbase" + flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-oceanbase,\ + flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute" MODULES_MYSQL: "\ flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc,\ From 9c0cc3f6f36ac91e5cb8f7f7c197374d40d7a62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BC=8E=E6=98=95?= Date: Thu, 16 Jan 2025 14:55:05 +0800 Subject: [PATCH 3/4] fix: ut failed in different timezone --- .../cdc/connectors/maxcompute/utils/TypeConvertUtilsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/src/test/java/org/apache/flink/cdc/connectors/maxcompute/utils/TypeConvertUtilsTest.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/src/test/java/org/apache/flink/cdc/connectors/maxcompute/utils/TypeConvertUtilsTest.java index 09c1b011120..1244e5a7900 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/src/test/java/org/apache/flink/cdc/connectors/maxcompute/utils/TypeConvertUtilsTest.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/src/test/java/org/apache/flink/cdc/connectors/maxcompute/utils/TypeConvertUtilsTest.java @@ -167,7 +167,7 @@ public void testRecordConvert() { 123456.789d, 12345, 12345, - TimestampData.fromTimestamp(Timestamp.from(Instant.ofEpochSecond(0))), + TimestampData.fromTimestamp(Timestamp.valueOf("1970-01-01 00:00:00")), LocalZonedTimestampData.fromInstant(Instant.ofEpochSecond(0)), ZonedTimestampData.fromZonedDateTime( ZonedDateTime.ofInstant( @@ -179,7 +179,7 @@ public void testRecordConvert() { TypeConvertUtils.toMaxComputeRecord(schemaWithoutComplexType, record1, arrayRecord); String expect = - "char,varchar,string,false,=01=02=03=04=05,=01=02=03=04=05=06=07=08=09=0A,0.00,1,2,12345,12345,123.456,123456.789,00:00:00.012345,2003-10-20,1970-01-01T08:00,1970-01-01T00:00:00Z,1970-01-01T00:00:00Z"; + "char,varchar,string,false,=01=02=03=04=05,=01=02=03=04=05=06=07=08=09=0A,0.00,1,2,12345,12345,123.456,123456.789,00:00:00.012345,2003-10-20,1970-01-01T00:00,1970-01-01T00:00:00Z,1970-01-01T00:00:00Z"; Assert.assertEquals(expect, arrayRecord.toString()); } } From 542e6cd25e85f831aa23496aff57e654f02d6c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BC=8E=E6=98=95?= Date: Wed, 22 Jan 2025 14:10:00 +0800 Subject: [PATCH 4/4] fix doc typo --- .../docs/connectors/pipeline-connectors/maxcompute.md | 6 +++--- .../docs/connectors/pipeline-connectors/maxcompute.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/content.zh/docs/connectors/pipeline-connectors/maxcompute.md b/docs/content.zh/docs/connectors/pipeline-connectors/maxcompute.md index 63e2f4700ff..bcf02f7185e 100644 --- a/docs/content.zh/docs/connectors/pipeline-connectors/maxcompute.md +++ b/docs/content.zh/docs/connectors/pipeline-connectors/maxcompute.md @@ -54,11 +54,11 @@ source: sink: type: maxcompute name: MaxCompute Sink - accessId: ak - accessKey: sk + access-id: ak + access-key: sk endpoint: endpoint project: flink_cdc - bucketSize: 8 + buckets-num: 8 pipeline: name: MySQL to MaxCompute Pipeline diff --git a/docs/content/docs/connectors/pipeline-connectors/maxcompute.md b/docs/content/docs/connectors/pipeline-connectors/maxcompute.md index f05cca380ec..898066437ed 100644 --- a/docs/content/docs/connectors/pipeline-connectors/maxcompute.md +++ b/docs/content/docs/connectors/pipeline-connectors/maxcompute.md @@ -54,11 +54,11 @@ source: sink: type: maxcompute name: MaxCompute Sink - accessId: ak - accessKey: sk + access-id: ak + access-key: sk endpoint: endpoint project: flink_cdc - bucketSize: 8 + buckets-num: 8 pipeline: name: MySQL to MaxCompute Pipeline