From ef25d6066606fd11fe6ae266c75440fce9578d19 Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Sat, 6 Apr 2024 13:28:14 +0200
Subject: [PATCH] (index) Add origin trace information for index readers

This used to be supported by the system but got lost in refactoring at some point.
---
 .../nu/marginalia/index/ReverseIndexEntrySource.java     | 7 +++++--
 .../java/nu/marginalia/index/ReverseIndexReader.java     | 9 ++++++---
 .../test/nu/marginalia/index/ReverseIndexReaderTest.java | 2 +-
 code/index/java/nu/marginalia/index/IndexFactory.java    | 4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexEntrySource.java b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexEntrySource.java
index 7c12563b..851bf9ab 100644
--- a/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexEntrySource.java
+++ b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexEntrySource.java
@@ -7,6 +7,7 @@ import nu.marginalia.index.query.EntrySource;
 import static java.lang.Math.min;
 
 public class ReverseIndexEntrySource implements EntrySource {
+    private final String name;
     private final BTreeReader reader;
 
     int pos;
@@ -15,9 +16,11 @@ public class ReverseIndexEntrySource implements EntrySource {
     final int entrySize;
     private final long wordId;
 
-    public ReverseIndexEntrySource(BTreeReader reader,
+    public ReverseIndexEntrySource(String name,
+                                   BTreeReader reader,
                                    int entrySize,
                                    long wordId) {
+        this.name = name;
         this.reader = reader;
         this.entrySize = entrySize;
         this.wordId = wordId;
@@ -60,6 +63,6 @@ public class ReverseIndexEntrySource implements EntrySource {
 
     @Override
     public String indexName() {
-        return "Full:" + Long.toHexString(wordId);
+        return name + ":" + Long.toHexString(wordId);
     }
 }
diff --git a/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexReader.java b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexReader.java
index f37420dd..e37de80d 100644
--- a/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexReader.java
+++ b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexReader.java
@@ -25,8 +25,11 @@ public class ReverseIndexReader {
     private final long wordsDataOffset;
     private final Logger logger = LoggerFactory.getLogger(getClass());
     private final BTreeReader wordsBTreeReader;
+    private final String name;
+
+    public ReverseIndexReader(String name, Path words, Path documents) throws IOException {
+        this.name = name;
 
-    public ReverseIndexReader(Path words, Path documents) throws IOException {
         if (!Files.exists(words) || !Files.exists(documents)) {
             this.words = null;
             this.documents = null;
@@ -84,7 +87,7 @@ public class ReverseIndexReader {
 
         if (offset < 0) return new EmptyEntrySource();
 
-        return new ReverseIndexEntrySource(createReaderNew(offset), 2, wordId);
+        return new ReverseIndexEntrySource(name, createReaderNew(offset), 2, wordId);
     }
 
     public QueryFilterStepIf also(long wordId) {
@@ -92,7 +95,7 @@ public class ReverseIndexReader {
 
         if (offset < 0) return new QueryFilterNoPass();
 
-        return new ReverseIndexRetainFilter(createReaderNew(offset), "full", wordId);
+        return new ReverseIndexRetainFilter(createReaderNew(offset), name, wordId);
     }
 
     public QueryFilterStepIf not(long wordId) {
diff --git a/code/index/index-reverse/test/nu/marginalia/index/ReverseIndexReaderTest.java b/code/index/index-reverse/test/nu/marginalia/index/ReverseIndexReaderTest.java
index e6b76249..ed8b4193 100644
--- a/code/index/index-reverse/test/nu/marginalia/index/ReverseIndexReaderTest.java
+++ b/code/index/index-reverse/test/nu/marginalia/index/ReverseIndexReaderTest.java
@@ -102,7 +102,7 @@ class ReverseIndexReaderTest {
         preindex.finalizeIndex(docsFile, wordsFile);
         preindex.delete();
 
-        return new ReverseIndexReader(wordsFile, docsFile);
+        return new ReverseIndexReader("test", wordsFile, docsFile);
 
     }
 }
\ No newline at end of file
diff --git a/code/index/java/nu/marginalia/index/IndexFactory.java b/code/index/java/nu/marginalia/index/IndexFactory.java
index 48911546..a1d2f5a5 100644
--- a/code/index/java/nu/marginalia/index/IndexFactory.java
+++ b/code/index/java/nu/marginalia/index/IndexFactory.java
@@ -41,14 +41,14 @@ public class IndexFactory {
 
     public ReverseIndexReader getReverseIndexReader() throws IOException {
 
-        return new ReverseIndexReader(
+        return new ReverseIndexReader("full",
                 ReverseIndexFullFileNames.resolve(liveStorage, ReverseIndexFullFileNames.FileIdentifier.WORDS, ReverseIndexFullFileNames.FileVersion.CURRENT),
                 ReverseIndexFullFileNames.resolve(liveStorage, ReverseIndexFullFileNames.FileIdentifier.DOCS, ReverseIndexFullFileNames.FileVersion.CURRENT)
         );
     }
 
     public ReverseIndexReader getReverseIndexPrioReader() throws IOException {
-        return new ReverseIndexReader(
+        return new ReverseIndexReader("prio",
                 ReverseIndexPrioFileNames.resolve(liveStorage, ReverseIndexPrioFileNames.FileIdentifier.WORDS, ReverseIndexPrioFileNames.FileVersion.CURRENT),
                 ReverseIndexPrioFileNames.resolve(liveStorage, ReverseIndexPrioFileNames.FileIdentifier.DOCS, ReverseIndexPrioFileNames.FileVersion.CURRENT)
         );