From 98bd99748248320561920b0adca900109009df9c Mon Sep 17 00:00:00 2001 From: ymolodkov Date: Fri, 10 Jan 2025 19:19:27 +0100 Subject: [PATCH] Wrong type for the analysis_state_journal.error --- .../odysseusinc/arachne/datanode/service/AnalysisService.java | 2 +- .../db/migration/V20241210000005__change_error_to_varchar.sql | 2 ++ .../db/migration/V20241210000006__update_stage_and_error.sql | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 datanode/src/main/resources/db/migration/V20241210000005__change_error_to_varchar.sql create mode 100644 datanode/src/main/resources/db/migration/V20241210000006__update_stage_and_error.sql diff --git a/datanode/src/main/java/com/odysseusinc/arachne/datanode/service/AnalysisService.java b/datanode/src/main/java/com/odysseusinc/arachne/datanode/service/AnalysisService.java index e1d1d8f2..20dcfb65 100644 --- a/datanode/src/main/java/com/odysseusinc/arachne/datanode/service/AnalysisService.java +++ b/datanode/src/main/java/com/odysseusinc/arachne/datanode/service/AnalysisService.java @@ -220,7 +220,7 @@ public List getIncompleteIds() { Join state = root.join(Analysis_.currentState, JoinType.LEFT); javax.persistence.criteria.Path stage = state.get(AnalysisStateEntry_.stage); return q.where( - cb.isNull(root.get(Analysis_.error)), + cb.isNull(state.get(AnalysisStateEntry_.error)), cb.or(stage.isNull(), stage.in(Stage.EXECUTE, Stage.INITIALIZE, Stage.ABORT)) ); }).getResultStream().map(Analysis::getId).collect(Collectors.toList()); diff --git a/datanode/src/main/resources/db/migration/V20241210000005__change_error_to_varchar.sql b/datanode/src/main/resources/db/migration/V20241210000005__change_error_to_varchar.sql new file mode 100644 index 00000000..23b63ceb --- /dev/null +++ b/datanode/src/main/resources/db/migration/V20241210000005__change_error_to_varchar.sql @@ -0,0 +1,2 @@ +ALTER TABLE analysis_state_journal + ALTER COLUMN error TYPE VARCHAR; diff --git a/datanode/src/main/resources/db/migration/V20241210000006__update_stage_and_error.sql b/datanode/src/main/resources/db/migration/V20241210000006__update_stage_and_error.sql new file mode 100644 index 00000000..478e7b9c --- /dev/null +++ b/datanode/src/main/resources/db/migration/V20241210000006__update_stage_and_error.sql @@ -0,0 +1,4 @@ +UPDATE analysis_state_journal SET + stage = analyses.stage, + error = analyses.error +FROM analyses WHERE analyses.current_state_id = analysis_state_journal.id;