This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 861aaaf [FIX-#6505][Dao] upgrade the MySQL driver package for
building MySQL jdbcUrl (#6708)
861aaaf is described below
commit 861aaaf9712ec7141417a270710a7941438245d9
Author: yihong <[email protected]>
AuthorDate: Thu Nov 18 08:39:11 2021 +0800
[FIX-#6505][Dao] upgrade the MySQL driver package for building MySQL
jdbcUrl (#6708)
* replace com.mysql.jdbc.Driver everywhere with com.mysql.cj.jdbc.Driver
---
ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/params.py | 2 +-
ambari_plugin/common-services/DOLPHIN/1.3.3/package/scripts/params.py | 2 +-
docker/docker-swarm/config.env.sh | 2 +-
.../apache/dolphinscheduler/api/service/DataSourceServiceTest.java | 4 ++--
.../datasource/api/datasource/mysql/MysqlDatasourceProcessor.java | 2 +-
.../datasource/api/datasource/mysql/MysqlDatasourceProcessorTest.java | 2 +-
.../main/java/org/apache/dolphinscheduler/spi/task/TaskConstants.java | 2 +-
.../main/java/org/apache/dolphinscheduler/spi/utils/Constants.java | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/params.py
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/params.py
index 5a9994f..9aebbf2 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/params.py
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/params.py
@@ -57,7 +57,7 @@ dolphin_database_config['dolphin_database_type'] =
dolphin_env_map['dolphin.data
dolphin_database_config['dolphin_database_username'] =
dolphin_env_map['dolphin.database.username']
dolphin_database_config['dolphin_database_password'] =
dolphin_env_map['dolphin.database.password']
if 'mysql' == dolphin_database_config['dolphin_database_type']:
- dolphin_database_config['dolphin_database_driver'] =
'com.mysql.jdbc.Driver'
+ dolphin_database_config['dolphin_database_driver'] =
'com.mysql.cj.jdbc.Driver'
dolphin_database_config['driverDelegateClass'] =
'org.quartz.impl.jdbcjobstore.StdJDBCDelegate'
dolphin_database_config['dolphin_database_url'] = 'jdbc:mysql://' +
dolphin_env_map['dolphin.database.host'] \
+ ':' +
dolphin_env_map['dolphin.database.port'] \
diff --git
a/ambari_plugin/common-services/DOLPHIN/1.3.3/package/scripts/params.py
b/ambari_plugin/common-services/DOLPHIN/1.3.3/package/scripts/params.py
index 5a9994f..9aebbf2 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.3/package/scripts/params.py
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.3/package/scripts/params.py
@@ -57,7 +57,7 @@ dolphin_database_config['dolphin_database_type'] =
dolphin_env_map['dolphin.data
dolphin_database_config['dolphin_database_username'] =
dolphin_env_map['dolphin.database.username']
dolphin_database_config['dolphin_database_password'] =
dolphin_env_map['dolphin.database.password']
if 'mysql' == dolphin_database_config['dolphin_database_type']:
- dolphin_database_config['dolphin_database_driver'] =
'com.mysql.jdbc.Driver'
+ dolphin_database_config['dolphin_database_driver'] =
'com.mysql.cj.jdbc.Driver'
dolphin_database_config['driverDelegateClass'] =
'org.quartz.impl.jdbcjobstore.StdJDBCDelegate'
dolphin_database_config['dolphin_database_url'] = 'jdbc:mysql://' +
dolphin_env_map['dolphin.database.host'] \
+ ':' +
dolphin_env_map['dolphin.database.port'] \
diff --git a/docker/docker-swarm/config.env.sh
b/docker/docker-swarm/config.env.sh
index 4127102..e0193de 100755
--- a/docker/docker-swarm/config.env.sh
+++ b/docker/docker-swarm/config.env.sh
@@ -28,7 +28,7 @@ DATABASE_DATABASE=dolphinscheduler
DATABASE_PARAMS=characterEncoding=utf8
# mysql
# DATABASE_TYPE=mysql
-# DATABASE_DRIVER=com.mysql.jdbc.Driver
+# DATABASE_DRIVER=com.mysql.cj.jdbc.Driver
# DATABASE_HOST=dolphinscheduler-mysql
# DATABASE_PORT=3306
# DATABASE_USERNAME=root
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
index d29b6be..15d7e10 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
@@ -350,7 +350,7 @@ public class DataSourceServiceTest {
mysqlDatasourceParamDTO.setOther(other);
ConnectionParam connectionParam =
DatasourceUtil.buildConnectionParams(mysqlDatasourceParamDTO);
String expected =
"{\"user\":\"test\",\"password\":\"IUAjJCVeJipNVEl6TkRVMg==\",\"address\":\"jdbc:mysql://192.168.9.1:1521\",\"database\":\"im\",\"jdbcUrl\":\"jdbc:mysql://192.168.9.1:1521/"
- +
"im\",\"driverClassName\":\"com.mysql.jdbc.Driver\",\"validationQuery\":\"select
1\",\"props\":{\"autoDeserialize\":\"yes\",\"allowUrlInLocalInfile\":\"true\"}}";
+ +
"im\",\"driverClassName\":\"com.mysql.cj.jdbc.Driver\",\"validationQuery\":\"select
1\",\"props\":{\"autoDeserialize\":\"yes\",\"allowUrlInLocalInfile\":\"true\"}}";
Assert.assertEquals(expected, JSONUtils.toJsonString(connectionParam));
PropertyUtils.setValue(Constants.DATASOURCE_ENCRYPTION_ENABLE,
"false");
@@ -362,7 +362,7 @@ public class DataSourceServiceTest {
mysqlDatasourceParamDTO.setPassword("123456");
connectionParam =
DatasourceUtil.buildConnectionParams(mysqlDatasourceParamDTO);
expected =
"{\"user\":\"test\",\"password\":\"123456\",\"address\":\"jdbc:mysql://192.168.9.1:1521\",\"database\":\"im\","
- +
"\"jdbcUrl\":\"jdbc:mysql://192.168.9.1:1521/im\",\"driverClassName\":\"com.mysql.jdbc.Driver\",\"validationQuery\":\"select
1\"}";
+ +
"\"jdbcUrl\":\"jdbc:mysql://192.168.9.1:1521/im\",\"driverClassName\":\"com.mysql.cj.jdbc.Driver\",\"validationQuery\":\"select
1\"}";
Assert.assertEquals(expected, JSONUtils.toJsonString(connectionParam));
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MysqlDatasourceProcessor.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MysqlDatasourceProcessor.java
index b84bcc3..9624cbc 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MysqlDatasourceProcessor.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MysqlDatasourceProcessor.java
@@ -98,7 +98,7 @@ public class MysqlDatasourceProcessor extends
AbstractDatasourceProcessor {
@Override
public String getDatasourceDriver() {
- return Constants.COM_MYSQL_JDBC_DRIVER;
+ return Constants.COM_MYSQL_CJ_JDBC_DRIVER;
}
@Override
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MysqlDatasourceProcessorTest.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MysqlDatasourceProcessorTest.java
index beeda1e..f54b28d 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MysqlDatasourceProcessorTest.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/mysql/MysqlDatasourceProcessorTest.java
@@ -74,7 +74,7 @@ public class MysqlDatasourceProcessorTest {
@Test
public void testGetDatasourceDriver() {
- Assert.assertEquals(Constants.COM_MYSQL_JDBC_DRIVER,
mysqlDatasourceProcessor.getDatasourceDriver());
+ Assert.assertEquals(Constants.COM_MYSQL_CJ_JDBC_DRIVER,
mysqlDatasourceProcessor.getDatasourceDriver());
}
@Test
diff --git
a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/TaskConstants.java
b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/TaskConstants.java
index 65266bd..5ec6342 100644
---
a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/TaskConstants.java
+++
b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/TaskConstants.java
@@ -259,7 +259,7 @@ public class TaskConstants {
* driver
*/
public static final String ORG_POSTGRESQL_DRIVER = "org.postgresql.Driver";
- public static final String COM_MYSQL_JDBC_DRIVER = "com.mysql.jdbc.Driver";
+ public static final String COM_MYSQL_CJ_JDBC_DRIVER =
"com.mysql.cj.jdbc.Driver";
public static final String ORG_APACHE_HIVE_JDBC_HIVE_DRIVER =
"org.apache.hive.jdbc.HiveDriver";
public static final String COM_CLICKHOUSE_JDBC_DRIVER =
"ru.yandex.clickhouse.ClickHouseDriver";
public static final String COM_ORACLE_JDBC_DRIVER =
"oracle.jdbc.driver.OracleDriver";
diff --git
a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/Constants.java
b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/Constants.java
index 84f7d71..de01948 100644
---
a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/Constants.java
+++
b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/Constants.java
@@ -122,7 +122,7 @@ public class Constants {
* driver
*/
public static final String ORG_POSTGRESQL_DRIVER = "org.postgresql.Driver";
- public static final String COM_MYSQL_JDBC_DRIVER = "com.mysql.jdbc.Driver";
+ public static final String COM_MYSQL_CJ_JDBC_DRIVER =
"com.mysql.cj.jdbc.Driver";
public static final String ORG_APACHE_HIVE_JDBC_HIVE_DRIVER =
"org.apache.hive.jdbc.HiveDriver";
public static final String COM_CLICKHOUSE_JDBC_DRIVER =
"ru.yandex.clickhouse.ClickHouseDriver";
public static final String COM_ORACLE_JDBC_DRIVER =
"oracle.jdbc.OracleDriver";
