From 5027ce806c1aff651c28a4f4418cf0c2677541c3 Mon Sep 17 00:00:00 2001 From: Tobias Soloschenko Date: Mon, 24 Jul 2023 09:57:39 +0200 Subject: [PATCH 1/2] fix: possible out of memory error --- .../repository/JdbcDataflowTaskExecutionMetadataDao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowTaskExecutionMetadataDao.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowTaskExecutionMetadataDao.java index 878875c93d..446a05e82c 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowTaskExecutionMetadataDao.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowTaskExecutionMetadataDao.java @@ -61,9 +61,9 @@ public class JdbcDataflowTaskExecutionMetadataDao implements DataflowTaskExecuti "task_execution_manifest) VALUES (:id, :taskExecutionId, :taskExecutionManifest)"; private static final String FIND_MANIFEST_BY_TASK_EXECUTION_ID = "select m.task_execution_manifest as task_execution_manifest " + - "from task_execution_metadata m inner join " + - "TASK_EXECUTION e on m.task_execution_id = e.TASK_EXECUTION_ID " + - "where e.TASK_EXECUTION_ID = :taskExecutionId"; + "from task_execution_metadata m, TASK_EXECUTION e " + + "where m.task_execution_id = e.TASK_EXECUTION_ID " + + "and e.TASK_EXECUTION_ID = :taskExecutionId"; private static final String DELETE_MANIFEST_BY_TASK_EXECUTION_IDS = "DELETE FROM task_execution_metadata " + From ea0bb9df4287e4556a3b57bbf6d7d3034566a759 Mon Sep 17 00:00:00 2001 From: Tobias Soloschenko Date: Mon, 24 Jul 2023 11:35:12 +0200 Subject: [PATCH 2/2] fix: improve step exec id sql --- .../server/repository/JdbcDataflowJobExecutionDao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowJobExecutionDao.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowJobExecutionDao.java index 4aecb3b514..afe716d761 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowJobExecutionDao.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowJobExecutionDao.java @@ -50,9 +50,9 @@ public class JdbcDataflowJobExecutionDao implements DataflowJobExecutionDao { */ private static final String SELECT_STEP_EXECUTION_IDS = "SELECT SEC.STEP_EXECUTION_ID AS STEP_EXECUTION_ID " + - "FROM %PREFIX%STEP_EXECUTION_CONTEXT SEC " + - "JOIN %PREFIX%STEP_EXECUTION SE ON SE.STEP_EXECUTION_ID = SEC.STEP_EXECUTION_ID " + - "WHERE SE.JOB_EXECUTION_ID in (:jobExecutionIds)"; + "FROM %PREFIX%STEP_EXECUTION_CONTEXT SEC, %PREFIX%STEP_EXECUTION SE " + + "WHERE SE.JOB_EXECUTION_ID in (:jobExecutionIds) " + + "AND SE.STEP_EXECUTION_ID = SEC.STEP_EXECUTION_ID"; /** * SQL statements for removing the Step Execution Context.