diff --git a/src/main/data-generator/quic-rpc.yaml b/src/main/data-generator/quic-rpc.yaml index 08791bd..9d8be71 100644 --- a/src/main/data-generator/quic-rpc.yaml +++ b/src/main/data-generator/quic-rpc.yaml @@ -255,6 +255,8 @@ versions: spinning: boolean defaultColumnOptions: DefaultColumnOptions columnOptions: NamedColumnOptions[] + logPath: -String + walPath: -String # Remember to update ColumnOptions common getters DefaultColumnOptions: data: diff --git a/src/main/java/it/cavallium/dbengine/client/DefaultDatabaseOptions.java b/src/main/java/it/cavallium/dbengine/client/DefaultDatabaseOptions.java index acc9939..50e34a7 100644 --- a/src/main/java/it/cavallium/dbengine/client/DefaultDatabaseOptions.java +++ b/src/main/java/it/cavallium/dbengine/client/DefaultDatabaseOptions.java @@ -57,7 +57,9 @@ public class DefaultDatabaseOptions { Nullablelong.empty(), false, DEFAULT_DEFAULT_COLUMN_OPTIONS, - List.of() + List.of(), + NullableString.empty(), + NullableString.empty() ); public static DatabaseOptionsBuilder builder() { diff --git a/src/main/java/it/cavallium/dbengine/database/disk/CachedIndexSearcherManager.java b/src/main/java/it/cavallium/dbengine/database/disk/CachedIndexSearcherManager.java index 41303a6..3b02959 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/CachedIndexSearcherManager.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/CachedIndexSearcherManager.java @@ -102,7 +102,7 @@ public class CachedIndexSearcherManager implements IndexSearcherManager { this.closeMono = Mono .fromRunnable(() -> { - logger.info("Closing IndexSearcherManager..."); + logger.debug("Closing IndexSearcherManager..."); this.closeRequested.set(true); this.closeRequestedMono.tryEmitEmpty(); }) 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 fe73be2..4b3f432 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java @@ -789,6 +789,12 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase { } else { options.setDelayedWriteRate(64 * SizeUnit.MB); } + if (databaseOptions.logPath().isPresent()) { + options.setDbLogDir(databaseOptions.logPath().get()); + } + if (databaseOptions.walPath().isPresent()) { + options.setWalDir(databaseOptions.walPath().get()); + } options.setCreateIfMissing(true); options.setSkipStatsUpdateOnDbOpen(true); options.setCreateMissingColumnFamilies(true); @@ -869,8 +875,8 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase { // HIGH MEMORY options //.setDbWriteBufferSize(64 * SizeUnit.MB) - .setBytesPerSync(0) - .setWalBytesPerSync(0) + .setBytesPerSync(64 * SizeUnit.MB) + .setWalBytesPerSync(64 * SizeUnit.MB) .setWalTtlSeconds(0) // Auto .setWalSizeLimitMB(0) // Auto diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java index 1f779f9..322afce 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java @@ -483,9 +483,9 @@ public class LLLocalLuceneIndex implements LLLuceneIndex { public Mono close() { return Mono .fromCallable(() -> { - logger.info("Waiting IndexWriter tasks..."); + logger.debug("Waiting IndexWriter tasks..."); activeTasks.arriveAndAwaitAdvance(); - logger.info("IndexWriter tasks ended"); + logger.debug("IndexWriter tasks ended"); return null; }) .subscribeOn(luceneHeavyTasksScheduler)