From c032cd1b6f5d46e82cca2d36a4b7722f450c46bc Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Fri, 25 Sep 2020 22:17:18 +0200 Subject: [PATCH] Revert "LUCENE-9535: Reduce the size of compressed blocks of stored fields by 2x." This reverts commit 12dd19427e4888421202115fd86d87d0bb04eae6. --- .../codecs/lucene87/LZ4WithPresetDictCompressionMode.java | 4 ++-- .../lucene/codecs/lucene87/Lucene87StoredFieldsFormat.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene87/LZ4WithPresetDictCompressionMode.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene87/LZ4WithPresetDictCompressionMode.java index 81fcdaf5956..15b961df7af 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene87/LZ4WithPresetDictCompressionMode.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene87/LZ4WithPresetDictCompressionMode.java @@ -36,8 +36,8 @@ import org.apache.lucene.util.compress.LZ4; */ public final class LZ4WithPresetDictCompressionMode extends CompressionMode { - // Shoot for 5 sub blocks - private static final int NUM_SUB_BLOCKS = 5; + // Shoot for 10 sub blocks + private static final int NUM_SUB_BLOCKS = 10; // And a dictionary whose size is about 16x smaller than sub blocks private static final int DICT_SIZE_FACTOR = 16; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene87/Lucene87StoredFieldsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene87/Lucene87StoredFieldsFormat.java index eb6edc848f4..56648c7be04 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene87/Lucene87StoredFieldsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene87/Lucene87StoredFieldsFormat.java @@ -144,7 +144,7 @@ public class Lucene87StoredFieldsFormat extends StoredFieldsFormat { StoredFieldsFormat impl(Mode mode) { switch (mode) { case BEST_SPEED: - return new CompressingStoredFieldsFormat("Lucene87StoredFieldsFastData", BEST_SPEED_MODE, BEST_SPEED_BLOCK_LENGTH, 512, 10); + return new CompressingStoredFieldsFormat("Lucene87StoredFieldsFastData", BEST_SPEED_MODE, BEST_SPEED_BLOCK_LENGTH, 1024, 10); case BEST_COMPRESSION: return new CompressingStoredFieldsFormat("Lucene87StoredFieldsHighData", BEST_COMPRESSION_MODE, BEST_COMPRESSION_BLOCK_LENGTH, 4096, 10); default: throw new AssertionError(); @@ -157,8 +157,8 @@ public class Lucene87StoredFieldsFormat extends StoredFieldsFormat { /** Compression mode for {@link Mode#BEST_COMPRESSION} */ public static final CompressionMode BEST_COMPRESSION_MODE = new DeflateWithPresetDictCompressionMode(); - // Shoot for 5 sub blocks of 60kB each. - private static final int BEST_SPEED_BLOCK_LENGTH = 5 * 60 * 1024; + // Shoot for 10 sub blocks of 60kB each. + private static final int BEST_SPEED_BLOCK_LENGTH = 10 * 60 * 1024; /** Compression mode for {@link Mode#BEST_SPEED} */ public static final CompressionMode BEST_SPEED_MODE = new LZ4WithPresetDictCompressionMode();