You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/08/31 07:15:37 UTC
[dolphinscheduler] branch 1.3.8-prepare updated: [FIX-#6007]Wrong
complement date (#6068)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch 1.3.8-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.8-prepare by this push:
new 19d3f64 [FIX-#6007]Wrong complement date (#6068)
19d3f64 is described below
commit 19d3f642af647f35dde29d328c24b1edacd0124e
Author: linquan <11...@qq.com>
AuthorDate: Tue Aug 31 15:14:00 2021 +0800
[FIX-#6007]Wrong complement date (#6068)
---
.../dolphinscheduler/server/worker/task/sql/SqlTask.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index f021cb7..1b29452 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -182,18 +182,14 @@ public class SqlTask extends AbstractTask {
sqlParameters.getLocalParametersMap(),
CommandType.of(taskExecutionContext.getCmdTypeIfComplement()),
taskExecutionContext.getScheduleTime());
- if(MapUtils.isEmpty(paramsMap)){
- paramsMap=new HashMap<>();
+ if (paramsMap == null) {
+ sqlBuilder.append(sql);
+ return new SqlBinds(sqlBuilder.toString(), sqlParamsMap);
}
if (MapUtils.isNotEmpty(taskExecutionContext.getParamsMap())){
paramsMap.putAll(taskExecutionContext.getParamsMap());
}
// spell SQL according to the final user-defined variable
- if(paramsMap.isEmpty()){
- sqlBuilder.append(sql);
- return new SqlBinds(sqlBuilder.toString(), sqlParamsMap);
- }
-
if (StringUtils.isNotEmpty(sqlParameters.getTitle())){
String title = ParameterUtils.convertParameterPlaceholders(sqlParameters.getTitle(),
ParamUtils.convert(paramsMap));