diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java index f94b6112..3ab53831 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java @@ -61,11 +61,13 @@ public class EntityRedactionService { Dictionary dictionary = dictionaryService.getDeepCopyDictionary(ruleSetId); long current = System.currentTimeMillis() - startTime; + long untilNow = current; log.info("Preparing took: {}.", current); Set documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null)); - current = System.currentTimeMillis() - startTime - current; + current = System.currentTimeMillis() - startTime - untilNow; + untilNow = untilNow + current; log.info("Finding entries took: {}.", current); if (dictionary.hasLocalEntries()) { @@ -82,7 +84,8 @@ public class EntityRedactionService { EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary); EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities); - current = System.currentTimeMillis() - startTime - current; + current = System.currentTimeMillis() - startTime - untilNow; + untilNow = untilNow + current; log.info("Adding local dictionary annotations took: {}.", current); } @@ -102,7 +105,8 @@ public class EntityRedactionService { } } - current = System.currentTimeMillis() - startTime - current; + current = System.currentTimeMillis() - startTime - untilNow; + untilNow = untilNow + current; log.info("Adding entity position sequence took: {}.", current); dictionaryService.updateExternalDictionary(dictionary, ruleSetId); @@ -110,7 +114,7 @@ public class EntityRedactionService { classifiedDoc.setDictionaryVersion(dictionary.getVersion()); classifiedDoc.setRulesVersion(rulesVersion); - current = System.currentTimeMillis() - startTime - current; + current = System.currentTimeMillis() - startTime - untilNow; log.info("Adjusting rules set took: {}.", current); log.info("Finishing document processing took: {}.", System.currentTimeMillis() - startTime); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java index 97d3d511..6645a00d 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java @@ -64,20 +64,22 @@ public class RedactionLogCreatorService { } long current = System.currentTimeMillis() - startTime; + long untilNow = current; log.info("Adding entries took: {}.", current); if (manualRedactionPages.contains(page)) { addManualEntries(classifiedDoc, manualRedactions, page, ruleSetId); } - current = System.currentTimeMillis() - startTime - current; + current = System.currentTimeMillis() - startTime - untilNow; + untilNow = untilNow + current; log.info("Adding manual entries took: {}.", current); if (!classifiedDoc.getPages().get(page - 1).getImageBounds().isEmpty()) { addImageEntries(classifiedDoc, page, ruleSetId); } - current = System.currentTimeMillis() - startTime - current; + current = System.currentTimeMillis() - startTime - untilNow; log.info("Adding image entries took: {}.", current); }