Revert "LUCENE-9535: Reduce the size of compressed blocks of stored fields by 2x."

This reverts commit 12dd19427e.
This commit is contained in:
Adrien Grand 2020-09-25 22:17:18 +02:00
parent ddd10725b0
commit c032cd1b6f
2 changed files with 5 additions and 5 deletions

View File

@ -36,8 +36,8 @@ import org.apache.lucene.util.compress.LZ4;
*/ */
public final class LZ4WithPresetDictCompressionMode extends CompressionMode { public final class LZ4WithPresetDictCompressionMode extends CompressionMode {
// Shoot for 5 sub blocks // Shoot for 10 sub blocks
private static final int NUM_SUB_BLOCKS = 5; private static final int NUM_SUB_BLOCKS = 10;
// And a dictionary whose size is about 16x smaller than sub blocks // And a dictionary whose size is about 16x smaller than sub blocks
private static final int DICT_SIZE_FACTOR = 16; private static final int DICT_SIZE_FACTOR = 16;

View File

@ -144,7 +144,7 @@ public class Lucene87StoredFieldsFormat extends StoredFieldsFormat {
StoredFieldsFormat impl(Mode mode) { StoredFieldsFormat impl(Mode mode) {
switch (mode) { switch (mode) {
case BEST_SPEED: 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: case BEST_COMPRESSION:
return new CompressingStoredFieldsFormat("Lucene87StoredFieldsHighData", BEST_COMPRESSION_MODE, BEST_COMPRESSION_BLOCK_LENGTH, 4096, 10); return new CompressingStoredFieldsFormat("Lucene87StoredFieldsHighData", BEST_COMPRESSION_MODE, BEST_COMPRESSION_BLOCK_LENGTH, 4096, 10);
default: throw new AssertionError(); default: throw new AssertionError();
@ -157,8 +157,8 @@ public class Lucene87StoredFieldsFormat extends StoredFieldsFormat {
/** Compression mode for {@link Mode#BEST_COMPRESSION} */ /** Compression mode for {@link Mode#BEST_COMPRESSION} */
public static final CompressionMode BEST_COMPRESSION_MODE = new DeflateWithPresetDictCompressionMode(); public static final CompressionMode BEST_COMPRESSION_MODE = new DeflateWithPresetDictCompressionMode();
// Shoot for 5 sub blocks of 60kB each. // Shoot for 10 sub blocks of 60kB each.
private static final int BEST_SPEED_BLOCK_LENGTH = 5 * 60 * 1024; private static final int BEST_SPEED_BLOCK_LENGTH = 10 * 60 * 1024;
/** Compression mode for {@link Mode#BEST_SPEED} */ /** Compression mode for {@link Mode#BEST_SPEED} */
public static final CompressionMode BEST_SPEED_MODE = new LZ4WithPresetDictCompressionMode(); public static final CompressionMode BEST_SPEED_MODE = new LZ4WithPresetDictCompressionMode();