Skip to content

Commit 0c77212

Browse files
linjianchanglinjianchang
authored
Merge branch 'apache:master' into master-36796
2 parents f451287 + 998e023 commit 0c77212

File tree

83 files changed

+8988
-60
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+8988
-60
lines changed

‎.github/labeler.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,5 @@ maxcompute-pipeline-connector:
9595
- flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute/**/*
9696
iceberg-pipeline-connector:
9797
- flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-iceberg/**/*
98+
postgres-pipeline-connector:
99+
- flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-postgres/**/*

‎.github/workflows/flink_cdc_base.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ env:
5959
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute,\
6060
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql,\
6161
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-oceanbase,\
62+
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute,\
63+
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-postgres,\
6264
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon,\
6365
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks,\
66+
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-fluss,\
6467
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values"
6568

6669
MODULES_MYSQL_SOURCE: "\
@@ -70,10 +73,13 @@ env:
7073
MODULES_MYSQL_PIPELINE: "\
7174
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql"
7275

73-
MODULES_POSTGRES: "\
76+
MODULES_POSTGRES_SOURCE: "\
7477
flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc,\
7578
flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc"
7679

80+
MODULES_POSTGRES_PIPELINE: "\
81+
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-postgres"
82+
7783
MODULES_ORACLE: "\
7884
flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc,\
7985
flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc"
@@ -126,6 +132,9 @@ env:
126132
MODULES_MAXCOMPUTE: "\
127133
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-maxcompute"
128134

135+
MODULES_FLUSS: "\
136+
flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-fluss"
137+
129138
MODULES_PIPELINE_E2E: "\
130139
flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests"
131140

@@ -196,8 +205,11 @@ jobs:
196205
("mysql-pipeline")
197206
modules=${{ env.MODULES_MYSQL_PIPELINE }}
198207
;;
199-
("postgres")
200-
modules=${{ env.MODULES_POSTGRES }}
208+
("postgres-source")
209+
modules=${{ env.MODULES_POSTGRES_SOURCE }}
210+
;;
211+
("postgres-pipeline")
212+
modules=${{ env.MODULES_POSTGRES_PIPELINE }}
201213
;;
202214
("oracle")
203215
modules=${{ env.MODULES_ORACLE }}
@@ -247,12 +259,15 @@ jobs:
247259
("starrocks")
248260
modules=${{ env.MODULES_STARROCKS }}
249261
;;
262+
("fluss")
263+
modules=${{ env.MODULES_FLUSS }}
264+
;;
250265
("pipeline_e2e")
251-
compile_modules="${{ env.MODULES_CORE }},${{ env.MODULES_PIPELINE_CONNECTORS }},${{ env.MODULES_MYSQL_SOURCE }},${{ env.MODULES_POSTGRES }},${{ env.MODULES_ORACLE }},${{ env.MODULES_MONGODB }},${{ env.MODULES_SQLSERVER }},${{ env.MODULES_TIDB }},${{ env.MODULES_OCEANBASE_SOURCE }},${{ env.MODULES_DB2 }},${{ env.MODULES_VITESS }},${{ env.MODULES_PIPELINE_E2E }}"
266+
compile_modules="${{ env.MODULES_CORE }},${{ env.MODULES_PIPELINE_CONNECTORS }},${{ env.MODULES_MYSQL_SOURCE }},${{ env.MODULES_POSTGRES_SOURCE }},${{ env.MODULES_ORACLE }},${{ env.MODULES_MONGODB }},${{ env.MODULES_SQLSERVER }},${{ env.MODULES_TIDB }},${{ env.MODULES_OCEANBASE_SOURCE }},${{ env.MODULES_DB2 }},${{ env.MODULES_VITESS }},${{ env.MODULES_PIPELINE_E2E }}"
252267
modules=${{ env.MODULES_PIPELINE_E2E }}
253268
;;
254269
("source_e2e")
255-
compile_modules="${{ env.MODULES_CORE }},${{ env.MODULES_PIPELINE_CONNECTORS }},${{ env.MODULES_MYSQL_SOURCE }},${{ env.MODULES_POSTGRES }},${{ env.MODULES_ORACLE }},${{ env.MODULES_MONGODB }},${{ env.MODULES_SQLSERVER }},${{ env.MODULES_TIDB }},${{ env.MODULES_OCEANBASE_SOURCE }},${{ env.MODULES_DB2 }},${{ env.MODULES_VITESS }},${{ env.MODULES_SOURCE_E2E }}"
270+
compile_modules="${{ env.MODULES_CORE }},${{ env.MODULES_PIPELINE_CONNECTORS }},${{ env.MODULES_MYSQL_SOURCE }},${{ env.MODULES_POSTGRES_SOURCE }},${{ env.MODULES_ORACLE }},${{ env.MODULES_MONGODB }},${{ env.MODULES_SQLSERVER }},${{ env.MODULES_TIDB }},${{ env.MODULES_OCEANBASE_SOURCE }},${{ env.MODULES_DB2 }},${{ env.MODULES_VITESS }},${{ env.MODULES_SOURCE_E2E }}"
256271
modules=${{ env.MODULES_SOURCE_E2E }}
257272
;;
258273
esac

‎.github/workflows/flink_cdc_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ jobs:
6868
uses: ./.github/workflows/flink_cdc_base.yml
6969
with:
7070
java-versions: "[8]"
71-
modules: "['mysql-pipeline', 'oceanbase-pipeline', 'doris', 'elasticsearch', 'iceberg', 'kafka', 'maxcompute', 'paimon', 'starrocks']"
71+
modules: "['mysql-pipeline', 'postgres-pipeline', 'oceanbase-pipeline', 'doris', 'elasticsearch', 'iceberg', 'kafka', 'maxcompute', 'paimon', 'starrocks', 'fluss']"
7272
source-ut:
7373
name: Source Unit Tests
7474
uses: ./.github/workflows/flink_cdc_base.yml
7575
with:
7676
java-versions: "[8]"
77-
modules: "['mysql-source', 'postgres', 'oracle', 'mongodb6', 'mongodb7', 'sqlserver', 'tidb', 'oceanbase-source', 'db2', 'vitess']"
77+
modules: "['mysql-source', 'postgres-source', 'oracle', 'mongodb6', 'mongodb7', 'sqlserver', 'tidb', 'oceanbase-source', 'db2', 'vitess']"
7878
pipeline_e2e:
7979
strategy:
8080
fail-fast: false

‎.github/workflows/flink_cdc_ci_nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ jobs:
6060
uses: ./.github/workflows/flink_cdc_base.yml
6161
with:
6262
java-versions: "[11]"
63-
modules: "['mysql-pipeline', 'oceanbase-pipeline', 'doris', 'elasticsearch', 'iceberg', 'kafka', 'maxcompute', 'paimon', 'starrocks']"
63+
modules: "['mysql-pipeline', 'postgres-pipeline', 'oceanbase-pipeline', 'doris', 'elasticsearch', 'iceberg', 'kafka', 'maxcompute', 'paimon', 'starrocks', 'fluss']"
6464
source-ut:
6565
if: github.repository == 'apache/flink-cdc'
6666
name: Source Unit Tests
6767
uses: ./.github/workflows/flink_cdc_base.yml
6868
with:
6969
java-versions: "[11]"
70-
modules: "['mysql-source', 'postgres', 'oracle', 'mongodb6', 'mongodb7', 'sqlserver', 'tidb', 'oceanbase-source', 'db2', 'vitess']"
70+
modules: "['mysql-source', 'postgres-source', 'oracle', 'mongodb6', 'mongodb7', 'sqlserver', 'tidb', 'oceanbase-source', 'db2', 'vitess']"
7171
pipeline_e2e:
7272
if: github.repository == 'apache/flink-cdc'
7373
strategy:

‎docs/content.zh/docs/connectors/flink-sources/mysql-cdc.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ Flink SQL> SELECT * FROM orders;
335335
<td style="word-wrap: break-word;">1000</td>
336336
<td>Integer</td>
337337
<td>
338-
在快照操作期间，连接器将查询每个包含的表，以生成该表中所有行的读取事件。 此参数确定 MySQL 连接是否将表的所有结果拉入内存（速度很快，但需要大量内存）， 或者结果是否需要流式传输（传输速度可能较慢，但适用于非常大的表）。 该值指定了在连接器对结果进行流式处理之前，表必须包含的最小行数，默认值为1000。将此参数设置为`0`以跳过所有表大小检查，并始终在快照期间对所有结果进行流式处理。</td>
338+
仅仅cdc 1.x 版本支持的参数。在快照操作期间，连接器将查询每个包含的表，以生成该表中所有行的读取事件。 此参数确定 MySQL 连接是否将表的所有结果拉入内存（速度很快，但需要大量内存）， 或者结果是否需要流式传输（传输速度可能较慢，但适用于非常大的表）。 该值指定了在连接器对结果进行流式处理之前，表必须包含的最小行数，默认值为1000。将此参数设置为`0`以跳过所有表大小检查，并始终在快照期间对所有结果进行流式处理。</td>
339339
</tr>
340340
<tr>
341341
<td>connect.timeout</td>
@@ -361,7 +361,7 @@ Flink SQL> SELECT * FROM orders;
361361
<tr>
362362
<td>jdbc.properties.*</td>
363363
<td>optional</td>
364-
<td style="word-wrap: break-word;">20</td>
364+
<td style="word-wrap: break-word;"></td>
365365
<td>String</td>
366366
<td>传递自定义 JDBC URL 属性的选项。用户可以传递自定义属性，如 'jdbc.properties.useSSL' = 'false'.</td>
367367
</tr>

0 commit comments

Comments
 (0)