From 613090828545c559fd970f9aafe7c67790067fa7 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Sat, 4 Mar 2023 16:00:17 +0100 Subject: [PATCH] Automatic conversion at start-up given correct conditions --- .../src/main/java/nu/marginalia/index/IndexService.java | 8 +++++++- .../java/nu/marginalia/index/IndexServicesFactory.java | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java b/services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java index 4b4476e9..8d4a7984 100644 --- a/services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java +++ b/services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java @@ -86,12 +86,18 @@ public class IndexService extends Service { } private void autoConvert() { - if (!servicesFactory.isConvertedIndexMissing() || !servicesFactory.isPreconvertedIndexPresent()) { + if (!servicesFactory.isConvertedIndexMissing() + || !servicesFactory.isPreconvertedIndexPresent() + || Boolean.getBoolean("no-auto-convert") + ) { return; } + try { + logger.info("Auto-converting"); searchSetsService.recalculateAll(); searchIndex.switchIndex(); + logger.info("Auto-conversion finished!"); } catch (IOException ex) { logger.error("Auto convert failed", ex); diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/IndexServicesFactory.java b/services-core/index-service/src/main/java/nu/marginalia/index/IndexServicesFactory.java index 7aa91750..3557bed2 100644 --- a/services-core/index-service/src/main/java/nu/marginalia/index/IndexServicesFactory.java +++ b/services-core/index-service/src/main/java/nu/marginalia/index/IndexServicesFactory.java @@ -42,9 +42,8 @@ public class IndexServicesFactory { private final Path searchSetsBase; - int LIVE_PART = 0; - - int NEXT_PART = 1; + final int LIVE_PART = 0; + final int NEXT_PART = 1; @Inject public IndexServicesFactory( @@ -100,7 +99,6 @@ public class IndexServicesFactory { } private void convertFullReverseIndex(DomainRankings domainRankings) throws IOException { - var source = writerIndexFile.get(0).toPath(); logger.info("Converting full reverse index {}", source);