This is an automated email from the ASF dual-hosted git repository.
wanghailin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 1ea27afa87 [Improve][CDC-Connector]Fix CDC option rule. (#6454)
1ea27afa87 is described below
commit 1ea27afa8764cf32edc07abe665507482f1d4b18
Author: lightzhao <[email protected]>
AuthorDate: Mon Mar 11 10:49:30 2024 +0800
[Improve][CDC-Connector]Fix CDC option rule. (#6454)
---
.../seatunnel/cdc/mysql/source/MySqlIncrementalSourceFactory.java | 2 +-
.../seatunnel/cdc/oracle/source/OracleIncrementalSourceFactory.java | 6 ++----
.../cdc/postgres/source/PostgresIncrementalSourceFactory.java | 2 +-
.../sqlserver/source/source/SqlServerIncrementalSourceFactory.java | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSourceFactory.java
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSourceFactory.java
index defe0a6ab9..8147dfe737 100644
---
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSourceFactory.java
@@ -57,8 +57,8 @@ public class MySqlIncrementalSourceFactory implements
TableSourceFactory {
.required(
JdbcSourceOptions.USERNAME,
JdbcSourceOptions.PASSWORD,
- CatalogOptions.TABLE_NAMES,
JdbcCatalogOptions.BASE_URL)
+ .exclusive(CatalogOptions.TABLE_NAMES,
CatalogOptions.TABLE_PATTERN)
.optional(
JdbcSourceOptions.DATABASE_NAMES,
JdbcSourceOptions.SERVER_ID,
diff --git
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-oracle/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/oracle/source/OracleIncrementalSourceFactory.java
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-oracle/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/oracle/source/OracleIncrementalSourceFactory.java
index c80f0dc7ce..2a0dc6b290 100644
---
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-oracle/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/oracle/source/OracleIncrementalSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-oracle/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/oracle/source/OracleIncrementalSourceFactory.java
@@ -54,10 +54,8 @@ public class OracleIncrementalSourceFactory implements
TableSourceFactory {
@Override
public OptionRule optionRule() {
return JdbcSourceOptions.getBaseRule()
- .required(
- JdbcSourceOptions.USERNAME,
- JdbcSourceOptions.PASSWORD,
- CatalogOptions.TABLE_NAMES)
+ .required(JdbcSourceOptions.USERNAME,
JdbcSourceOptions.PASSWORD)
+ .exclusive(CatalogOptions.TABLE_NAMES,
CatalogOptions.TABLE_PATTERN)
.bundled(JdbcSourceOptions.HOSTNAME, JdbcSourceOptions.PORT)
.optional(
JdbcCatalogOptions.BASE_URL,
diff --git
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-postgres/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/postgres/source/PostgresIncrementalSourceFactory.java
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-postgres/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/postgres/source/PostgresIncrementalSourceFactory.java
index 7d9ddbb5b2..e75c3505ef 100644
---
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-postgres/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/postgres/source/PostgresIncrementalSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-postgres/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/postgres/source/PostgresIncrementalSourceFactory.java
@@ -56,8 +56,8 @@ public class PostgresIncrementalSourceFactory implements
TableSourceFactory {
.required(
JdbcSourceOptions.USERNAME,
JdbcSourceOptions.PASSWORD,
- CatalogOptions.TABLE_NAMES,
JdbcCatalogOptions.BASE_URL)
+ .exclusive(CatalogOptions.TABLE_NAMES,
CatalogOptions.TABLE_PATTERN)
.optional(
JdbcSourceOptions.DATABASE_NAMES,
JdbcSourceOptions.SERVER_TIME_ZONE,
diff --git
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/sqlserver/source/source/SqlServerIncrementalSourceFactory.java
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/sqlserver/source/source/SqlServerIncrementalSourceFactory.java
index 95031e9b9f..09a12c6e4e 100644
---
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/sqlserver/source/source/SqlServerIncrementalSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/sqlserver/source/source/SqlServerIncrementalSourceFactory.java
@@ -58,8 +58,8 @@ public class SqlServerIncrementalSourceFactory implements
TableSourceFactory {
.required(
JdbcSourceOptions.USERNAME,
JdbcSourceOptions.PASSWORD,
- CatalogOptions.TABLE_NAMES,
JdbcCatalogOptions.BASE_URL)
+ .exclusive(CatalogOptions.TABLE_NAMES,
CatalogOptions.TABLE_PATTERN)
.optional(
JdbcSourceOptions.DATABASE_NAMES,
JdbcSourceOptions.SERVER_TIME_ZONE,
