test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-02 12:17:43 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

JDBC class driver are duplicate define in Constants.java ,such as: (#1430)

Browse Source 
public static final String JDBC_POSTGRESQL_CLASS_NAME = "org.postgresql.Driver";

and

public static final String ORG_POSTGRESQL_DRIVER = "org.postgresql.Driver";
There are same effect, We can only use one of them.
This commit is contained in:
zhukai 2019-12-10 18:20:16 +08:00 committed by qiaozhanwei
parent 6e3538a7c5
commit 44d780d803
2 changed files with 8 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
View File

@ -604,51 +604,6 @@ public final class Constants {
public static final String MR_QUEUE = "mapreduce.job.queuename";
/**
* jdbc class name
*/
/**
* mysql
*/
public static final String JDBC_MYSQL_CLASS_NAME = "com.mysql.jdbc.Driver";
/**
* postgresql
*/
public static final String JDBC_POSTGRESQL_CLASS_NAME = "org.postgresql.Driver";
/**
* hive
*/
public static final String JDBC_HIVE_CLASS_NAME = "org.apache.hive.jdbc.HiveDriver";
/**
* spark
*/
public static final String JDBC_SPARK_CLASS_NAME = "org.apache.hive.jdbc.HiveDriver";
/**
* ClickHouse
*/
public static final String JDBC_CLICKHOUSE_CLASS_NAME = "ru.yandex.clickhouse.ClickHouseDriver";
/**
* Oracle
*/
public static final String JDBC_ORACLE_CLASS_NAME = "oracle.jdbc.driver.OracleDriver";
/**
* Oracle
*/
public static final String JDBC_SQLSERVER_CLASS_NAME = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
/**
* DB2
*/
public static final String JDBC_DB2_CLASS_NAME = "com.ibm.db2.jcc.DB2Driver";
/**
* spark params constant
*/

16
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/DataSourceFactory.java
View File

@ -65,28 +65,28 @@ public class DataSourceFactory {
public static void loadClass(DbType dbType) throws Exception{
switch (dbType){
case MYSQL :
Class.forName(Constants.JDBC_MYSQL_CLASS_NAME);
Class.forName(Constants.COM_MYSQL_JDBC_DRIVER);
break;
case POSTGRESQL :
Class.forName(Constants.JDBC_POSTGRESQL_CLASS_NAME);
Class.forName(Constants.ORG_POSTGRESQL_DRIVER);
break;
case HIVE :
Class.forName(Constants.JDBC_HIVE_CLASS_NAME);
Class.forName(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER);
break;
case SPARK :
Class.forName(Constants.JDBC_SPARK_CLASS_NAME);
Class.forName(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER);
break;
case CLICKHOUSE :
Class.forName(Constants.JDBC_CLICKHOUSE_CLASS_NAME);
Class.forName(Constants.COM_CLICKHOUSE_JDBC_DRIVER);
break;
case ORACLE :
Class.forName(Constants.JDBC_ORACLE_CLASS_NAME);
Class.forName(Constants.COM_ORACLE_JDBC_DRIVER);
break;
case SQLSERVER:
Class.forName(Constants.JDBC_SQLSERVER_CLASS_NAME);
Class.forName(Constants.COM_SQLSERVER_JDBC_DRIVER);
break;
case DB2:
Class.forName(Constants.JDBC_DB2_CLASS_NAME);
Class.forName(Constants.COM_DB2_JDBC_DRIVER);
break;
default:
logger.error("not support sql type: {},can't load class", dbType);