diff --git a/code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexConverter.java b/code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexConverter.java index 29081322..2f969ad8 100644 --- a/code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexConverter.java +++ b/code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexConverter.java @@ -89,8 +89,9 @@ public class ForwardIndexConverter { var metaReader = instance.openDocumentMeta(slopTable); var featuresReader = instance.openFeatures(slopTable); var sizeReader = instance.openSize(slopTable); + var spansCodesReader = instance.openSpanCodes(slopTable); - var spansSeqReader = instance.openSpans(slopTable); + var spansSeqReader = instance.openSpans(slopTable.columnGroup("spans")); while (docIdReader.hasRemaining()) { long docId = docIdReader.get(); diff --git a/code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalPage.java b/code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalPage.java index 8806fa61..2a7f4f60 100644 --- a/code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalPage.java +++ b/code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalPage.java @@ -69,7 +69,7 @@ public record IndexJournalPage(Path baseDir, int page) { } public GammaCodedSequenceReader openSpans(SlopTable table) throws IOException { - return spans.forPage(page).open(table.columnGroup("spans"), baseDir); + return spans.forPage(page).open(table, baseDir); } public ByteArrayColumnReader openSpanCodes(SlopTable table) throws IOException { diff --git a/code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalSlopWriter.java b/code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalSlopWriter.java index 258bc61c..e429cbc0 100644 --- a/code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalSlopWriter.java +++ b/code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalSlopWriter.java @@ -52,7 +52,7 @@ public class IndexJournalSlopWriter extends SlopTable { termMetadataWriter = IndexJournalPage.termMeta.forPage(page).create(this.columnGroup("keywords"), dir); termPositionsWriter = IndexJournalPage.positions.forPage(page).create(this.columnGroup("keywords"), dir); - spansWriter = IndexJournalPage.spans.forPage(page).create(this.columnGroup("spans"), dir); + spansWriter = IndexJournalPage.spans.forPage(page).create(this, dir); spanCodesWriter = IndexJournalPage.spanCodes.forPage(page).create(this.columnGroup("spans"), dir); } diff --git a/code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDocumentRecord.java b/code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDocumentRecord.java index 05b06898..f33441b9 100644 --- a/code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDocumentRecord.java +++ b/code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDocumentRecord.java @@ -301,7 +301,7 @@ public record SlopDocumentRecord( termMetaWriter = termMetaColumn.forPage(page).create(this.columnGroup("keywords"), baseDir); termPositionsWriter = termPositionsColumn.forPage(page).create(this.columnGroup("keywords"), baseDir); - spansWriter = spansColumn.forPage(page).create(this.columnGroup("spans"), baseDir); + spansWriter = spansColumn.forPage(page).create(this, baseDir); spansCodesWriter = spanCodesColumn.forPage(page).create(this.columnGroup("spans"), baseDir); } diff --git a/code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDomainRecord.java b/code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDomainRecord.java index be595a4d..2d8260e6 100644 --- a/code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDomainRecord.java +++ b/code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDomainRecord.java @@ -176,7 +176,7 @@ public record SlopDomainRecord( visitedUrlsWriter = visitedUrlsColumn.forPage(page).create(this, baseDir); rssFeedsCountWriter = rssFeedsCountColumn.forPage(page).create(this, baseDir); - rssFeedsWriter = rssFeedsColumn.forPage(page).create(this.columnGroup("rss-feeds"), baseDir); + rssFeedsWriter = rssFeedsColumn.forPage(page).create(this.columnGroup("rssFeeds"), baseDir); } public void write(SlopDomainRecord record) throws IOException {