From e1bd57c8378e7c28dafc3b6d9349dfa0f9f36c86 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 29 May 2022 23:48:40 +0200 Subject: [PATCH] Fix default options --- .../disk/LLLocalKeyValueDatabase.java | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java index 07d99a4..f0f9c5a 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java @@ -924,22 +924,22 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase { compressedCache = null; } - if (databaseOptions.spinning()) { - options - // method documentation - .setCompactionReadaheadSize(16 * SizeUnit.MB) - // guessed - .setWritableFileMaxBufferSize(16 * SizeUnit.MB); - } if (databaseOptions.useDirectIO()) { options // Option to enable readahead in compaction // If not set, it will be set to 2MB internally .setCompactionReadaheadSize(2 * SizeUnit.MB) // recommend at least 2MB // Option to tune write buffer for direct writes - .setWritableFileMaxBufferSize(2 * SizeUnit.MB) + .setWritableFileMaxBufferSize(SizeUnit.MB) ; } + if (databaseOptions.spinning()) { + options + // method documentation + .setCompactionReadaheadSize(4 * SizeUnit.MB) + // guessed + .setWritableFileMaxBufferSize(2 * SizeUnit.MB); + } } else { // HIGH MEMORY options @@ -965,11 +965,18 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase { options // Option to enable readahead in compaction // If not set, it will be set to 2MB internally - .setCompactionReadaheadSize(4 * 1024 * 1024) // recommend at least 2MB + .setCompactionReadaheadSize(4 * SizeUnit.MB) // recommend at least 2MB // Option to tune write buffer for direct writes - .setWritableFileMaxBufferSize(4 * 1024 * 1024) + .setWritableFileMaxBufferSize(2 * SizeUnit.MB) ; } + if (databaseOptions.spinning()) { + options + // method documentation + .setCompactionReadaheadSize(16 * SizeUnit.MB) + // guessed + .setWritableFileMaxBufferSize(8 * SizeUnit.MB); + } options.setIncreaseParallelism(Runtime.getRuntime().availableProcessors()); } @@ -977,6 +984,8 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase { var writeBufferManager = new WriteBufferManager(writeBufferManagerSize, blockCache, false); refs.track(writeBufferManager); options.setWriteBufferManager(writeBufferManager); + } else { + options.setWriteBufferManager(null); } if (databaseOptions.useDirectIO()) { @@ -991,7 +1000,7 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase { .setAllowMmapWrites(databaseOptions.allowMemoryMapping()); } - if (!databaseOptions.allowMemoryMapping()) { + if (databaseOptions.useDirectIO() || !databaseOptions.allowMemoryMapping()) { options.setUseDirectIoForFlushAndCompaction(true); }