From 220ee2f04c37acdf6967bfbe639dd7618082334d Mon Sep 17 00:00:00 2001
From: gong <genzhedangdang@gmail.com>
Date: Sun, 10 Dec 2023 23:19:14 +0800
Subject: [PATCH] [cdc-connector][sqlserver] Fix SqlServerTableSource params
order error
---
.../connectors/sqlserver/table/SqlServerTableFactory.java | 2 +-
.../connectors/sqlserver/table/SqlServerTableSource.java | 6 +++---
.../sqlserver/table/SqlServerTableFactoryTest.java | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactory.java
index 3bb0c87a929..37391405358 100644
--- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactory.java
+++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactory.java
@@ -168,8 +168,8 @@ public DynamicTableSource createDynamicTableSource(Context context) {
splitMetaGroupSize,
fetchSize,
connectTimeout,
- connectionPoolSize,
connectMaxRetries,
+ connectionPoolSize,
distributionFactorUpper,
distributionFactorLower,
chunkKeyColumn,
diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableSource.java
index 735b55219f7..bde6dfbe910 100644
--- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableSource.java
+++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableSource.java
@@ -130,8 +130,8 @@ public SqlServerTableSource(
this.splitMetaGroupSize = splitMetaGroupSize;
this.fetchSize = fetchSize;
this.connectTimeout = connectTimeout;
- this.connectionPoolSize = connectionPoolSize;
this.connectMaxRetries = connectMaxRetries;
+ this.connectionPoolSize = connectionPoolSize;
this.distributionFactorUpper = distributionFactorUpper;
this.distributionFactorLower = distributionFactorLower;
this.chunkKeyColumn = chunkKeyColumn;
@@ -178,8 +178,8 @@ public ScanRuntimeProvider getScanRuntimeProvider(ScanContext scanContext) {
.splitMetaGroupSize(splitMetaGroupSize)
.fetchSize(fetchSize)
.connectTimeout(connectTimeout)
- .connectionPoolSize(connectionPoolSize)
.connectMaxRetries(connectMaxRetries)
+ .connectionPoolSize(connectionPoolSize)
.distributionFactorUpper(distributionFactorUpper)
.distributionFactorLower(distributionFactorLower)
.chunkKeyColumn(chunkKeyColumn)
@@ -239,8 +239,8 @@ public DynamicTableSource copy() {
splitMetaGroupSize,
fetchSize,
connectTimeout,
- connectionPoolSize,
connectMaxRetries,
+ connectionPoolSize,
distributionFactorUpper,
distributionFactorLower,
chunkKeyColumn,
diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java
index 605cb7ab556..7d9dd57e57f 100644
--- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java
+++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java
@@ -103,8 +103,8 @@ public void testCommonProperties() {
SourceOptions.CHUNK_META_GROUP_SIZE.defaultValue(),
SourceOptions.SCAN_SNAPSHOT_FETCH_SIZE.defaultValue(),
JdbcSourceOptions.CONNECT_TIMEOUT.defaultValue(),
- JdbcSourceOptions.CONNECTION_POOL_SIZE.defaultValue(),
JdbcSourceOptions.CONNECT_MAX_RETRIES.defaultValue(),
+ JdbcSourceOptions.CONNECTION_POOL_SIZE.defaultValue(),
JdbcSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND
.defaultValue(),
JdbcSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND
@@ -148,8 +148,8 @@ public void testEnableParallelReadSource() {
3000,
100,
Duration.ofSeconds(45),
- JdbcSourceOptions.CONNECTION_POOL_SIZE.defaultValue(),
JdbcSourceOptions.CONNECT_MAX_RETRIES.defaultValue(),
+ JdbcSourceOptions.CONNECTION_POOL_SIZE.defaultValue(),
40.5d,
0.01d,
"testCol",
@@ -187,8 +187,8 @@ public void testOptionalProperties() {
SourceOptions.CHUNK_META_GROUP_SIZE.defaultValue(),
SourceOptions.SCAN_SNAPSHOT_FETCH_SIZE.defaultValue(),
JdbcSourceOptions.CONNECT_TIMEOUT.defaultValue(),
- JdbcSourceOptions.CONNECTION_POOL_SIZE.defaultValue(),
JdbcSourceOptions.CONNECT_MAX_RETRIES.defaultValue(),
+ JdbcSourceOptions.CONNECTION_POOL_SIZE.defaultValue(),
JdbcSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND
.defaultValue(),
JdbcSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND