[dolphinscheduler] branch dev updated: [Fix 13941]Fix replace time variable (#13975)

[zihaoxiang]

This is an automated email from the ASF dual-hosted git repository.

zihaoxiang 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 34f5b009e1 [Fix 13941]Fix replace time variable (#13975)
34f5b009e1 is described below

commit 34f5b009e18dbeeda20c5befb0dc44ed74b826da
Author: Zzih <466315...@qq.com>
AuthorDate: Fri Apr 21 14:37:52 2023 +0800

    [Fix 13941]Fix replace time variable (#13975)
    
    * fix replace time variable
    
    Co-authored-by: <ziheng.z...@longbridge.sg>
---
 .../org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
 
b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
index f1a885162d..a0935f0266 100644
--- 
a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
+++ 
b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
@@ -477,7 +477,10 @@ public class SqlTask extends AbstractTask {
     private SqlBinds getSqlAndSqlParamsMap(String sql) {
         Map<Integer, Property> sqlParamsMap = new HashMap<>();
         StringBuilder sqlBuilder = new StringBuilder();
-
+        // new
+        // replace variable TIME with $[YYYYmmddd...] in sql when history run 
job and batch complement job
+        sql = ParameterUtils.replaceScheduleTime(sql,
+                
DateUtils.timeStampToDate(taskExecutionContext.getScheduleTime()));
         // combining local and global parameters
         Map<String, Property> paramsMap = 
taskExecutionContext.getPrepareParamsMap();
 
@@ -494,10 +497,6 @@ public class SqlTask extends AbstractTask {
             sqlParameters.setTitle(title);
         }
 
-        // new
-        // replace variable TIME with $[YYYYmmddd...] in sql when history run 
job and batch complement job
-        sql = ParameterUtils.replaceScheduleTime(sql,
-                
DateUtils.timeStampToDate(taskExecutionContext.getScheduleTime()));
         // special characters need to be escaped, ${} needs to be escaped
         setSqlParamsMap(sql, rgex, sqlParamsMap, paramsMap, 
taskExecutionContext.getTaskInstanceId());
         // Replace the original value in sql ！{...} ，Does not participate in 
precompilation