From 7ccdb06fddf7b4abdc69f1a7c6c0c8ad937a415b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E4=B9=89=E8=B6=85?= <suyc@chinatelecom.cn>
Date: Fri, 24 Jul 2026 16:36:49 +0800
Subject: [PATCH 1/5] optimize TaskInstanceMapper to exclude large text fields
 from list queries

---
 .../dao/mapper/TaskInstanceMapper.xml         | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
index 674450ccbb9b..050733ac58e6 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -30,9 +30,21 @@
         ${alias}.flag, ${alias}.retry_interval, ${alias}.max_retry_times, ${alias}.task_instance_priority, ${alias}.worker_group,${alias}.environment_code , ${alias}.executor_id,
         ${alias}.first_submit_time, ${alias}.delay_time, ${alias}.task_params, ${alias}.var_pool, ${alias}.dry_run, ${alias}.task_group_id, ${alias}.task_execute_type
     </sql>
+    <sql id="listSql">
+        id, name, task_type, workflow_instance_id, workflow_instance_name, project_code, task_code, task_definition_version, state, submit_time,
+        start_time, end_time, host, alert_flag, retry_times, pid,
+        flag, retry_interval, max_retry_times, task_instance_priority, worker_group,environment_code , executor_id, executor_name,
+        first_submit_time, delay_time, dry_run, task_group_id, cpu_quota, memory_max, task_execute_type
+    </sql>
+    <sql id="listSqlV2">
+        ${alias}.id, ${alias}.name, ${alias}.task_type, ${alias}.task_code, ${alias}.task_definition_version, ${alias}.workflow_instance_id, ${alias}.state, ${alias}.submit_time,
+        ${alias}.start_time, ${alias}.end_time, ${alias}.host, ${alias}.alert_flag, ${alias}.retry_times, ${alias}.pid,
+        ${alias}.flag, ${alias}.retry_interval, ${alias}.max_retry_times, ${alias}.task_instance_priority, ${alias}.worker_group,${alias}.environment_code , ${alias}.executor_id,
+        ${alias}.first_submit_time, ${alias}.delay_time, ${alias}.dry_run, ${alias}.task_group_id, ${alias}.task_execute_type
+    </sql>
     <select id="findValidTaskListByWorkflowInstanceId" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="baseSql"/>
+        <include refid="listSql"/>
         from t_ds_task_instance
         WHERE workflow_instance_id = #{workflowInstanceId}
         and flag = #{flag}
@@ -40,7 +52,7 @@
     </select>
     <select id="findByWorkflowInstanceId" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="baseSql"/>
+        <include refid="listSql"/>
         from t_ds_task_instance
         WHERE workflow_instance_id = #{workflowInstanceId}
     </select>
@@ -134,7 +146,7 @@
     </select>
     <select id="queryByWorkflowInstanceIdsAndTaskCodes" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="baseSql"/>
+        <include refid="listSql"/>
         from t_ds_task_instance
         where flag = 1
         <if test="workflowInstanceIds != null and workflowInstanceIds.size() != 0">
@@ -153,7 +165,7 @@
 
     <select id="queryTaskInstanceListPaging" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="baseSql"/>
+        <include refid="listSql"/>
         from t_ds_task_instance
         where project_code = #{projectCode}
         <if test="startTime != null">
@@ -196,7 +208,7 @@
     </select>
     <select id="queryStreamTaskInstanceListPaging" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="baseSql"/>
+        <include refid="listSql"/>
         from t_ds_task_instance
         where project_code = #{projectCode}
         <if test="startTime != null">
@@ -236,7 +248,7 @@
     </select>
     <select id="findLastTaskInstances" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="baseSqlV2">
+        <include refid="listSqlV2">
             <property name="alias" value="instance"/>
         </include>
         from t_ds_task_instance instance
@@ -260,7 +272,7 @@
     </select>
     <select id="findLastTaskInstance" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="baseSql"/>
+        <include refid="listSql"/>
         from t_ds_task_instance
         where workflow_instance_id = #{workflowInstanceId}
         and task_code = #{taskCode}

From 30040dde4bcb242c8775fee56563afd1dc465f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E4=B9=89=E8=B6=85?= <suyc@chinatelecom.cn>
Date: Mon, 27 Jul 2026 11:02:01 +0800
Subject: [PATCH 2/5] revert critical queries to use baseSql for failover
 compatibility

---
 .../dolphinscheduler/dao/mapper/TaskInstanceMapper.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
index 050733ac58e6..4f3033a8e468 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -44,7 +44,7 @@
     </sql>
     <select id="findValidTaskListByWorkflowInstanceId" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="listSql"/>
+        <include refid="baseSql"/>
         from t_ds_task_instance
         WHERE workflow_instance_id = #{workflowInstanceId}
         and flag = #{flag}
@@ -52,7 +52,7 @@
     </select>
     <select id="findByWorkflowInstanceId" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="listSql"/>
+        <include refid="baseSql"/>
         from t_ds_task_instance
         WHERE workflow_instance_id = #{workflowInstanceId}
     </select>
@@ -248,7 +248,7 @@
     </select>
     <select id="findLastTaskInstances" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="listSqlV2">
+        <include refid="baseSqlV2">
             <property name="alias" value="instance"/>
         </include>
         from t_ds_task_instance instance
@@ -272,7 +272,7 @@
     </select>
     <select id="findLastTaskInstance" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="listSql"/>
+        <include refid="baseSql"/>
         from t_ds_task_instance
         where workflow_instance_id = #{workflowInstanceId}
         and task_code = #{taskCode}

From c542b41f7f862358462cc69825b45a0c4a1b5acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E4=B9=89=E8=B6=85?= <suyc@chinatelecom.cn>
Date: Mon, 27 Jul 2026 11:24:07 +0800
Subject: [PATCH 3/5] remove listSqlV2

---
 .../dolphinscheduler/dao/mapper/TaskInstanceMapper.xml      | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
index 4f3033a8e468..e2842129d5c7 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -36,12 +36,6 @@
         flag, retry_interval, max_retry_times, task_instance_priority, worker_group,environment_code , executor_id, executor_name,
         first_submit_time, delay_time, dry_run, task_group_id, cpu_quota, memory_max, task_execute_type
     </sql>
-    <sql id="listSqlV2">
-        ${alias}.id, ${alias}.name, ${alias}.task_type, ${alias}.task_code, ${alias}.task_definition_version, ${alias}.workflow_instance_id, ${alias}.state, ${alias}.submit_time,
-        ${alias}.start_time, ${alias}.end_time, ${alias}.host, ${alias}.alert_flag, ${alias}.retry_times, ${alias}.pid,
-        ${alias}.flag, ${alias}.retry_interval, ${alias}.max_retry_times, ${alias}.task_instance_priority, ${alias}.worker_group,${alias}.environment_code , ${alias}.executor_id,
-        ${alias}.first_submit_time, ${alias}.delay_time, ${alias}.dry_run, ${alias}.task_group_id, ${alias}.task_execute_type
-    </sql>
     <select id="findValidTaskListByWorkflowInstanceId" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
         <include refid="baseSql"/>

From e3bf2594b4103d89019681180f35471532af1ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E4=B9=89=E8=B6=85?= <suyc@chinatelecom.cn>
Date: Mon, 27 Jul 2026 13:46:15 +0800
Subject: [PATCH 4/5] exclude large text fields from queryByInstanceIdAndCode
 and findLastTaskInstances

---
 .../dolphinscheduler/dao/mapper/TaskInstanceMapper.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
index e2842129d5c7..2d29c6604ec1 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -36,6 +36,12 @@
         flag, retry_interval, max_retry_times, task_instance_priority, worker_group,environment_code , executor_id, executor_name,
         first_submit_time, delay_time, dry_run, task_group_id, cpu_quota, memory_max, task_execute_type
     </sql>
+    <sql id="listSqlV2">
+        ${alias}.id, ${alias}.name, ${alias}.task_type, ${alias}.workflow_instance_id, ${alias}.workflow_instance_name, ${alias}.project_code, ${alias}.task_code, ${alias}.task_definition_version, ${alias}.state, ${alias}.submit_time,
+        ${alias}.start_time, ${alias}.end_time, ${alias}.host, ${alias}.alert_flag, ${alias}.retry_times, ${alias}.pid,
+        ${alias}.flag, ${alias}.retry_interval, ${alias}.max_retry_times, ${alias}.task_instance_priority, ${alias}.worker_group, ${alias}.environment_code, ${alias}.executor_id, ${alias}.executor_name,
+        ${alias}.first_submit_time, ${alias}.delay_time, ${alias}.dry_run, ${alias}.task_group_id, ${alias}.cpu_quota, ${alias}.memory_max, ${alias}.task_execute_type
+    </sql>
     <select id="findValidTaskListByWorkflowInstanceId" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
         <include refid="baseSql"/>
@@ -131,7 +137,7 @@
 
     <select id="queryByInstanceIdAndCode" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="baseSql"/>
+        <include refid="listSql"/>
         from t_ds_task_instance
         where workflow_instance_id = #{workflowInstanceId}
         and task_code = #{taskCode}
@@ -242,7 +248,7 @@
     </select>
     <select id="findLastTaskInstances" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
-        <include refid="baseSqlV2">
+        <include refid="listSqlV2">
             <property name="alias" value="instance"/>
         </include>
         from t_ds_task_instance instance

From d2e57032b5f255bd56cd76c6c4dbcbb60750300a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E4=B9=89=E8=B6=85?= <suyc@chinatelecom.cn>
Date: Mon, 3 Aug 2026 10:56:27 +0800
Subject: [PATCH 5/5] add app_link

---
 .../apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
index 2d29c6604ec1..e632e7c9b36e 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -32,13 +32,13 @@
     </sql>
     <sql id="listSql">
         id, name, task_type, workflow_instance_id, workflow_instance_name, project_code, task_code, task_definition_version, state, submit_time,
-        start_time, end_time, host, alert_flag, retry_times, pid,
+        start_time, end_time, host, alert_flag, retry_times, pid, app_link,
         flag, retry_interval, max_retry_times, task_instance_priority, worker_group,environment_code , executor_id, executor_name,
         first_submit_time, delay_time, dry_run, task_group_id, cpu_quota, memory_max, task_execute_type
     </sql>
     <sql id="listSqlV2">
         ${alias}.id, ${alias}.name, ${alias}.task_type, ${alias}.workflow_instance_id, ${alias}.workflow_instance_name, ${alias}.project_code, ${alias}.task_code, ${alias}.task_definition_version, ${alias}.state, ${alias}.submit_time,
-        ${alias}.start_time, ${alias}.end_time, ${alias}.host, ${alias}.alert_flag, ${alias}.retry_times, ${alias}.pid,
+        ${alias}.start_time, ${alias}.end_time, ${alias}.host, ${alias}.alert_flag, ${alias}.retry_times, ${alias}.pid, ${alias}.app_link,
         ${alias}.flag, ${alias}.retry_interval, ${alias}.max_retry_times, ${alias}.task_instance_priority, ${alias}.worker_group, ${alias}.environment_code, ${alias}.executor_id, ${alias}.executor_name,
         ${alias}.first_submit_time, ${alias}.delay_time, ${alias}.dry_run, ${alias}.task_group_id, ${alias}.cpu_quota, ${alias}.memory_max, ${alias}.task_execute_type
     </sql>