Remove overrides for ramBuffer, compound file

Reverts to the default Lucene behavior
slackhq · Jun 2, 2022 · 16644d9 · 16644d9
1 parent 1504e69
commit 16644d9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git a/kaldb/src/main/java/com/slack/kaldb/logstore/LuceneIndexStoreConfig.java b/kaldb/src/main/java/com/slack/kaldb/logstore/LuceneIndexStoreConfig.java
@@ -26,9 +26,6 @@ public class LuceneIndexStoreConfig {
   // The name of the lucene log file.
   public final String logFileName;
 
-  // Config to set the IndexWriterConfig.setRAMBufferSizeMB.
-  public final int ramBufferSizeMB;
-
   // A flag that turns on internal logging.
   public final boolean enableTracing;
 
@@ -47,26 +44,15 @@ public static Duration getRefreshDuration(final long refreshDurationSecs) {
   }
 
   public LuceneIndexStoreConfig(
-      Duration commitDuration,
-      Duration refreshDuration,
-      String indexRoot,
-      int ramBufferSizeMB,
-      boolean enableTracing) {
-    this(
-        commitDuration,
-        refreshDuration,
-        indexRoot,
-        DEFAULT_LOG_FILE_NAME,
-        ramBufferSizeMB,
-        enableTracing);
+      Duration commitDuration, Duration refreshDuration, String indexRoot, boolean enableTracing) {
+    this(commitDuration, refreshDuration, indexRoot, DEFAULT_LOG_FILE_NAME, enableTracing);
   }
 
   public LuceneIndexStoreConfig(
       Duration commitDuration,
       Duration refreshDuration,
       String indexRoot,
       String logFileName,
-      int ramBufferSizeMB,
       boolean enableTracing) {
     ensureTrue(
         !(commitDuration.isZero() || commitDuration.isNegative()),
@@ -78,7 +64,6 @@ public LuceneIndexStoreConfig(
     this.refreshDuration = refreshDuration;
     this.indexRoot = indexRoot;
     this.logFileName = logFileName;
-    this.ramBufferSizeMB = ramBufferSizeMB;
     this.enableTracing = enableTracing;
   }
 

diff --git a/kaldb/src/main/java/com/slack/kaldb/logstore/LuceneIndexStoreImpl.java b/kaldb/src/main/java/com/slack/kaldb/logstore/LuceneIndexStoreImpl.java
@@ -77,7 +77,7 @@ public static LuceneIndexStoreImpl makeLogStore(
     // TODO: Chunk should create log store?
     LuceneIndexStoreConfig indexStoreCfg =
         new LuceneIndexStoreConfig(
-            commitInterval, refreshInterval, dataDirectory.getAbsolutePath(), 8, false);
+            commitInterval, refreshInterval, dataDirectory.getAbsolutePath(), false);
 
     // TODO: set ignore property exceptions via CLI flag.
     return new LuceneIndexStoreImpl(
@@ -139,8 +139,6 @@ private IndexWriterConfig buildIndexWriterConfig(
     final IndexWriterConfig indexWriterCfg =
         new IndexWriterConfig(analyzer)
             .setOpenMode(IndexWriterConfig.OpenMode.CREATE)
-            .setRAMBufferSizeMB(config.ramBufferSizeMB)
-            .setUseCompoundFile(false)
             .setMergeScheduler(new KalDBMergeScheduler(metricsRegistry))
             .setIndexDeletionPolicy(snapshotDeletionPolicy);
 

diff --git a/kaldb/src/test/java/com/slack/kaldb/logstore/LuceneIndexStoreConfigTest.java b/kaldb/src/test/java/com/slack/kaldb/logstore/LuceneIndexStoreConfigTest.java
@@ -6,25 +6,23 @@
 public class LuceneIndexStoreConfigTest {
   @Test(expected = IllegalArgumentException.class)
   public void testZeroCommitDuration() {
-    new LuceneIndexStoreConfig(
-        Duration.ZERO, Duration.ofSeconds(10), "indexRoot", "logfile", 20, true);
+    new LuceneIndexStoreConfig(Duration.ZERO, Duration.ofSeconds(10), "indexRoot", "logfile", true);
   }
 
   @Test(expected = IllegalArgumentException.class)
   public void testZeroRefreshDuration() {
-    new LuceneIndexStoreConfig(
-        Duration.ofSeconds(10), Duration.ZERO, "indexRoot", "logfile", 20, true);
+    new LuceneIndexStoreConfig(Duration.ofSeconds(10), Duration.ZERO, "indexRoot", "logfile", true);
   }
 
   @Test(expected = IllegalArgumentException.class)
   public void testNegativeCommitDuration() {
     new LuceneIndexStoreConfig(
-        Duration.ofSeconds(-10), Duration.ofSeconds(10), "indexRoot", "logfile", 20, true);
+        Duration.ofSeconds(-10), Duration.ofSeconds(10), "indexRoot", "logfile", true);
   }
 
   @Test(expected = IllegalArgumentException.class)
   public void testNegativeRefreshDuration() {
     new LuceneIndexStoreConfig(
-        Duration.ofSeconds(10), Duration.ofSeconds(-100), "indexRoot", "logfile", 20, true);
+        Duration.ofSeconds(10), Duration.ofSeconds(-100), "indexRoot", "logfile", true);
   }
 }
diff --git a/kaldb/src/test/java/com/slack/kaldb/testlib/TemporaryLogStoreAndSearcherRule.java b/kaldb/src/test/java/com/slack/kaldb/testlib/TemporaryLogStoreAndSearcherRule.java
@@ -73,7 +73,7 @@ public TemporaryLogStoreAndSearcherRule(
   public static LuceneIndexStoreConfig getIndexStoreConfig(
       Duration commitInterval, Duration refreshInterval, File tempFolder) throws IOException {
     return new LuceneIndexStoreConfig(
-        commitInterval, refreshInterval, tempFolder.getCanonicalPath(), 8, false);
+        commitInterval, refreshInterval, tempFolder.getCanonicalPath(), false);
   }
 
   @Override