From 191b4267979285ae5da76fa13c22a115cbbdcacd Mon Sep 17 00:00:00 2001
From: vlofgren <vlofgren@gmail.com>
Date: Mon, 25 Jul 2022 15:20:45 +0200
Subject: [PATCH] Fix madvise code

---
 .../src/main/java/nu/marginalia/util/btree/BTreeReader.java     | 2 +-
 .../nu/marginalia/wmsa/edge/index/reader/IndexWordsTable.java   | 2 +-
 .../java/nu/marginalia/wmsa/edge/index/reader/SearchIndex.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/marginalia_nu/src/main/java/nu/marginalia/util/btree/BTreeReader.java b/marginalia_nu/src/main/java/nu/marginalia/util/btree/BTreeReader.java
index 388eb175..c3794acb 100644
--- a/marginalia_nu/src/main/java/nu/marginalia/util/btree/BTreeReader.java
+++ b/marginalia_nu/src/main/java/nu/marginalia/util/btree/BTreeReader.java
@@ -10,7 +10,7 @@ import static java.lang.Math.min;
 public class BTreeReader {
 
     private final MultimapFileLong file;
-    private final BTreeContext ctx;
+    public final BTreeContext ctx;
 
     private final MultimapSearcher indexSearcher;
     private final MultimapSearcher dataSearcher;
diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/reader/IndexWordsTable.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/reader/IndexWordsTable.java
index 681e42ea..ccc2fa53 100644
--- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/reader/IndexWordsTable.java
+++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/reader/IndexWordsTable.java
@@ -95,7 +95,7 @@ public class IndexWordsTable implements AutoCloseable {
                     offsetConsumer.accept(words.get(posOffset+1));
                 }
             }
-            catch (RuntimeException ex) {
+            catch (Exception ex) {
                 logger.warn("Error @ " + i, ex);
                 break;
             }
diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/reader/SearchIndex.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/reader/SearchIndex.java
index b1830ef6..ac33b139 100644
--- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/reader/SearchIndex.java
+++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/reader/SearchIndex.java
@@ -55,7 +55,7 @@ public class SearchIndex implements  AutoCloseable {
 
             if (length > 0) {
                 urls.adviceRange(NativeIO.Advice.WillNeed, h.indexOffsetLongs(), length);
-                urls.adviceRange(NativeIO.Advice.Normal, h.dataOffsetLongs(), 2048);
+                urls.adviceRange(NativeIO.Advice.Normal, h.dataOffsetLongs(), Math.min(2048, h.numEntries()*bTreeReader.ctx.entrySize()));
                 urls.pokeRange(h.indexOffsetLongs(), length);
             }
         });