Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
DolphinScheduler
提交
9ed962a3
DolphinScheduler
项目概览
xiphi1978
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ed962a3
编写于
4月 13, 2019
作者:
B
Baoqi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add Microsoft SQL Server support
上级
2d3b7baa
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
136 addition
and
5 deletion
+136
-5
escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
...ain/java/cn/escheduler/api/service/DataSourceService.java
+11
-1
escheduler-api/src/main/java/cn/escheduler/api/utils/Constants.java
...-api/src/main/java/cn/escheduler/api/utils/Constants.java
+3
-0
escheduler-common/pom.xml
escheduler-common/pom.xml
+11
-0
escheduler-common/src/main/java/cn/escheduler/common/Constants.java
...-common/src/main/java/cn/escheduler/common/Constants.java
+5
-0
escheduler-common/src/main/java/cn/escheduler/common/enums/DbType.java
...mmon/src/main/java/cn/escheduler/common/enums/DbType.java
+2
-1
escheduler-common/src/main/java/cn/escheduler/common/job/db/DataSourceFactory.java
...n/java/cn/escheduler/common/job/db/DataSourceFactory.java
+2
-0
escheduler-common/src/main/java/cn/escheduler/common/job/db/SQLServerDataSource.java
...java/cn/escheduler/common/job/db/SQLServerDataSource.java
+71
-0
escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure/ProcedureTask.java
...heduler/server/worker/task/processdure/ProcedureTask.java
+4
-0
escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java
...in/java/cn/escheduler/server/worker/task/sql/SqlTask.java
+3
-0
escheduler-server/src/test/java/cn/escheduler/server/worker/sql/SqlExecutorTest.java
...java/cn/escheduler/server/worker/sql/SqlExecutorTest.java
+9
-0
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
...conf/home/pages/dag/_source/formModel/tasks/procedure.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
.../pages/datasource/pages/list/_source/createDataSource.vue
+1
-0
escheduler-ui/src/js/conf/home/store/dag/state.js
escheduler-ui/src/js/conf/home/store/dag/state.js
+5
-0
escheduler-ui/src/js/conf/home/store/datasource/actions.js
escheduler-ui/src/js/conf/home/store/datasource/actions.js
+2
-2
pom.xml
pom.xml
+6
-0
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
浏览文件 @
9ed962a3
...
...
@@ -210,6 +210,7 @@ public class DataSourceService extends BaseService{
switch
(
dataSource
.
getType
())
{
case
HIVE:
case
SQLSERVER:
separator
=
";"
;
break
;
case
MYSQL:
...
...
@@ -376,6 +377,10 @@ public class DataSourceService extends BaseService{
datasource
=
JSONObject
.
parseObject
(
parameter
,
OracleDataSource
.
class
);
Class
.
forName
(
Constants
.
COM_ORACLE_JDBC_DRIVER
);
break
;
case
SQLSERVER:
datasource
=
JSONObject
.
parseObject
(
parameter
,
SQLServerDataSource
.
class
);
Class
.
forName
(
Constants
.
COM_SQLSERVER_JDBC_DRIVER
);
break
;
default
:
break
;
}
...
...
@@ -447,7 +452,9 @@ public class DataSourceService extends BaseService{
||
Constants
.
CLICKHOUSE
.
equals
(
type
.
name
())
||
Constants
.
ORACLE
.
equals
(
type
.
name
()))
{
separator
=
"&"
;
}
else
if
(
Constants
.
HIVE
.
equals
(
type
.
name
())
||
Constants
.
SPARK
.
equals
(
type
.
name
()))
{
}
else
if
(
Constants
.
HIVE
.
equals
(
type
.
name
())
||
Constants
.
SPARK
.
equals
(
type
.
name
())
||
Constants
.
SQLSERVER
.
equals
(
type
.
name
()))
{
separator
=
";"
;
}
...
...
@@ -502,6 +509,9 @@ public class DataSourceService extends BaseService{
}
else
if
(
Constants
.
ORACLE
.
equals
(
type
.
name
()))
{
sb
.
append
(
Constants
.
JDBC_ORACLE
);
sb
.
append
(
host
).
append
(
":"
).
append
(
port
);
}
else
if
(
Constants
.
SQLSERVER
.
equals
(
type
.
name
()))
{
sb
.
append
(
Constants
.
JDBC_SQLSERVER
);
sb
.
append
(
host
).
append
(
":"
).
append
(
port
);
}
return
sb
.
toString
();
...
...
escheduler-api/src/main/java/cn/escheduler/api/utils/Constants.java
浏览文件 @
9ed962a3
...
...
@@ -84,6 +84,7 @@ public class Constants {
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"
;
public
static
final
String
COM_SQLSERVER_JDBC_DRIVER
=
"com.microsoft.sqlserver.jdbc.SQLServerDriver"
;
/**
* database type
...
...
@@ -94,6 +95,7 @@ public class Constants {
public
static
final
String
SPARK
=
"SPARK"
;
public
static
final
String
CLICKHOUSE
=
"CLICKHOUSE"
;
public
static
final
String
ORACLE
=
"ORACLE"
;
public
static
final
String
SQLSERVER
=
"SQLSERVER"
;
/**
* jdbc url
...
...
@@ -103,6 +105,7 @@ public class Constants {
public
static
final
String
JDBC_HIVE_2
=
"jdbc:hive2://"
;
public
static
final
String
JDBC_CLICKHOUSE
=
"jdbc:clickhouse://"
;
public
static
final
String
JDBC_ORACLE
=
"jdbc:oracle:thin:@//"
;
public
static
final
String
JDBC_SQLSERVER
=
"jdbc:sqlserver://"
;
public
static
final
String
ADDRESS
=
"address"
;
...
...
escheduler-common/pom.xml
浏览文件 @
9ed962a3
...
...
@@ -386,6 +386,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
com.microsoft.sqlserver
</groupId>
<artifactId>
mssql-jdbc
</artifactId>
<exclusions>
<exclusion>
<artifactId>
com.microsoft.azure
</artifactId>
<groupId>
azure-keyvault
</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
...
...
escheduler-common/src/main/java/cn/escheduler/common/Constants.java
浏览文件 @
9ed962a3
...
...
@@ -621,6 +621,11 @@ public final class Constants {
*/
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"
;
/**
* spark params constant
*/
...
...
escheduler-common/src/main/java/cn/escheduler/common/enums/DbType.java
浏览文件 @
9ed962a3
...
...
@@ -27,6 +27,7 @@ public enum DbType {
* 3 spark
* 4 clickhouse
* 5 oracle
* 6 sqlserver
*/
MYSQL
,
POSTGRESQL
,
HIVE
,
SPARK
,
CLICKHOUSE
,
ORACLE
MYSQL
,
POSTGRESQL
,
HIVE
,
SPARK
,
CLICKHOUSE
,
ORACLE
,
SQLSERVER
}
escheduler-common/src/main/java/cn/escheduler/common/job/db/DataSourceFactory.java
浏览文件 @
9ed962a3
...
...
@@ -43,6 +43,8 @@ public class DataSourceFactory {
return
JSONUtils
.
parseObject
(
parameter
,
ClickHouseDataSource
.
class
);
case
ORACLE:
return
JSONUtils
.
parseObject
(
parameter
,
OracleDataSource
.
class
);
case
SQLSERVER:
return
JSONUtils
.
parseObject
(
parameter
,
SQLServerDataSource
.
class
);
default
:
return
null
;
}
...
...
escheduler-common/src/main/java/cn/escheduler/common/job/db/SQLServerDataSource.java
0 → 100644
浏览文件 @
9ed962a3
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
cn.escheduler.common.job.db
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.sql.Connection
;
import
java.sql.DriverManager
;
import
java.sql.SQLException
;
/**
* data source of SQL Server
*/
public
class
SQLServerDataSource
extends
BaseDataSource
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
SQLServerDataSource
.
class
);
/**
* gets the JDBC url for the data source connection
* @return
*/
@Override
public
String
getJdbcUrl
()
{
String
jdbcUrl
=
getAddress
();
jdbcUrl
+=
";databaseName="
+
getDatabase
();
if
(
StringUtils
.
isNotEmpty
(
getOther
()))
{
jdbcUrl
+=
";"
+
getOther
();
}
return
jdbcUrl
;
}
/**
* test whether the data source can be connected successfully
* @throws Exception
*/
@Override
public
void
isConnectable
()
throws
Exception
{
Connection
con
=
null
;
try
{
Class
.
forName
(
"com.microsoft.sqlserver.jdbc.SQLServerDriver"
);
con
=
DriverManager
.
getConnection
(
getJdbcUrl
(),
getUser
(),
getPassword
());
}
finally
{
if
(
con
!=
null
)
{
try
{
con
.
close
();
}
catch
(
SQLException
e
)
{
logger
.
error
(
"SQL Server datasource try conn close conn error"
,
e
);
throw
e
;
}
}
}
}
}
escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure/ProcedureTask.java
浏览文件 @
9ed962a3
...
...
@@ -26,6 +26,7 @@ import cn.escheduler.common.job.db.ClickHouseDataSource;
import
cn.escheduler.common.job.db.MySQLDataSource
;
import
cn.escheduler.common.job.db.OracleDataSource
;
import
cn.escheduler.common.job.db.PostgreDataSource
;
import
cn.escheduler.common.job.db.SQLServerDataSource
;
import
cn.escheduler.common.process.Property
;
import
cn.escheduler.common.task.AbstractParameters
;
import
cn.escheduler.common.task.procedure.ProcedureParameters
;
...
...
@@ -121,6 +122,9 @@ public class ProcedureTask extends AbstractTask {
}
else
if
(
DbType
.
ORACLE
.
name
().
equals
(
dataSource
.
getType
().
name
())){
baseDataSource
=
JSONObject
.
parseObject
(
dataSource
.
getConnectionParams
(),
OracleDataSource
.
class
);
Class
.
forName
(
Constants
.
JDBC_ORACLE_CLASS_NAME
);
}
else
if
(
DbType
.
SQLSERVER
.
name
().
equals
(
dataSource
.
getType
().
name
())){
baseDataSource
=
JSONObject
.
parseObject
(
dataSource
.
getConnectionParams
(),
SQLServerDataSource
.
class
);
Class
.
forName
(
Constants
.
JDBC_SQLSERVER_CLASS_NAME
);
}
// get jdbc connection
...
...
escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java
浏览文件 @
9ed962a3
...
...
@@ -126,6 +126,9 @@ public class SqlTask extends AbstractTask {
}
else
if
(
DbType
.
ORACLE
.
name
().
equals
(
dataSource
.
getType
().
name
())){
baseDataSource
=
JSONObject
.
parseObject
(
dataSource
.
getConnectionParams
(),
OracleDataSource
.
class
);
Class
.
forName
(
Constants
.
JDBC_ORACLE_CLASS_NAME
);
}
else
if
(
DbType
.
SQLSERVER
.
name
().
equals
(
dataSource
.
getType
().
name
())){
baseDataSource
=
JSONObject
.
parseObject
(
dataSource
.
getConnectionParams
(),
SQLServerDataSource
.
class
);
Class
.
forName
(
Constants
.
JDBC_SQLSERVER_CLASS_NAME
);
}
Map
<
Integer
,
Property
>
sqlParamMap
=
new
HashMap
<
Integer
,
Property
>();
...
...
escheduler-server/src/test/java/cn/escheduler/server/worker/sql/SqlExecutorTest.java
浏览文件 @
9ed962a3
...
...
@@ -77,6 +77,15 @@ public class SqlExecutorTest {
sharedTestSqlTask
(
nodeName
,
taskAppId
,
tenantCode
,
taskInstId
);
}
@Test
public
void
testSQLServer
()
throws
Exception
{
String
nodeName
=
"SQL Server sql test"
;
String
taskAppId
=
"3_14_27"
;
String
tenantCode
=
"demo"
;
int
taskInstId
=
27
;
sharedTestSqlTask
(
nodeName
,
taskAppId
,
tenantCode
,
taskInstId
);
}
/**
* Basic test template for SQLTasks, mainly test different types of DBMS types
* @param nodeName node name for selected task
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
浏览文件 @
9ed962a3
...
...
@@ -6,7 +6,7 @@
<m-datasource
ref=
"refDs"
@
on-dsData=
"_onDsData"
:supportType=
"['MYSQL','POSTGRESQL','CLICKHOUSE', 'ORACLE']"
:supportType=
"['MYSQL','POSTGRESQL','CLICKHOUSE', 'ORACLE'
, 'SQLSERVER'
]"
:data=
"
{ type:type,datasource:datasource }">
</m-datasource>
</div>
...
...
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
浏览文件 @
9ed962a3
...
...
@@ -15,6 +15,7 @@
<
x
-
radio
:
label
=
"
'SPARK'
"
>
SPARK
<
/x-radio
>
<
x
-
radio
:
label
=
"
'CLICKHOUSE'
"
>
CLICKHOUSE
<
/x-radio
>
<
x
-
radio
:
label
=
"
'ORACLE'
"
>
ORACLE
<
/x-radio
>
<
x
-
radio
:
label
=
"
'SQLSERVER'
"
>
SQLSERVER
<
/x-radio
>
<
/x-radio-group
>
<
/template
>
<
/m-list-box-f
>
...
...
escheduler-ui/src/js/conf/home/store/dag/state.js
浏览文件 @
9ed962a3
...
...
@@ -76,6 +76,11 @@ export default {
id
:
5
,
code
:
'
ORACLE
'
,
disabled
:
false
},
{
id
:
6
,
code
:
'
SQLSERVER
'
,
disabled
:
false
}
],
// Alarm interface
...
...
escheduler-ui/src/js/conf/home/store/datasource/actions.js
浏览文件 @
9ed962a3
...
...
@@ -20,7 +20,7 @@ import io from '@/module/io'
export
default
{
/**
* Data source creation
* @param "type": string,//MYSQL, POSTGRESQL, HIVE, SPARK, CLICKHOUSE, ORACLE
* @param "type": string,//MYSQL, POSTGRESQL, HIVE, SPARK, CLICKHOUSE, ORACLE
, SQLSERVER
* @param "name": string,
* @param "desc": string,
* @param "parameter":string //{"address":"jdbc:hive2://192.168.220.189:10000","autoReconnect":"true","characterEncoding":"utf8","database":"default","initialTimeout":3000,"jdbcUrl":"jdbc:hive2://192.168.220.189:10000/default","maxReconnect":10,"password":"","useUnicode":true,"user":"hive"}
...
...
@@ -49,7 +49,7 @@ export default {
},
/**
* Query data source list - no paging
* @param "type": string//MYSQL, POSTGRESQL, HIVE, SPARK, CLICKHOUSE, ORACLE
* @param "type": string//MYSQL, POSTGRESQL, HIVE, SPARK, CLICKHOUSE, ORACLE
, SQLSERVER
*/
getDatasourcesList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
...
...
pom.xml
浏览文件 @
9ed962a3
...
...
@@ -372,6 +372,12 @@
<version>
0.1.52
</version>
</dependency>
<dependency>
<groupId>
com.microsoft.sqlserver
</groupId>
<artifactId>
mssql-jdbc
</artifactId>
<version>
6.1.0.jre8
</version>
</dependency>
</dependencies>
</dependencyManagement>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录