From b6595b6b89e2da1f07f881386895b309223bee14 Mon Sep 17 00:00:00 2001
From: MactavishCui <MactavishCui@163.com>
Date: Tue, 31 Dec 2024 23:10:44 +0800
Subject: [PATCH 1/4] bug fix 4 variable task lineage

---
 .../org/dinky/service/impl/JobInstanceServiceImpl.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
index f06adb2a21..e482c65c69 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
@@ -50,6 +50,7 @@
 import org.dinky.mybatis.util.ProTableUtil;
 import org.dinky.service.ClusterConfigurationService;
 import org.dinky.service.ClusterInstanceService;
+import org.dinky.service.FragmentVariableService;
 import org.dinky.service.HistoryService;
 import org.dinky.service.JobHistoryService;
 import org.dinky.service.JobInstanceService;
@@ -85,6 +86,7 @@ public class JobInstanceServiceImpl extends SuperServiceImpl<JobInstanceMapper,
     private final ClusterInstanceService clusterInstanceService;
     private final ClusterConfigurationService clusterConfigurationService;
     private final JobHistoryService jobHistoryService;
+    private final FragmentVariableService fragmentVariableService;
 
     @Override
     public JobInstance getByIdWithoutTenant(Integer id) {
@@ -295,7 +297,13 @@ public void refreshJobByTaskIds(Integer... taskIds) {
     @Override
     public LineageResult getLineage(Integer id) {
         History history = getJobInfoDetail(id).getHistory();
-        return LineageBuilder.getColumnLineageByLogicalPlan(history.getStatement(), ExecutorConfig.DEFAULT);
+        ExecutorConfig config = ExecutorConfig.builder()
+                .checkpoint(0)
+                .parallelism(1)
+                .useSqlFragment(true)
+                .variables(fragmentVariableService.listEnabledVariables())
+                .build();
+        return LineageBuilder.getColumnLineageByLogicalPlan(history.getStatement(), config);
     }
 
     @Override

From dceb03a0dab46aa9730121f93a4979cb84369d13 Mon Sep 17 00:00:00 2001
From: MactavishCui <MactavishCui@163.com>
Date: Thu, 2 Jan 2025 22:16:12 +0800
Subject: [PATCH 2/4] opt

---
 .../org/dinky/service/impl/JobInstanceServiceImpl.java    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
index e482c65c69..93d9e8ea43 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
@@ -297,13 +297,7 @@ public void refreshJobByTaskIds(Integer... taskIds) {
     @Override
     public LineageResult getLineage(Integer id) {
         History history = getJobInfoDetail(id).getHistory();
-        ExecutorConfig config = ExecutorConfig.builder()
-                .checkpoint(0)
-                .parallelism(1)
-                .useSqlFragment(true)
-                .variables(fragmentVariableService.listEnabledVariables())
-                .build();
-        return LineageBuilder.getColumnLineageByLogicalPlan(history.getStatement(), config);
+        return LineageBuilder.getColumnLineageByLogicalPlan(history.getStatement(), history.getConfigJson());
     }
 
     @Override

From 86f425c1d29ebe908b7002ccb79b950a0de65ff1 Mon Sep 17 00:00:00 2001
From: MactavishCui <MactavishCui@163.com>
Date: Thu, 2 Jan 2025 22:23:39 +0800
Subject: [PATCH 3/4] spotless

---
 .../main/java/org/dinky/service/impl/JobInstanceServiceImpl.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
index 93d9e8ea43..01f63a7dbd 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
@@ -41,7 +41,6 @@
 import org.dinky.data.model.mapping.ClusterInstanceMapping;
 import org.dinky.data.result.ProTableResult;
 import org.dinky.data.vo.task.JobInstanceVo;
-import org.dinky.executor.ExecutorConfig;
 import org.dinky.explainer.lineage.LineageBuilder;
 import org.dinky.explainer.lineage.LineageResult;
 import org.dinky.job.FlinkJobTask;

From 9eca0cb5c9569c827bb5dd7fddf4f53b05ee7bfd Mon Sep 17 00:00:00 2001
From: MactavishCui <MactavishCui@163.com>
Date: Thu, 2 Jan 2025 22:25:45 +0800
Subject: [PATCH 4/4] opt

---
 .../java/org/dinky/service/impl/JobInstanceServiceImpl.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
index 01f63a7dbd..236942209e 100644
--- a/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
+++ b/dinky-admin/src/main/java/org/dinky/service/impl/JobInstanceServiceImpl.java
@@ -49,7 +49,6 @@
 import org.dinky.mybatis.util.ProTableUtil;
 import org.dinky.service.ClusterConfigurationService;
 import org.dinky.service.ClusterInstanceService;
-import org.dinky.service.FragmentVariableService;
 import org.dinky.service.HistoryService;
 import org.dinky.service.JobHistoryService;
 import org.dinky.service.JobInstanceService;
@@ -85,7 +84,6 @@ public class JobInstanceServiceImpl extends SuperServiceImpl<JobInstanceMapper,
     private final ClusterInstanceService clusterInstanceService;
     private final ClusterConfigurationService clusterConfigurationService;
     private final JobHistoryService jobHistoryService;
-    private final FragmentVariableService fragmentVariableService;
 
     @Override
     public JobInstance getByIdWithoutTenant(Integer id) {