Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 21:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(slop-models) Fix incorrect column grouping leading to errors in converter

Browse Source
This commit is contained in:
Viktor Lofgren 2024-07-29 10:34:33 +02:00
parent afe56c7cf1
commit 2d5d965f7f
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexConverter.java
View File

@ -89,8 +89,9 @@ public class ForwardIndexConverter {
var metaReader = instance.openDocumentMeta(slopTable); var metaReader = instance.openDocumentMeta(slopTable);
var featuresReader = instance.openFeatures(slopTable); var featuresReader = instance.openFeatures(slopTable);
var sizeReader = instance.openSize(slopTable); var sizeReader = instance.openSize(slopTable);
var spansCodesReader = instance.openSpanCodes(slopTable); var spansCodesReader = instance.openSpanCodes(slopTable);
var spansSeqReader = instance.openSpans(slopTable); var spansSeqReader = instance.openSpans(slopTable.columnGroup("spans"));
while (docIdReader.hasRemaining()) { while (docIdReader.hasRemaining()) {
long docId = docIdReader.get(); long docId = docIdReader.get();

2
code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalPage.java
View File

@ -69,7 +69,7 @@ public record IndexJournalPage(Path baseDir, int page) {
} }
public GammaCodedSequenceReader openSpans(SlopTable table) throws IOException { 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 { public ByteArrayColumnReader openSpanCodes(SlopTable table) throws IOException {

2
code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalSlopWriter.java
View File

@ -52,7 +52,7 @@ public class IndexJournalSlopWriter extends SlopTable {
termMetadataWriter = IndexJournalPage.termMeta.forPage(page).create(this.columnGroup("keywords"), dir); termMetadataWriter = IndexJournalPage.termMeta.forPage(page).create(this.columnGroup("keywords"), dir);
termPositionsWriter = IndexJournalPage.positions.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); spanCodesWriter = IndexJournalPage.spanCodes.forPage(page).create(this.columnGroup("spans"), dir);
} }

2
code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDocumentRecord.java
View File

@ -301,7 +301,7 @@ public record SlopDocumentRecord(
termMetaWriter = termMetaColumn.forPage(page).create(this.columnGroup("keywords"), baseDir); termMetaWriter = termMetaColumn.forPage(page).create(this.columnGroup("keywords"), baseDir);
termPositionsWriter = termPositionsColumn.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); spansCodesWriter = spanCodesColumn.forPage(page).create(this.columnGroup("spans"), baseDir);
} }

2
code/processes/converting-process/model/java/nu/marginalia/model/processed/SlopDomainRecord.java
View File

@ -176,7 +176,7 @@ public record SlopDomainRecord(
visitedUrlsWriter = visitedUrlsColumn.forPage(page).create(this, baseDir); visitedUrlsWriter = visitedUrlsColumn.forPage(page).create(this, baseDir);
rssFeedsCountWriter = rssFeedsCountColumn.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 { public void write(SlopDomainRecord record) throws IOException {