fix connection properties

apache · Mar 31, 2023 · a7e025b · a7e025b
1 parent b66a4db
commit a7e025b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/...r-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/OceanBaseSource.java b/...r-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/OceanBaseSource.java
@@ -255,7 +255,6 @@ public SourceFunction<T> build() {
                     tableName,
                     tableList,
                     connectTimeout,
-                    serverTimeZone,
                     hostname,
                     port,
                     jdbcDriver,

diff --git a/...-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseConnection.java b/...-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseConnection.java
@@ -36,9 +36,9 @@ public class OceanBaseConnection extends JdbcConnection {
 
     private static final Properties DEFAULT_JDBC_PROPERTIES = initializeDefaultJdbcProperties();
     private static final String MYSQL_URL_PATTERN =
-            "jdbc:mysql://${hostname}:${port}/?connectTimeout=${connectTimeout}&serverTimezone=${serverTimezone}";
+            "jdbc:mysql://${hostname}:${port}/?connectTimeout=${connectTimeout}";
     private static final String OB_URL_PATTERN =
-            "jdbc:oceanbase://${hostname}:${port}/?connectTimeout=${connectTimeout}&serverTimezone=${serverTimezone}";
+            "jdbc:oceanbase://${hostname}:${port}/?connectTimeout=${connectTimeout}";
 
     private String compatibleMode;
 
@@ -48,29 +48,22 @@ public OceanBaseConnection(
             String user,
             String password,
             Duration timeout,
-            String serverTimeZone,
             String jdbcDriver,
             Properties jdbcProperties,
             ClassLoader classLoader) {
         super(
-                config(hostname, port, user, password, timeout, serverTimeZone),
+                config(hostname, port, user, password, timeout),
                 factory(jdbcDriver, jdbcProperties, classLoader));
     }
 
     private static Configuration config(
-            String hostname,
-            Integer port,
-            String user,
-            String password,
-            Duration timeout,
-            String serverTimeZone) {
+            String hostname, Integer port, String user, String password, Duration timeout) {
         return Configuration.create()
                 .with("hostname", hostname)
                 .with("port", port)
                 .with("user", user)
                 .with("password", password)
                 .with("connectTimeout", timeout == null ? 30000 : timeout.toMillis())
-                .with("serverTimezone", serverTimeZone)
                 .build();
     }
 
@@ -95,7 +88,7 @@ private static Properties initializeDefaultJdbcProperties() {
         defaultJdbcProperties.setProperty("useInformationSchema", "true");
         defaultJdbcProperties.setProperty("nullCatalogMeansCurrent", "false");
         defaultJdbcProperties.setProperty("useUnicode", "true");
-        defaultJdbcProperties.setProperty("zeroDateTimeBehavior", "CONVERT_TO_NULL");
+        defaultJdbcProperties.setProperty("zeroDateTimeBehavior", "convertToNull");
         defaultJdbcProperties.setProperty("characterEncoding", "UTF-8");
         defaultJdbcProperties.setProperty("characterSetResults", "UTF-8");
         return defaultJdbcProperties;

diff --git a/.../main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java b/.../main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java
@@ -82,7 +82,6 @@ public class OceanBaseRichSourceFunction<T> extends RichSourceFunction<T>
     private final String tableName;
     private final String tableList;
     private final Duration connectTimeout;
-    private final String serverTimeZone;
     private final String hostname;
     private final Integer port;
     private final String jdbcDriver;
@@ -112,7 +111,6 @@ public OceanBaseRichSourceFunction(
             String tableName,
             String tableList,
             Duration connectTimeout,
-            String serverTimeZone,
             String hostname,
             Integer port,
             String jdbcDriver,
@@ -130,7 +128,6 @@ public OceanBaseRichSourceFunction(
         this.tableName = tableName;
         this.tableList = tableList;
         this.connectTimeout = checkNotNull(connectTimeout);
-        this.serverTimeZone = checkNotNull(serverTimeZone);
         this.hostname = hostname;
         this.port = port;
         this.jdbcDriver = jdbcDriver;
@@ -188,7 +185,6 @@ private OceanBaseConnection getSnapshotConnection() throws SQLException {
                             username,
                             password,
                             connectTimeout,
-                            serverTimeZone,
                             jdbcDriver,
                             jdbcProperties,
                             getClass().getClassLoader());