This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new a851168 fix：Optimize content returned by interface (#2294)
a851168 is described below
commit a851168a350e300becb3452e91871220ffa3a5fc
Author: Rubik-W <[email protected]>
AuthorDate: Sat Mar 28 15:50:14 2020 +0800
fix：Optimize content returned by interface (#2294)
---
.../dolphinscheduler/api/service/ProcessInstanceService.java | 8 +-------
.../dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml | 4 +++-
.../apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml | 7 ++++++-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
index 57f839a..ab5580c 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
@@ -204,14 +204,8 @@ public class ProcessInstanceService extends BaseDAGService
{
}
}
- Set<String> exclusionSet = new HashSet<>();
- exclusionSet.add(Constants.CLASS);
- exclusionSet.add("locations");
- exclusionSet.add("connects");
- exclusionSet.add("processInstanceJson");
-
pageInfo.setTotalCount((int) processInstanceList.getTotal());
- pageInfo.setLists(CollectionUtils.getListByExclusion(processInstances,
exclusionSet));
+ pageInfo.setLists(processInstances);
result.put(Constants.DATA_LIST, pageInfo);
putMsg(result, Status.SUCCESS);
return result;
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
index c9086b9..0cabf80 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
@@ -29,7 +29,9 @@
and pd.name = #{processDefinitionName}
</select>
<select id="queryDefineListPaging"
resultType="org.apache.dolphinscheduler.dao.entity.ProcessDefinition">
- SELECT td.*,sc.schedule_release_state,tu.user_name
+ SELECT td.id, td.name, td.version, td.release_state, td.project_id,
td.user_id, td.description, td.global_params,
+ td.flag, td.receivers, td.receivers_cc, td.timeout,
td.tenant_id, td.modify_by, td.update_time, td.create_time,
+ sc.schedule_release_state, tu.user_name
FROM t_ds_process_definition td
left join (select process_definition_id,release_state as
schedule_release_state from t_ds_schedules group by
process_definition_id,release_state) sc on sc.process_definition_id = td.id
left join t_ds_user tu on td.user_id = tu.id
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
index 3559ca9..e5697d1 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
@@ -66,7 +66,12 @@
</select>
<select id="queryProcessInstanceListPaging"
resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
- select instance.*
+ select instance.id, instance.name, instance.process_definition_id,
instance.state, instance.recovery, instance.start_time,
+ instance.end_time, instance.run_times, instance.host,
instance.command_type, instance.command_param, instance.task_depend_type,
+ instance.max_try_times, instance.failure_strategy,
instance.warning_type, instance.warning_group_id, instance.schedule_time,
+ instance.command_start_time, instance.global_params,
instance.flag, instance.is_sub_process, instance.executor_id,
+ instance.history_cmd, instance.dependence_schedule_times,
instance.process_instance_priority, instance.worker_group_id,
+ instance.timeout, instance.tenant_id, instance.update_time
from t_ds_process_instance instance
join t_ds_process_definition define ON instance.process_definition_id
= define.id
where 1=1
