This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/mysql-connector in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 88f962ef6185ec7e36ce1a3c8305f3798f9b66f6 Author: JackieTien97 <[email protected]> AuthorDate: Fri Jun 27 18:29:02 2025 +0800 finish pg --- .../iotdb/confignode/conf/ConfigNodeConfig.java | 2 +- .../connector/BaseJDBCConnectorTableFunction.java | 14 +++----------- .../tablefunction/connector/JDBCConnectionPool.java | 15 --------------- .../connector/MySqlConnectorTableFunction.java | 17 +++++++++++++++-- .../connector/PostgreSqlConnectorTableFunction.java | 20 +++++++++++++++++--- 5 files changed, 36 insertions(+), 32 deletions(-) diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java index 50c8f5bc9a0..dbc4df3ca73 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java @@ -210,7 +210,7 @@ public class ConfigNodeConfig { /** RatisConsensus protocol, Max size for a single log append request from leader. */ private long dataRegionRatisConsensusLogAppenderBufferSize = 16 * 1024 * 1024L; - private long configNodeRatisConsensusLogAppenderBufferSize = 16 * 1024 * 1024L; + private long configNodeRatisConsensusLogAppenderBufferSize = 32 * 1024 * 1024L; private long schemaRegionRatisConsensusLogAppenderBufferSize = 16 * 1024 * 1024L; /** diff --git a/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/BaseJDBCConnectorTableFunction.java b/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/BaseJDBCConnectorTableFunction.java index 908b39916cd..481ed6f96f2 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/BaseJDBCConnectorTableFunction.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/BaseJDBCConnectorTableFunction.java @@ -122,12 +122,8 @@ abstract class BaseJDBCConnectorTableFunction implements TableFunction { private static final String SQL = "SQL"; private static final String URL = "URL"; - private static final String DEFAULT_URL = - "jdbc:mysql://localhost:3306?allowPublicKeyRetrieval=true"; private static final String USERNAME = "USERNAME"; - private static final String DEFAULT_USERNAME = "root"; private static final String PASSWORD = "PASSWORD"; - private static final String DEFAULT_PASSWORD = "iotdb2025"; @Override public List<ParameterSpecification> getArgumentsSpecifications() { @@ -152,13 +148,9 @@ abstract class BaseJDBCConnectorTableFunction implements TableFunction { abstract String getDefaultUrl(); - String getDefaultUser() { - return DEFAULT_USERNAME; - } + abstract String getDefaultUser(); - String getDefaultPassword() { - return DEFAULT_PASSWORD; - } + abstract String getDefaultPassword(); @Override public TableFunctionAnalysis analyze(Map<String, Argument> arguments) throws UDFException { @@ -180,7 +172,7 @@ abstract class BaseJDBCConnectorTableFunction implements TableFunction { types[i - 1] = type; } } catch (SQLException e) { - throw new UDFException("Get ResultSetMetaData failed.", e); + throw new UDFException(String.format("Get ResultSetMetaData failed. %s", e.getMessage()), e); } BaseJDBCConnectorTableFunctionHandle handle = new BaseJDBCConnectorTableFunctionHandle(sql, url, userName, password, types); diff --git a/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/JDBCConnectionPool.java b/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/JDBCConnectionPool.java index dc29befab9a..0ce4de8d7c3 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/JDBCConnectionPool.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/JDBCConnectionPool.java @@ -15,34 +15,19 @@ import org.apache.iotdb.library.relational.tablefunction.connector.converter.Tim import org.apache.iotdb.udf.api.exception.UDFTypeMismatchException; import org.apache.iotdb.udf.api.type.Type; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; public class JDBCConnectionPool { - private static final Logger LOGGER = LoggerFactory.getLogger(JDBCConnectionPool.class); - private JDBCConnectionPool() {} - static { - try { - Class.forName("com.mysql.cj.jdbc.Driver").newInstance(); - } catch (Exception e) { - LOGGER.warn("Failed to initialize mysql JDBC driver", e); - } - } - public static Connection getConnection(String url, String userName, String password) throws SQLException { return DriverManager.getConnection(url, userName, password); } - private static class ConnectionWrapper {} - public static Type translateJDBCTypeToUDFType(int type) { switch (type) { case java.sql.Types.TINYINT: diff --git a/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/MySqlConnectorTableFunction.java b/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/MySqlConnectorTableFunction.java index 90b447aa8c5..4893148183e 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/MySqlConnectorTableFunction.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/MySqlConnectorTableFunction.java @@ -1,7 +1,20 @@ package org.apache.iotdb.library.relational.tablefunction.connector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class MySqlConnectorTableFunction extends BaseJDBCConnectorTableFunction { + private static final Logger LOGGER = LoggerFactory.getLogger(MySqlConnectorTableFunction.class); + + static { + try { + Class.forName("com.mysql.cj.jdbc.Driver").newInstance(); + } catch (Exception e) { + LOGGER.warn("Failed to initialize mysql JDBC driver", e); + } + } + private static final String DEFAULT_URL = "jdbc:mysql://localhost:3306?allowPublicKeyRetrieval=true"; private static final String DEFAULT_USERNAME = "root"; @@ -15,12 +28,12 @@ public class MySqlConnectorTableFunction extends BaseJDBCConnectorTableFunction @Override String getDefaultUser() { - return DEFAULT_PASSWORD; + return DEFAULT_USERNAME; } @Override String getDefaultPassword() { - return DEFAULT_USERNAME; + return DEFAULT_PASSWORD; } @Override diff --git a/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/PostgreSqlConnectorTableFunction.java b/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/PostgreSqlConnectorTableFunction.java index b1accbf1724..d0d6c7311c3 100644 --- a/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/PostgreSqlConnectorTableFunction.java +++ b/library-udf/src/main/java/org/apache/iotdb/library/relational/tablefunction/connector/PostgreSqlConnectorTableFunction.java @@ -19,9 +19,23 @@ package org.apache.iotdb.library.relational.tablefunction.connector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class PostgreSqlConnectorTableFunction extends BaseJDBCConnectorTableFunction { - private static final String DEFAULT_URL = "jdbc:postgresql://localhost:5432"; + private static final Logger LOGGER = + LoggerFactory.getLogger(PostgreSqlConnectorTableFunction.class); + + static { + try { + Class.forName("org.postgresql.Driver").newInstance(); + } catch (Exception e) { + LOGGER.warn("Failed to initialize mysql JDBC driver", e); + } + } + + private static final String DEFAULT_URL = "jdbc:postgresql://localhost:5432/"; private static final String DEFAULT_USERNAME = "postgres"; private static final String DEFAULT_PASSWORD = ""; private static final String PG = "PostgreSQL"; @@ -33,12 +47,12 @@ public class PostgreSqlConnectorTableFunction extends BaseJDBCConnectorTableFunc @Override String getDefaultUser() { - return DEFAULT_PASSWORD; + return DEFAULT_USERNAME; } @Override String getDefaultPassword() { - return DEFAULT_USERNAME; + return DEFAULT_PASSWORD; } @Override
