From 8c0ce4fc1dee34f91f3f159920d2b439e6157ee0 Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Fri, 1 Sep 2023 11:32:24 +0200
Subject: [PATCH] (index journal; minor)  Clean up

---
 .../marginalia/index/IndexConstructorMain.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/code/processes/index-constructor-process/src/main/java/nu/marginalia/index/IndexConstructorMain.java b/code/processes/index-constructor-process/src/main/java/nu/marginalia/index/IndexConstructorMain.java
index 6d104d4e..92e560b7 100644
--- a/code/processes/index-constructor-process/src/main/java/nu/marginalia/index/IndexConstructorMain.java
+++ b/code/processes/index-constructor-process/src/main/java/nu/marginalia/index/IndexConstructorMain.java
@@ -109,7 +109,7 @@ public class IndexConstructorMain {
                         heartbeat,
                         IndexJournalReader::singleFile,
                         indexStaging.asPath(),
-                        this::addRank,
+                        this::addRankToIdEncoding,
                         tmpDir,
                         outputFileDocs,
                         outputFileWords);
@@ -135,7 +135,8 @@ public class IndexConstructorMain {
                     (path) -> IndexJournalReader
                             .singleFile(path)
                             .filtering(wordMetaFilter),
-                    indexStaging.asPath(), this::addRank, tmpDir, outputFileDocs, outputFileWords);
+                    indexStaging.asPath(),
+                    this::addRankToIdEncoding, tmpDir, outputFileDocs, outputFileWords);
     }
 
     private static LongPredicate getPriorityIndexWordMetaFilter() {
@@ -171,12 +172,16 @@ public class IndexConstructorMain {
         converter.convert();
     }
 
-    private long addRank(long docId) {
-        float rank = domainRankings.getSortRanking(docId);
-        return UrlIdCodec.addRank(rank, docId);
+    /** Append the domain's ranking to the high bits of a document ID
+     * to ensure they're sorted in order of rank within the index.
+     */
+    private long addRankToIdEncoding(long docId) {
+        return UrlIdCodec.addRank(
+                domainRankings.getSortRanking(docId),
+                docId);
     }
 
-    private class CreateIndexInstructions {
+    private static class CreateIndexInstructions {
 
         public final IndexName name;
         private final MqSingleShotInbox inbox;