From dcc5cfb7c034fc1d5183af7d49da901c8a4e549b Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Thu, 15 Feb 2024 10:51:49 +0100 Subject: [PATCH] (index-journal) Improve documentation and code quality --- code/features-index/index-journal/readme.md | 17 ++++++++++++----- .../journal/model/IndexJournalFileHeader.java | 4 ---- .../journal/model/IndexJournalStatistics.java | 3 --- .../index/journal/IndexJournalFileNames.java | 2 +- .../index}/journal/model/IndexJournalEntry.java | 8 ++++++++ .../journal/model/IndexJournalEntryBuilder.java | 0 .../journal/model/IndexJournalEntryData.java | 17 ++++++++++++++--- .../journal/model/IndexJournalEntryHeader.java | 15 +++++++++++++++ .../journal/model/IndexJournalFileHeader.java | 10 ++++++++++ .../journal/reader/IndexJournalReadEntry.java | 1 - .../journal/reader/IndexJournalReader.java | 10 ++++++++-- .../reader/IndexJournalReaderPagingImpl.java | 2 +- .../reader/IndexJournalReaderSingleFile.java | 2 +- .../journal/writer/IndexJournalWriter.java | 0 .../writer/IndexJournalWriterPagingImpl.java | 2 +- .../IndexJournalWriterSingleFileImpl.java | 2 +- .../construction/ReverseIndexConstructor.java | 2 +- .../ReversePreindexWordSegments.java | 3 --- .../index/ReverseIndexReaderTest.java | 1 - .../loading/LoaderIndexJournalWriter.java | 2 +- .../loader/LoaderIndexJournalWriterTest.java | 2 +- .../java/nu/marginalia/svc/BackupService.java | 2 +- .../IndexQueryServiceIntegrationSmokeTest.java | 1 - .../svc/IndexQueryServiceIntegrationTest.java | 1 - .../IndexQueryServiceIntegrationTestModule.java | 1 - 25 files changed, 76 insertions(+), 34 deletions(-) delete mode 100644 code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalFileHeader.java delete mode 100644 code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalStatistics.java rename code/features-index/index-journal/src/main/java/nu/{marginallia => marginalia}/index/journal/IndexJournalFileNames.java (95%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/model/IndexJournalEntry.java (72%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/model/IndexJournalEntryBuilder.java (100%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/model/IndexJournalEntryData.java (78%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/model/IndexJournalEntryHeader.java (51%) create mode 100644 code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalFileHeader.java rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/reader/IndexJournalReadEntry.java (98%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/reader/IndexJournalReader.java (82%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/reader/IndexJournalReaderPagingImpl.java (95%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/reader/IndexJournalReaderSingleFile.java (98%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/writer/IndexJournalWriter.java (100%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/writer/IndexJournalWriterPagingImpl.java (97%) rename code/features-index/index-journal/src/main/java/{nu.marginalia.index => nu/marginalia/index}/journal/writer/IndexJournalWriterSingleFileImpl.java (98%) diff --git a/code/features-index/index-journal/readme.md b/code/features-index/index-journal/readme.md index d009b469..24ed9c43 100644 --- a/code/features-index/index-journal/readme.md +++ b/code/features-index/index-journal/readme.md @@ -6,12 +6,19 @@ This journal is written by [processes/loading-process](../../processes/loading-p when constructing the [forward](../index-forward) and [reverse](../index-reverse) indices. +The journal format is a file header, followed by a zstd-compressed list of entries, +each containing a header with document-level data, and a data section +with keyword-level data. + +The journal data may be split into multiple files, and the journal writers and readers +are designed to handle this transparently via their *Paging* implementation. + ## Central Classes ### Model -* [IndexJournalEntry](src/main/java/nu.marginalia.index/journal/model/IndexJournalEntry.java) -* [IndexJournalEntryHeader](src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryHeader.java) -* [IndexJournalEntryData](src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryData.java) +* [IndexJournalEntry](src/main/java/nu/marginalia/index/journal/model/IndexJournalEntry.java) +* [IndexJournalEntryHeader](src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryHeader.java) +* [IndexJournalEntryData](src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryData.java) ### I/O -* [IndexJournalReader](src/main/java/nu.marginalia.index/journal/reader/IndexJournalReader.java) -* [IndexJournalWriter](src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriter.java) \ No newline at end of file +* [IndexJournalReader](src/main/java/nu/marginalia/index/journal/reader/IndexJournalReader.java) +* [IndexJournalWriter](src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriter.java) \ No newline at end of file diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalFileHeader.java b/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalFileHeader.java deleted file mode 100644 index 42ae60b4..00000000 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalFileHeader.java +++ /dev/null @@ -1,4 +0,0 @@ -package nu.marginalia.index.journal.model; - -public record IndexJournalFileHeader(long fileSize, long wordCount) { -} diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalStatistics.java b/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalStatistics.java deleted file mode 100644 index 9eb28473..00000000 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalStatistics.java +++ /dev/null @@ -1,3 +0,0 @@ -package nu.marginalia.index.journal.model; - -public record IndexJournalStatistics(int highestWord, int documentCardinality) { } diff --git a/code/features-index/index-journal/src/main/java/nu/marginallia/index/journal/IndexJournalFileNames.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/IndexJournalFileNames.java similarity index 95% rename from code/features-index/index-journal/src/main/java/nu/marginallia/index/journal/IndexJournalFileNames.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/IndexJournalFileNames.java index 433cbe2e..8702be34 100644 --- a/code/features-index/index-journal/src/main/java/nu/marginallia/index/journal/IndexJournalFileNames.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/IndexJournalFileNames.java @@ -1,4 +1,4 @@ -package nu.marginallia.index.journal; +package nu.marginalia.index.journal; import java.io.IOException; import java.nio.file.Files; diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntry.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntry.java similarity index 72% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntry.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntry.java index 2239fc8a..7d4944ac 100644 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntry.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntry.java @@ -2,6 +2,14 @@ package nu.marginalia.index.journal.model; import nu.marginalia.model.id.UrlIdCodec; +/** An entry in the index journal. + * + * @param header the header of the entry, containing document level data + * @param data the data of the entry, containing keyword level data + * + * @see IndexJournalEntryHeader + * @see IndexJournalEntryData + */ public record IndexJournalEntry(IndexJournalEntryHeader header, IndexJournalEntryData data) { public static IndexJournalEntryBuilder builder(long documentId, long documentMeta) { diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryBuilder.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryBuilder.java similarity index 100% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryBuilder.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryBuilder.java diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryData.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryData.java similarity index 78% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryData.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryData.java index dcf49149..26c10c2a 100644 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryData.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryData.java @@ -1,11 +1,22 @@ package nu.marginalia.index.journal.model; -import java.io.DataOutputStream; -import java.io.IOException; -import java.nio.ByteBuffer; +import nu.marginalia.index.journal.reader.IndexJournalReader; +import nu.marginalia.model.idx.WordMetadata; + import java.util.Arrays; import java.util.Iterator; +/** The keyword data of an index journal entry. + * The data itself is an interleaved array of + * word ids and metadata. + *

+ * Odd entries are term ids, even entries are encoded WordMetadata records. + *

+ *

The civilized way of reading the journal data is to use an IndexJournalReader

+ * + * @see WordMetadata + * @see IndexJournalReader + */ public class IndexJournalEntryData implements Iterable { private final int size; public final long[] underlyingArray; diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryHeader.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryHeader.java similarity index 51% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryHeader.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryHeader.java index e19fc229..b0f3d41e 100644 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryHeader.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryHeader.java @@ -1,5 +1,20 @@ package nu.marginalia.index.journal.model; +import nu.marginalia.model.crawl.HtmlFeature; +import nu.marginalia.model.id.UrlIdCodec; +import nu.marginalia.model.idx.DocumentMetadata; + +/** The header of an index journal entry. + * + * @param entrySize the size of the entry + * @param documentFeatures the features of the document, as an encoded HtmlFeature + * @param combinedId the combined document id, encoded with UrlIdCodec + * @param documentMeta the metadata of the document, as an encoded DocumentMetadata + * + * @see DocumentMetadata + * @see HtmlFeature + * @see UrlIdCodec + */ public record IndexJournalEntryHeader(int entrySize, int documentFeatures, long combinedId, diff --git a/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalFileHeader.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalFileHeader.java new file mode 100644 index 00000000..7a4ca7e0 --- /dev/null +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalFileHeader.java @@ -0,0 +1,10 @@ +package nu.marginalia.index.journal.model; + +/** The header of an index journal file. This is the first 16 bytes of the file, + * and is not compressed. + * + * @param fileSizeRecords the size of the file in number of records + * @param reserved should be 0 + */ +public record IndexJournalFileHeader(long fileSizeRecords, long reserved) { +} diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReadEntry.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReadEntry.java similarity index 98% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReadEntry.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReadEntry.java index 41c970ab..625267d1 100644 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReadEntry.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReadEntry.java @@ -8,7 +8,6 @@ import java.io.DataInputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.LongBuffer; -import java.util.Arrays; public class IndexJournalReadEntry { public final IndexJournalEntryHeader header; diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReader.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReader.java similarity index 82% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReader.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReader.java index e1a8cff6..14e686b3 100644 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReader.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReader.java @@ -1,21 +1,23 @@ package nu.marginalia.index.journal.reader; import nu.marginalia.index.journal.reader.pointer.IndexJournalPointer; -import nu.marginalia.model.idx.WordFlags; import java.io.IOException; import java.nio.file.Path; import java.util.function.LongConsumer; import java.util.function.LongPredicate; +/** Tools for reading the index journal. */ public interface IndexJournalReader { int FILE_HEADER_SIZE_LONGS = 2; int FILE_HEADER_SIZE_BYTES = 8 * FILE_HEADER_SIZE_LONGS; + /** Create a reader for a single file. */ static IndexJournalReader singleFile(Path fileName) throws IOException { return new IndexJournalReaderSingleFile(fileName); } + /** Create a reader for a set of files. */ static IndexJournalReader paging(Path baseDir) throws IOException { return new IndexJournalReaderPagingImpl(baseDir); } @@ -36,9 +38,13 @@ public interface IndexJournalReader { } } + /** Create a new pointer to the journal. The IndexJournalPointer is + * a two-tiered iterator that allows both iteration over document records + * and their keywords + */ IndexJournalPointer newPointer(); - + /** Reader that filters the entries based on the term metadata. */ default IndexJournalReader filtering(LongPredicate termMetaFilter) { return new FilteringIndexJournalReader(this, termMetaFilter); } diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderPagingImpl.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderPagingImpl.java similarity index 95% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderPagingImpl.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderPagingImpl.java index d86931a1..d5ba23b8 100644 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderPagingImpl.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderPagingImpl.java @@ -1,7 +1,7 @@ package nu.marginalia.index.journal.reader; import nu.marginalia.index.journal.reader.pointer.IndexJournalPointer; -import nu.marginallia.index.journal.IndexJournalFileNames; +import nu.marginalia.index.journal.IndexJournalFileNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderSingleFile.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderSingleFile.java similarity index 98% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderSingleFile.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderSingleFile.java index 378ab826..a131a788 100644 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderSingleFile.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderSingleFile.java @@ -76,7 +76,7 @@ class SingleFileJournalPointer implements IndexJournalPointer { recordIdx = -2; entryData = null; - if (++docIdx < fileHeader.fileSize()) { + if (++docIdx < fileHeader.fileSizeRecords()) { entry = IndexJournalReadEntry.read(dataInputStream); return true; } diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriter.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriter.java similarity index 100% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriter.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriter.java diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterPagingImpl.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterPagingImpl.java similarity index 97% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterPagingImpl.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterPagingImpl.java index 68d8f139..81d9de1e 100644 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterPagingImpl.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterPagingImpl.java @@ -3,7 +3,7 @@ package nu.marginalia.index.journal.writer; import lombok.SneakyThrows; import nu.marginalia.index.journal.model.IndexJournalEntryData; import nu.marginalia.index.journal.model.IndexJournalEntryHeader; -import nu.marginallia.index.journal.IndexJournalFileNames; +import nu.marginalia.index.journal.IndexJournalFileNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterSingleFileImpl.java b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterSingleFileImpl.java similarity index 98% rename from code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterSingleFileImpl.java rename to code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterSingleFileImpl.java index fd4062fc..beadb30a 100644 --- a/code/features-index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterSingleFileImpl.java +++ b/code/features-index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterSingleFileImpl.java @@ -123,7 +123,7 @@ public class IndexJournalWriterSingleFileImpl implements IndexJournalWriter{ // Finalize the file by writing a header in the beginning ByteBuffer header = ByteBuffer.allocate(16); header.putLong(numEntries); - header.putLong(0); + header.putLong(0); // reserved for future use header.flip(); while (header.position() < header.limit()) { diff --git a/code/features-index/index-reverse/src/main/java/nu/marginalia/index/construction/ReverseIndexConstructor.java b/code/features-index/index-reverse/src/main/java/nu/marginalia/index/construction/ReverseIndexConstructor.java index 8537ac0e..7a925679 100644 --- a/code/features-index/index-reverse/src/main/java/nu/marginalia/index/construction/ReverseIndexConstructor.java +++ b/code/features-index/index-reverse/src/main/java/nu/marginalia/index/construction/ReverseIndexConstructor.java @@ -2,7 +2,7 @@ package nu.marginalia.index.construction; import lombok.SneakyThrows; import nu.marginalia.process.control.ProcessHeartbeat; -import nu.marginallia.index.journal.IndexJournalFileNames; +import nu.marginalia.index.journal.IndexJournalFileNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/code/features-index/index-reverse/src/main/java/nu/marginalia/index/construction/ReversePreindexWordSegments.java b/code/features-index/index-reverse/src/main/java/nu/marginalia/index/construction/ReversePreindexWordSegments.java index 66bf68a6..bcfe486e 100644 --- a/code/features-index/index-reverse/src/main/java/nu/marginalia/index/construction/ReversePreindexWordSegments.java +++ b/code/features-index/index-reverse/src/main/java/nu/marginalia/index/construction/ReversePreindexWordSegments.java @@ -5,14 +5,11 @@ import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap; import it.unimi.dsi.fastutil.longs.LongIterator; import nu.marginalia.array.LongArray; import nu.marginalia.array.LongArrayFactory; -import nu.marginalia.array.algo.SortingContext; import nu.marginalia.index.journal.reader.IndexJournalReader; import java.io.IOException; -import java.nio.channels.FileChannel; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.StandardOpenOption; /** A pair of file-backed arrays of sorted wordIds * and the count of documents associated with each wordId. diff --git a/code/features-index/index-reverse/src/test/java/nu/marginalia/index/ReverseIndexReaderTest.java b/code/features-index/index-reverse/src/test/java/nu/marginalia/index/ReverseIndexReaderTest.java index e05fdf78..e6b76249 100644 --- a/code/features-index/index-reverse/src/test/java/nu/marginalia/index/ReverseIndexReaderTest.java +++ b/code/features-index/index-reverse/src/test/java/nu/marginalia/index/ReverseIndexReaderTest.java @@ -6,7 +6,6 @@ import nu.marginalia.index.construction.DocIdRewriter; import nu.marginalia.index.construction.ReversePreindex; import nu.marginalia.index.construction.TestJournalFactory; import nu.marginalia.index.construction.TestJournalFactory.EntryDataWithWordMeta; -import nu.marginalia.index.journal.reader.IndexJournalReader; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderIndexJournalWriter.java b/code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderIndexJournalWriter.java index ea821f94..2dee50fa 100644 --- a/code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderIndexJournalWriter.java +++ b/code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderIndexJournalWriter.java @@ -12,7 +12,7 @@ import nu.marginalia.index.journal.writer.IndexJournalWriterPagingImpl; import nu.marginalia.index.journal.writer.IndexJournalWriter; import nu.marginalia.keyword.model.DocumentKeywords; import nu.marginalia.model.idx.DocumentMetadata; -import nu.marginallia.index.journal.IndexJournalFileNames; +import nu.marginalia.index.journal.IndexJournalFileNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/code/processes/loading-process/src/test/java/nu/marginalia/loading/loader/LoaderIndexJournalWriterTest.java b/code/processes/loading-process/src/test/java/nu/marginalia/loading/loader/LoaderIndexJournalWriterTest.java index 0a45487e..568981c6 100644 --- a/code/processes/loading-process/src/test/java/nu/marginalia/loading/loader/LoaderIndexJournalWriterTest.java +++ b/code/processes/loading-process/src/test/java/nu/marginalia/loading/loader/LoaderIndexJournalWriterTest.java @@ -7,7 +7,7 @@ import nu.marginalia.index.journal.reader.IndexJournalReaderSingleFile; import nu.marginalia.keyword.model.DocumentKeywords; import nu.marginalia.loading.LoaderIndexJournalWriter; import nu.marginalia.model.idx.DocumentMetadata; -import nu.marginallia.index.journal.IndexJournalFileNames; +import nu.marginalia.index.journal.IndexJournalFileNames; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/code/services-core/executor-service/src/main/java/nu/marginalia/svc/BackupService.java b/code/services-core/executor-service/src/main/java/nu/marginalia/svc/BackupService.java index ec0f561b..46578348 100644 --- a/code/services-core/executor-service/src/main/java/nu/marginalia/svc/BackupService.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/svc/BackupService.java @@ -7,7 +7,7 @@ import nu.marginalia.service.control.ServiceHeartbeat; import nu.marginalia.storage.FileStorageService; import nu.marginalia.storage.model.FileStorageId; import nu.marginalia.storage.model.FileStorageType; -import nu.marginallia.index.journal.IndexJournalFileNames; +import nu.marginalia.index.journal.IndexJournalFileNames; import org.apache.commons.io.IOUtils; import com.google.inject.Inject; diff --git a/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationSmokeTest.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationSmokeTest.java index c9a07e60..68e3437f 100644 --- a/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationSmokeTest.java +++ b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationSmokeTest.java @@ -10,7 +10,6 @@ import nu.marginalia.index.ReverseIndexFullFileNames; import nu.marginalia.index.ReverseIndexPrioFileNames; import nu.marginalia.index.client.model.query.SearchSpecification; import nu.marginalia.index.client.model.query.SearchSubquery; -import nu.marginalia.index.client.model.query.SearchSetIdentifier; import nu.marginalia.index.client.model.results.ResultRankingParameters; import nu.marginalia.index.construction.DocIdRewriter; import nu.marginalia.index.construction.ReverseIndexConstructor; diff --git a/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTest.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTest.java index 55fea27f..845b643b 100644 --- a/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTest.java +++ b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTest.java @@ -7,7 +7,6 @@ import nu.marginalia.storage.FileStorageService; import nu.marginalia.hash.MurmurHash3_128; import nu.marginalia.index.ReverseIndexFullFileNames; import nu.marginalia.index.ReverseIndexPrioFileNames; -import nu.marginalia.index.client.model.query.SearchSetIdentifier; import nu.marginalia.index.client.model.query.SearchSpecification; import nu.marginalia.index.client.model.query.SearchSubquery; import nu.marginalia.index.client.model.results.ResultRankingParameters; diff --git a/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java index 5089bd5f..a7f67bbe 100644 --- a/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java +++ b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java @@ -13,7 +13,6 @@ import nu.marginalia.process.control.ProcessHeartbeat; import nu.marginalia.ranking.DomainRankings; import nu.marginalia.index.svc.searchset.SearchSetAny; import nu.marginalia.index.util.TestUtil; -import nu.marginalia.index.client.model.query.SearchSetIdentifier; import nu.marginalia.service.control.*; import nu.marginalia.service.id.ServiceId; import nu.marginalia.service.module.ServiceConfiguration;