Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
ac8fafa3
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
704
Star
9572
Fork
3514
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
提交
ac8fafa3
编写于
9月 08, 2021
作者:
C
CalvinKirs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix code style
上级
2dd52793
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
47 addition
and
42 deletion
+47
-42
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
...g/apache/dolphinscheduler/server/worker/WorkerServer.java
+5
-5
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
...nscheduler/server/worker/processor/TaskKillProcessor.java
+2
-2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThread.java
...inscheduler/server/worker/runner/WorkerManagerThread.java
+2
-2
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/input/number/InputNumberParam.java
...inscheduler/spi/params/input/number/InputNumberParam.java
+1
-1
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/input/number/InputNumberParamProps.java
...eduler/spi/params/input/number/InputNumberParamProps.java
+1
-1
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/AbstractTask.java
...va/org/apache/dolphinscheduler/spi/task/AbstractTask.java
+0
-2
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/CollectionUtils.java
...rg/apache/dolphinscheduler/spi/utils/CollectionUtils.java
+8
-1
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/BaseDataSourceParamDTO.java
...eduler/plugin/task/datasource/BaseDataSourceParamDTO.java
+1
-1
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/clickhouse/ClickHouseDatasourceProcessor.java
.../datasource/clickhouse/ClickHouseDatasourceProcessor.java
+3
-3
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/db2/Db2DatasourceParamDTO.java
...ler/plugin/task/datasource/db2/Db2DatasourceParamDTO.java
+1
-1
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/db2/Db2DatasourceProcessor.java
...er/plugin/task/datasource/db2/Db2DatasourceProcessor.java
+3
-3
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/hive/HiveDataSourceParamDTO.java
...r/plugin/task/datasource/hive/HiveDataSourceParamDTO.java
+1
-1
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/hive/HiveDatasourceProcessor.java
.../plugin/task/datasource/hive/HiveDatasourceProcessor.java
+3
-3
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/presto/PrestoDatasourceParamDTO.java
...ugin/task/datasource/presto/PrestoDatasourceParamDTO.java
+1
-1
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/presto/PrestoDatasourceProcessor.java
...gin/task/datasource/presto/PrestoDatasourceProcessor.java
+3
-3
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.java
.../apache/dolphinscheduler/plugin/task/datax/DataxTask.java
+4
-4
dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/src/main/java/org/apache/dolphinscheduler/plugin/task/procedure/ProcedureTask.java
...dolphinscheduler/plugin/task/procedure/ProcedureTask.java
+2
-2
dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/sources/MysqlSourceGenerator.java
...in/task/sqoop/generator/sources/MysqlSourceGenerator.java
+3
-3
dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/targets/MysqlTargetGenerator.java
...in/task/sqoop/generator/targets/MysqlTargetGenerator.java
+3
-3
未找到文件。
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
浏览文件 @
ac8fafa3
...
...
@@ -17,12 +17,10 @@
package
org.apache.dolphinscheduler.server.worker
;
import
com.google.common.collect.ImmutableList
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.IStoppable
;
import
org.apache.dolphinscheduler.common.enums.NodeType
;
import
org.apache.dolphinscheduler.common.thread.Stopper
;
import
org.apache.dolphinscheduler.common.utils.PropertyUtils
;
import
org.apache.dolphinscheduler.remote.NettyRemotingServer
;
import
org.apache.dolphinscheduler.remote.command.CommandType
;
import
org.apache.dolphinscheduler.remote.config.NettyServerConfig
;
...
...
@@ -37,14 +35,14 @@ import org.apache.dolphinscheduler.server.worker.runner.RetryReportTaskStatusThr
import
org.apache.dolphinscheduler.server.worker.runner.WorkerManagerThread
;
import
org.apache.dolphinscheduler.service.alert.AlertClientService
;
import
org.apache.dolphinscheduler.service.bean.SpringApplicationContext
;
import
org.apache.dolphinscheduler.spi.plugin.DolphinPluginLoader
;
import
org.apache.dolphinscheduler.spi.plugin.DolphinPluginManagerConfig
;
import
org.apache.dolphinscheduler.spi.utils.StringUtils
;
import
java.util.Set
;
import
javax.annotation.PostConstruct
;
import
org.apache.dolphinscheduler.spi.plugin.DolphinPluginLoader
;
import
org.apache.dolphinscheduler.spi.plugin.DolphinPluginManagerConfig
;
import
org.apache.dolphinscheduler.spi.utils.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -54,6 +52,8 @@ import org.springframework.context.annotation.ComponentScan;
import
org.springframework.context.annotation.FilterType
;
import
org.springframework.transaction.annotation.EnableTransactionManagement
;
import
com.facebook.presto.jdbc.internal.guava.collect.ImmutableList
;
/**
* worker server
*/
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
浏览文件 @
ac8fafa3
...
...
@@ -109,7 +109,7 @@ public class TaskKillProcessor implements NettyRequestProcessor {
List
<
String
>
appIds
=
Collections
.
emptyList
();
int
taskInstanceId
=
killCommand
.
getTaskInstanceId
();
TaskRequest
taskRequest
=
TaskExecutionContextCacheManager
.
getByTaskInstanceId
(
taskInstanceId
);
TaskExecutionContext
taskExecutionContext
=
JSONUtils
.
parseObject
(
JSONUtils
.
toJsonString
(
taskRequest
),
TaskExecutionContext
.
class
);
TaskExecutionContext
taskExecutionContext
=
JSONUtils
.
parseObject
(
JSONUtils
.
toJsonString
(
taskRequest
),
TaskExecutionContext
.
class
);
try
{
Integer
processId
=
taskExecutionContext
.
getProcessId
();
...
...
@@ -156,7 +156,7 @@ public class TaskKillProcessor implements NettyRequestProcessor {
if
(
taskRequest
==
null
)
{
return
taskKillResponseCommand
;
}
TaskExecutionContext
taskExecutionContext
=
JSONUtils
.
parseObject
(
JSONUtils
.
toJsonString
(
taskRequest
),
TaskExecutionContext
.
class
);
TaskExecutionContext
taskExecutionContext
=
JSONUtils
.
parseObject
(
JSONUtils
.
toJsonString
(
taskRequest
),
TaskExecutionContext
.
class
);
if
(
taskExecutionContext
!=
null
)
{
taskKillResponseCommand
.
setTaskInstanceId
(
taskExecutionContext
.
getTaskInstanceId
());
taskKillResponseCommand
.
setHost
(
taskExecutionContext
.
getHost
());
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThread.java
浏览文件 @
ac8fafa3
...
...
@@ -100,8 +100,8 @@ public class WorkerManagerThread implements Runnable {
if
(
taskRequest
==
null
)
{
return
;
}
TaskExecutionContext
taskExecutionContext
=
JSONUtils
.
parseObject
(
JSONUtils
.
toJsonString
(
taskRequest
),
TaskExecutionContext
.
class
);
TaskExecuteResponseCommand
responseCommand
=
new
TaskExecuteResponseCommand
(
taskExecutionContext
.
getTaskInstanceId
(),
taskExecutionContext
.
getProcessInstanceId
());
TaskExecutionContext
taskExecutionContext
=
JSONUtils
.
parseObject
(
JSONUtils
.
toJsonString
(
taskRequest
),
TaskExecutionContext
.
class
);
TaskExecuteResponseCommand
responseCommand
=
new
TaskExecuteResponseCommand
(
taskExecutionContext
.
getTaskInstanceId
(),
taskExecutionContext
.
getProcessInstanceId
());
responseCommand
.
setStatus
(
ExecutionStatus
.
KILL
.
getCode
());
ResponceCache
.
get
().
cache
(
taskExecutionContext
.
getTaskInstanceId
(),
responseCommand
.
convert2Command
(),
Event
.
RESULT
);
taskCallbackService
.
sendResult
(
taskExecutionContext
.
getTaskInstanceId
(),
responseCommand
.
convert2Command
());
...
...
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/input
N
umber/InputNumberParam.java
→
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/input
/n
umber/InputNumberParam.java
浏览文件 @
ac8fafa3
...
...
@@ -15,7 +15,7 @@
* limitations under the License.
*/
package
org.apache.dolphinscheduler.spi.params.input
N
umber
;
package
org.apache.dolphinscheduler.spi.params.input
.n
umber
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
params
.
base
.
FormType
.
INPUTNUMBER
;
...
...
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/input
N
umber/InputNumberParamProps.java
→
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/input
/n
umber/InputNumberParamProps.java
浏览文件 @
ac8fafa3
...
...
@@ -15,7 +15,7 @@
* limitations under the License.
*/
package
org.apache.dolphinscheduler.spi.params.input
N
umber
;
package
org.apache.dolphinscheduler.spi.params.input
.n
umber
;
import
org.apache.dolphinscheduler.spi.params.base.ParamsProps
;
...
...
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/AbstractTask.java
浏览文件 @
ac8fafa3
...
...
@@ -100,8 +100,6 @@ public abstract class AbstractTask {
this
.
cancel
=
status
;
}
public
void
setVarPool
(
String
varPool
)
{
this
.
varPool
=
varPool
;
}
...
...
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/CollectionUtils.java
浏览文件 @
ac8fafa3
...
...
@@ -19,7 +19,14 @@ package org.apache.dolphinscheduler.spi.utils;
import
org.apache.commons.beanutils.BeanMap
;
import
java.util.*
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/BaseDataSourceParamDTO.java
浏览文件 @
ac8fafa3
...
...
@@ -17,7 +17,6 @@
package
org.apache.dolphinscheduler.plugin.task.datasource
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.plugin.task.datasource.clickhouse.ClickHouseDatasourceParamDTO
;
import
org.apache.dolphinscheduler.plugin.task.datasource.db2.Db2DatasourceParamDTO
;
import
org.apache.dolphinscheduler.plugin.task.datasource.hive.HiveDataSourceParamDTO
;
...
...
@@ -27,6 +26,7 @@ import org.apache.dolphinscheduler.plugin.task.datasource.postgresql.PostgreSqlD
import
org.apache.dolphinscheduler.plugin.task.datasource.presto.PrestoDatasourceParamDTO
;
import
org.apache.dolphinscheduler.plugin.task.datasource.spark.SparkDatasourceParamDTO
;
import
org.apache.dolphinscheduler.plugin.task.datasource.sqlserver.SqlServerDatasourceParamDTO
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
java.io.Serializable
;
import
java.util.Map
;
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/clickhouse/ClickHouseDatasourceProcessor.java
浏览文件 @
ac8fafa3
...
...
@@ -17,18 +17,18 @@
package
org.apache.dolphinscheduler.plugin.task.datasource.clickhouse
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
encodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COLON
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COMMA
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COM_CLICKHOUSE_JDBC_DRIVER
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
DOUBLE_SLASH
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
JDBC_CLICKHOUSE
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
encodePassword
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.plugin.task.datasource.AbstractDatasourceProcessor
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseDataSourceParamDTO
;
import
org.apache.dolphinscheduler.plugin.task.datasource.ConnectionParam
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.spi.utils.JSONUtils
;
import
org.apache.dolphinscheduler.spi.utils.StringUtils
;
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/db2/Db2DatasourceParamDTO.java
浏览文件 @
ac8fafa3
...
...
@@ -17,8 +17,8 @@
package
org.apache.dolphinscheduler.plugin.task.datasource.db2
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseDataSourceParamDTO
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
public
class
Db2DatasourceParamDTO
extends
BaseDataSourceParamDTO
{
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/db2/Db2DatasourceProcessor.java
浏览文件 @
ac8fafa3
...
...
@@ -17,19 +17,19 @@
package
org.apache.dolphinscheduler.plugin.task.datasource.db2
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
encodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COLON
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COMMA
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COM_DB2_JDBC_DRIVER
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
DOUBLE_SLASH
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
JDBC_DB2
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
encodePassword
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.plugin.task.datasource.AbstractDatasourceProcessor
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseDataSourceParamDTO
;
import
org.apache.dolphinscheduler.plugin.task.datasource.ConnectionParam
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.spi.utils.JSONUtils
;
import
org.apache.dolphinscheduler.spi.utils.StringUtils
;
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/hive/HiveDataSourceParamDTO.java
浏览文件 @
ac8fafa3
...
...
@@ -17,8 +17,8 @@
package
org.apache.dolphinscheduler.plugin.task.datasource.hive
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseHdfsDatasourceParamDTO
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
public
class
HiveDataSourceParamDTO
extends
BaseHdfsDatasourceParamDTO
{
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/hive/HiveDatasourceProcessor.java
浏览文件 @
ac8fafa3
...
...
@@ -17,21 +17,21 @@
package
org.apache.dolphinscheduler.plugin.task.datasource.hive
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
encodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COLON
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COMMA
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
DOUBLE_SLASH
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
JDBC_HIVE_2
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
ORG_APACHE_HIVE_JDBC_HIVE_DRIVER
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
encodePassword
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.plugin.task.datasource.AbstractDatasourceProcessor
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseDataSourceParamDTO
;
import
org.apache.dolphinscheduler.plugin.task.datasource.ConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.HiveConfUtils
;
import
org.apache.dolphinscheduler.plugin.task.util.CommonUtils
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.spi.utils.JSONUtils
;
import
org.apache.dolphinscheduler.spi.utils.StringUtils
;
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/presto/PrestoDatasourceParamDTO.java
浏览文件 @
ac8fafa3
...
...
@@ -17,8 +17,8 @@
package
org.apache.dolphinscheduler.plugin.task.datasource.presto
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseDataSourceParamDTO
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
public
class
PrestoDatasourceParamDTO
extends
BaseDataSourceParamDTO
{
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/datasource/presto/PrestoDatasourceProcessor.java
浏览文件 @
ac8fafa3
...
...
@@ -17,19 +17,19 @@
package
org.apache.dolphinscheduler.plugin.task.datasource.presto
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
encodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COLON
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COMMA
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
COM_PRESTO_JDBC_DRIVER
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
DOUBLE_SLASH
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
JDBC_PRESTO
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
encodePassword
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.plugin.task.datasource.AbstractDatasourceProcessor
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseDataSourceParamDTO
;
import
org.apache.dolphinscheduler.plugin.task.datasource.ConnectionParam
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.spi.utils.JSONUtils
;
import
org.apache.dolphinscheduler.spi.utils.StringUtils
;
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.java
浏览文件 @
ac8fafa3
...
...
@@ -17,21 +17,21 @@
package
org.apache.dolphinscheduler.plugin.task.datax
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
EXIT_CODE_FAILURE
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
RWXR_XR_X
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
org.apache.dolphinscheduler.plugin.task.api.AbstractTaskExecutor
;
import
org.apache.dolphinscheduler.plugin.task.api.ShellCommandExecutor
;
import
org.apache.dolphinscheduler.plugin.task.api.TaskResponse
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.DatasourceUtil
;
import
org.apache.dolphinscheduler.plugin.task.util.MapUtils
;
import
org.apache.dolphinscheduler.plugin.task.util.OSUtils
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.spi.enums.Flag
;
import
org.apache.dolphinscheduler.spi.task.AbstractParameters
;
import
org.apache.dolphinscheduler.spi.task.Property
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.DatasourceUtil
;
import
org.apache.dolphinscheduler.spi.task.paramparser.ParamUtils
;
import
org.apache.dolphinscheduler.spi.task.paramparser.ParameterUtils
;
import
org.apache.dolphinscheduler.spi.task.request.DataxTaskRequest
;
...
...
@@ -148,7 +148,7 @@ public class DataxTask extends AbstractTaskExecutor {
Thread
.
currentThread
().
setName
(
threadLoggerInfoName
);
// replace placeholder,and combine local and global parameters
Map
<
String
,
Property
>
paramsMap
=
ParamUtils
.
convert
(
taskExecutionContext
,
getParameters
());
Map
<
String
,
Property
>
paramsMap
=
ParamUtils
.
convert
(
taskExecutionContext
,
getParameters
());
if
(
MapUtils
.
isEmpty
(
paramsMap
))
{
paramsMap
=
new
HashMap
<>();
}
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/src/main/java/org/apache/dolphinscheduler/plugin/task/procedure/ProcedureTask.java
浏览文件 @
ac8fafa3
...
...
@@ -22,14 +22,14 @@ import static org.apache.dolphinscheduler.spi.task.TaskConstants.EXIT_CODE_SUCCE
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
TASK_LOG_INFO_FORMAT
;
import
org.apache.dolphinscheduler.plugin.task.api.AbstractTaskExecutor
;
import
org.apache.dolphinscheduler.plugin.task.datasource.ConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.DatasourceUtil
;
import
org.apache.dolphinscheduler.spi.enums.DataType
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.spi.enums.TaskTimeoutStrategy
;
import
org.apache.dolphinscheduler.spi.task.AbstractParameters
;
import
org.apache.dolphinscheduler.spi.task.Direct
;
import
org.apache.dolphinscheduler.spi.task.Property
;
import
org.apache.dolphinscheduler.plugin.task.datasource.ConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.DatasourceUtil
;
import
org.apache.dolphinscheduler.spi.task.paramparser.ParamUtils
;
import
org.apache.dolphinscheduler.spi.task.paramparser.ParameterUtils
;
import
org.apache.dolphinscheduler.spi.task.request.ProcedureTaskRequest
;
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/sources/MysqlSourceGenerator.java
浏览文件 @
ac8fafa3
...
...
@@ -17,6 +17,7 @@
package
org.apache.dolphinscheduler.plugin.task.sqoop.generator.sources
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
sqoop
.
SqoopConstants
.
COLUMNS
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
sqoop
.
SqoopConstants
.
DB_CONNECT
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
sqoop
.
SqoopConstants
.
DB_PWD
;
...
...
@@ -32,16 +33,15 @@ import static org.apache.dolphinscheduler.spi.task.TaskConstants.COMMA;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
DOUBLE_QUOTES
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
EQUAL_SIGN
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
SPACE
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.DatasourceUtil
;
import
org.apache.dolphinscheduler.plugin.task.sqoop.SqoopQueryType
;
import
org.apache.dolphinscheduler.plugin.task.sqoop.generator.ISourceGenerator
;
import
org.apache.dolphinscheduler.plugin.task.sqoop.parameter.SqoopParameters
;
import
org.apache.dolphinscheduler.plugin.task.sqoop.parameter.sources.SourceMysqlParameter
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.spi.task.Property
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.DatasourceUtil
;
import
org.apache.dolphinscheduler.spi.task.request.SqoopTaskRequest
;
import
org.apache.dolphinscheduler.spi.utils.JSONUtils
;
import
org.apache.dolphinscheduler.spi.utils.StringUtils
;
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/targets/MysqlTargetGenerator.java
浏览文件 @
ac8fafa3
...
...
@@ -17,6 +17,7 @@
package
org.apache.dolphinscheduler.plugin.task.sqoop.generator.targets
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
sqoop
.
SqoopConstants
.
COLUMNS
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
sqoop
.
SqoopConstants
.
DB_CONNECT
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
sqoop
.
SqoopConstants
.
DB_PWD
;
...
...
@@ -29,14 +30,13 @@ import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.UPDAT
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
DOUBLE_QUOTES
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
SINGLE_QUOTES
;
import
static
org
.
apache
.
dolphinscheduler
.
spi
.
task
.
TaskConstants
.
SPACE
;
import
static
org
.
apache
.
dolphinscheduler
.
plugin
.
task
.
datasource
.
PasswordUtils
.
decodePassword
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.DatasourceUtil
;
import
org.apache.dolphinscheduler.plugin.task.sqoop.generator.ITargetGenerator
;
import
org.apache.dolphinscheduler.plugin.task.sqoop.parameter.SqoopParameters
;
import
org.apache.dolphinscheduler.plugin.task.sqoop.parameter.targets.TargetMysqlParameter
;
import
org.apache.dolphinscheduler.spi.enums.DbType
;
import
org.apache.dolphinscheduler.plugin.task.datasource.BaseConnectionParam
;
import
org.apache.dolphinscheduler.plugin.task.datasource.DatasourceUtil
;
import
org.apache.dolphinscheduler.spi.task.request.SqoopTaskRequest
;
import
org.apache.dolphinscheduler.spi.utils.JSONUtils
;
import
org.apache.dolphinscheduler.spi.utils.StringUtils
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录