From 4cbfca8cea880be3f041ca62606ee0e2f32ff0b6 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 4 May 2022 11:44:15 +0300 Subject: [PATCH 1/2] analyse job fix for empty iterator --- .../peristence/v1/server/service/job/AutomaticAnalysisJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java index eeb92d83f..9cdb20c7d 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java @@ -47,7 +47,7 @@ public class AutomaticAnalysisJob implements Job { var queuedFiles = 0; - while (queuedFiles < (consumerCount * 5)) { + while (queuedFiles < (consumerCount * 5) && allStatusesIterator.hasNext()) { var next = allStatusesIterator.next(); // in case the file doesn't have numberOfPages set, we assume an average. From 2a91d00cea6d5938e2c75e84965d6472db7b7fc9 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 4 May 2022 12:13:29 +0300 Subject: [PATCH 2/2] RED-3800 sorting for order --- .../v1/server/service/job/AutomaticAnalysisJob.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java index 9cdb20c7d..ff3bd9347 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/job/AutomaticAnalysisJob.java @@ -12,6 +12,8 @@ import org.springframework.amqp.core.AmqpAdmin; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Collections; +import java.util.Comparator; import java.util.List; @Slf4j @@ -42,6 +44,9 @@ public class AutomaticAnalysisJob implements Job { if (redactionQueueInfo.getMessageCount() <= consumerCount) { // queue up 5 files var allStatuses = getAllRelevantStatuses(); + + allStatuses.sort(Collections.reverseOrder(Comparator.comparing(FileModel::getLastUpdated))); + var allStatusesIterator = allStatuses.iterator(); log.info("Files that require reanalysis: {}", allStatuses.size());