From 5b8e71c08382a4ae6a0ad83e3256fa6b930112d0 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Sat, 26 Nov 2022 13:09:18 +0100 Subject: [PATCH] Don't automatically retry failures, and consider never-expiring results to always remain valid --- .../postgresql/queries/get-task-stream.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/database-backends/postgresql/queries/get-task-stream.js b/src/database-backends/postgresql/queries/get-task-stream.js index f6748a0..9eca1fa 100644 --- a/src/database-backends/postgresql/queries/get-task-stream.js +++ b/src/database-backends/postgresql/queries/get-task-stream.js @@ -34,7 +34,10 @@ function makeFillQuery(withDependencies) { WHERE results.is_successful = TRUE AND results.is_invalidated = FALSE - AND results.expires_at > NOW() + AND ( + results.expires_at > NOW() + OR results.expires_at IS NULL + ) ), counts AS ( SELECT item_id, COUNT(task) AS count FROM satisfied GROUP BY item_id @@ -68,9 +71,17 @@ function makeFillQuery(withDependencies) { item_id = full_candidates.item_id AND results.task = :task AND results.task_version = :taskVersion - AND results.is_successful = TRUE - AND results.is_invalidated = FALSE - AND results.expires_at > NOW() + AND ( + results.is_successful = FALSE + OR ( + results.is_successful = TRUE + AND results.is_invalidated = FALSE + AND ( + results.expires_at > NOW() + OR results.expires_at IS NULL + ) + ) + ) ) `; }