Skip to content

Commit a7e025b

Browse files
committed
fix connection properties
1 parent b66a4db commit a7e025b

File tree

3 files changed

+5
-17
lines changed

3 files changed

+5
-17
lines changed

flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/OceanBaseSource.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ public SourceFunction<T> build() {
255255
tableName,
256256
tableList,
257257
connectTimeout,
258-
serverTimeZone,
259258
hostname,
260259
port,
261260
jdbcDriver,

flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseConnection.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public class OceanBaseConnection extends JdbcConnection {
3636

3737
private static final Properties DEFAULT_JDBC_PROPERTIES = initializeDefaultJdbcProperties();
3838
private static final String MYSQL_URL_PATTERN =
39-
"jdbc:mysql://${hostname}:${port}/?connectTimeout=${connectTimeout}&serverTimezone=${serverTimezone}";
39+
"jdbc:mysql://${hostname}:${port}/?connectTimeout=${connectTimeout}";
4040
private static final String OB_URL_PATTERN =
41-
"jdbc:oceanbase://${hostname}:${port}/?connectTimeout=${connectTimeout}&serverTimezone=${serverTimezone}";
41+
"jdbc:oceanbase://${hostname}:${port}/?connectTimeout=${connectTimeout}";
4242

4343
private String compatibleMode;
4444

@@ -48,29 +48,22 @@ public OceanBaseConnection(
4848
String user,
4949
String password,
5050
Duration timeout,
51-
String serverTimeZone,
5251
String jdbcDriver,
5352
Properties jdbcProperties,
5453
ClassLoader classLoader) {
5554
super(
56-
config(hostname, port, user, password, timeout, serverTimeZone),
55+
config(hostname, port, user, password, timeout),
5756
factory(jdbcDriver, jdbcProperties, classLoader));
5857
}
5958

6059
private static Configuration config(
61-
String hostname,
62-
Integer port,
63-
String user,
64-
String password,
65-
Duration timeout,
66-
String serverTimeZone) {
60+
String hostname, Integer port, String user, String password, Duration timeout) {
6761
return Configuration.create()
6862
.with("hostname", hostname)
6963
.with("port", port)
7064
.with("user", user)
7165
.with("password", password)
7266
.with("connectTimeout", timeout == null ? 30000 : timeout.toMillis())
73-
.with("serverTimezone", serverTimeZone)
7467
.build();
7568
}
7669

@@ -95,7 +88,7 @@ private static Properties initializeDefaultJdbcProperties() {
9588
defaultJdbcProperties.setProperty("useInformationSchema", "true");
9689
defaultJdbcProperties.setProperty("nullCatalogMeansCurrent", "false");
9790
defaultJdbcProperties.setProperty("useUnicode", "true");
98-
defaultJdbcProperties.setProperty("zeroDateTimeBehavior", "CONVERT_TO_NULL");
91+
defaultJdbcProperties.setProperty("zeroDateTimeBehavior", "convertToNull");
9992
defaultJdbcProperties.setProperty("characterEncoding", "UTF-8");
10093
defaultJdbcProperties.setProperty("characterSetResults", "UTF-8");
10194
return defaultJdbcProperties;

flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ public class OceanBaseRichSourceFunction<T> extends RichSourceFunction<T>
8282
private final String tableName;
8383
private final String tableList;
8484
private final Duration connectTimeout;
85-
private final String serverTimeZone;
8685
private final String hostname;
8786
private final Integer port;
8887
private final String jdbcDriver;
@@ -112,7 +111,6 @@ public OceanBaseRichSourceFunction(
112111
String tableName,
113112
String tableList,
114113
Duration connectTimeout,
115-
String serverTimeZone,
116114
String hostname,
117115
Integer port,
118116
String jdbcDriver,
@@ -130,7 +128,6 @@ public OceanBaseRichSourceFunction(
130128
this.tableName = tableName;
131129
this.tableList = tableList;
132130
this.connectTimeout = checkNotNull(connectTimeout);
133-
this.serverTimeZone = checkNotNull(serverTimeZone);
134131
this.hostname = hostname;
135132
this.port = port;
136133
this.jdbcDriver = jdbcDriver;
@@ -188,7 +185,6 @@ private OceanBaseConnection getSnapshotConnection() throws SQLException {
188185
username,
189186
password,
190187
connectTimeout,
191-
serverTimeZone,
192188
jdbcDriver,
193189
jdbcProperties,
194190
getClass().getClassLoader());

0 commit comments

Comments
 (0)