From 468886d1546465c4889c9253f884e87f8cb47910 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 25 Mar 2023 13:42:49 +0100 Subject: [PATCH] Remove compressed cache, rocksdb 8.0.0 --- pom.xml | 2 +- src/main/data-generator/quic-rpc.yaml | 1 - .../client/DefaultDatabaseOptions.java | 1 - .../disk/LLLocalKeyValueDatabase.java | 36 ++----------------- 4 files changed, 4 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index a4d9651..14f154c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ false 1.9.5 9.5.0 - 7.10.2 + 8.0.0 5.9.0 1.0.258 diff --git a/src/main/data-generator/quic-rpc.yaml b/src/main/data-generator/quic-rpc.yaml index 0d74adb..df09519 100644 --- a/src/main/data-generator/quic-rpc.yaml +++ b/src/main/data-generator/quic-rpc.yaml @@ -248,7 +248,6 @@ baseTypesData: optimistic: boolean maxOpenFiles: -int blockCache: -long - compressedBlockCache: -long persistentCaches: PersistentCache[] writeBufferManager: -long spinning: boolean diff --git a/src/main/java/it/cavallium/dbengine/client/DefaultDatabaseOptions.java b/src/main/java/it/cavallium/dbengine/client/DefaultDatabaseOptions.java index b5007c5..caadcf8 100644 --- a/src/main/java/it/cavallium/dbengine/client/DefaultDatabaseOptions.java +++ b/src/main/java/it/cavallium/dbengine/client/DefaultDatabaseOptions.java @@ -60,7 +60,6 @@ public class DefaultDatabaseOptions { true, Nullableint.empty(), Nullablelong.empty(), - Nullablelong.empty(), Collections.emptyList(), Nullablelong.empty(), false, 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 557b2bb..949870d 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java @@ -125,7 +125,6 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa private RocksDB db; private Statistics statistics; private Cache standardCache; - private Cache compressedCache; private final Map handles; private final HashMap persistentCaches; @@ -363,7 +362,6 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa // https://github.com/facebook/rocksdb/wiki/Tuning-RocksDB-on-Spinning-Disks // https://nightlies.apache.org/flink/flink-docs-release-1.3/api/java/org/apache/flink/contrib/streaming/state/PredefinedOptions.html .setBlockSize(columnOptions.blockSize().orElse((databaseOptions.spinning() ? 128 : 16) * 1024)) - .setBlockCacheCompressed(optionsWithCache.compressedCache()) .setBlockCache(optionsWithCache.standardCache()) .setPersistentCache(resolvePersistentCache(persistentCaches, rocksdbOptions, @@ -440,7 +438,6 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa ); } this.standardCache = optionsWithCache.standardCache; - this.compressedCache = optionsWithCache.compressedCache; break; } catch (RocksDBException ex) { switch (ex.getMessage()) { @@ -749,7 +746,7 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa return closeLock; } - private void flushAndCloseDb(RocksDB db, Cache standardCache, Cache compressedCache, List handles) { + private void flushAndCloseDb(RocksDB db, Cache standardCache, List handles) { var closeWriteLock = closeLock.writeLock(); try { if (closed) { @@ -784,9 +781,6 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa logger.error("Can't close column family", ex); } } - if (compressedCache != null) { - compressedCache.close(); - } if (standardCache != null) { standardCache.close(); } @@ -855,16 +849,7 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa } - record OptionsWithCache(DBOptions options, @Nullable Cache standardCache, @Nullable Cache compressedCache) { - - /** - * SecondaryCache will replace compressed cache - */ - @Deprecated(forRemoval = true) - @Override - public Cache compressedCache() { - return compressedCache; - } + record OptionsWithCache(DBOptions options, @Nullable Cache standardCache) { } private static OptionsWithCache openRocksDb(@Nullable Path path, DatabaseOptions databaseOptions, RocksDBRefs refs) { @@ -956,8 +941,6 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa } Cache blockCache; - //todo: compressed cache will be replaced with SecondaryCache in the future - Cache compressedCache; final boolean useDirectIO = databaseOptions.useDirectIO(); final boolean allowMmapReads = !useDirectIO && databaseOptions.allowMemoryMapping(); final boolean allowMmapWrites = !useDirectIO && (databaseOptions.allowMemoryMapping() @@ -974,12 +957,6 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa ; blockCache = CACHE_FACTORY.newCache(writeBufferManagerSize + databaseOptions.blockCache().orElse(8L * SizeUnit.MB)); refs.track(blockCache); - if (databaseOptions.compressedBlockCache().isPresent()) { - compressedCache = CACHE_FACTORY.newCache(databaseOptions.compressedBlockCache().get()); - refs.track(compressedCache); - } else { - compressedCache = null; - } if (useDirectIO) { options @@ -1010,12 +987,6 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa ; blockCache = CACHE_FACTORY.newCache(writeBufferManagerSize + databaseOptions.blockCache().orElse( 512 * SizeUnit.MB)); refs.track(blockCache); - if (databaseOptions.compressedBlockCache().isPresent()) { - compressedCache = CACHE_FACTORY.newCache(databaseOptions.compressedBlockCache().get()); - refs.track(compressedCache); - } else { - compressedCache = null; - } if (useDirectIO) { options @@ -1058,7 +1029,7 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa options.setUseDirectIoForFlushAndCompaction(true); } - return new OptionsWithCache(options, blockCache, compressedCache); + return new OptionsWithCache(options, blockCache); } catch (IOException e) { throw new DBException(e); } @@ -1525,7 +1496,6 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa try { flushAndCloseDb(db, standardCache, - compressedCache, new ArrayList<>(handles.values()) ); handles.values().forEach(columnFamilyHandleRocksObj -> {