@nxtedition/rocksdb 13.2.0 → 13.3.1

package/binding.cc

@@ -917,39 +917,60 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
   NAPI_STATUS_RETURN(GetProperty(env, options, "blobCompression", blobCompression));
   columnOptions.blob_compression_type = blobCompression ? rocksdb::kZSTD : rocksdb::kNoCompression;
 
-  bool prepopulateBlobCache = false;
-  NAPI_STATUS_RETURN(GetProperty(env, options, "prepopulateBlobCache", prepopulateBlobCache));
-  columnOptions.prepopulate_blob_cache = prepopulateBlobCache ? rocksdb::PrepopulateBlobCache::kFlushOnly : rocksdb::PrepopulateBlobCache::kDisable;
-
   rocksdb::BlockBasedTableOptions tableOptions;
   tableOptions.decouple_partitioned_filters = true;
 
-  {
-    uint32_t cacheSize = 0;
-    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheSize", cacheSize));
-
-    if (cacheSize) {
-      columnOptions.blob_cache = rocksdb::HyperClockCacheOptions(cacheSize, 0).MakeSharedCache();
-    }
-  }
-
   {
     uint32_t cacheSize = 8 << 20;
+    double compressedRatio = 0.0;
     NAPI_STATUS_RETURN(GetProperty(env, options, "cacheSize", cacheSize));
+    NAPI_STATUS_RETURN(GetProperty(env, options, "cacheCompressedRatio", compressedRatio));
     NAPI_STATUS_RETURN(GetProperty(env, options, "blockCacheSize", cacheSize));
+    NAPI_STATUS_RETURN(GetProperty(env, options, "blockCacheCompressedRatio", compressedRatio));
 
-    if (cacheSize) {
-      tableOptions.block_cache = rocksdb::HyperClockCacheOptions(cacheSize, 0).MakeSharedCache();
-    } else {
+    if (cacheSize == 0) {
       tableOptions.no_block_cache = true;
+    } else if (compressedRatio > 0.0) {
+      rocksdb::TieredCacheOptions options;
+      options.total_capacity = cacheSize;
+      options.compressed_secondary_ratio = compressedRatio;
+      options.comp_cache_opts.compression_type = rocksdb::CompressionType::kZSTD;
+      tableOptions.block_cache = rocksdb::NewTieredCache(options);
+    } else {
+      tableOptions.block_cache = rocksdb::HyperClockCacheOptions(cacheSize, 0).MakeSharedCache();
     }
+
+    bool prepopulateBlockCache = false;
+    NAPI_STATUS_RETURN(GetProperty(env, options, "prepopulateBlockCache", prepopulateBlockCache));
+    tableOptions.prepopulate_block_cache = prepopulateBlockCache
+      ? rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kFlushOnly
+      : rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kDisable;
   }
 
-  bool prepopulateBlockCache = false;
-  NAPI_STATUS_RETURN(GetProperty(env, options, "prepopulateBlockCache", prepopulateBlockCache));
-  tableOptions.prepopulate_block_cache = prepopulateBlockCache
-    ? rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kFlushOnly
-    : rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kDisable;
+  {
+    uint32_t cacheSize = -1;
+    double compressedRatio = 0.0;
+    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheSize", cacheSize));
+    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheCompressedRatio", compressedRatio));
+
+    if (cacheSize == -1) {
+      columnOptions.blob_cache = tableOptions.block_cache;
+    } else if (cacheSize == 0) {
+      columnOptions.blob_cache = nullptr;
+    } else  if (compressedRatio > 0.0) {
+      rocksdb::TieredCacheOptions options;
+      options.total_capacity = cacheSize;
+      options.compressed_secondary_ratio = compressedRatio;
+      options.comp_cache_opts.compression_type = rocksdb::CompressionType::kZSTD;
+      columnOptions.blob_cache = rocksdb::NewTieredCache(options);
+    } else {
+      columnOptions.blob_cache = rocksdb::HyperClockCacheOptions(cacheSize, 0).MakeSharedCache();
+    }
+
+    bool prepopulateBlobCache = false;
+    NAPI_STATUS_RETURN(GetProperty(env, options, "prepopulateBlobCache", prepopulateBlobCache));
+    columnOptions.prepopulate_blob_cache = prepopulateBlobCache ? rocksdb::PrepopulateBlobCache::kFlushOnly : rocksdb::PrepopulateBlobCache::kDisable;
+  }
 
   std::string optimize = "";
   NAPI_STATUS_RETURN(GetProperty(env, options, "optimize", optimize));
@@ -1125,6 +1146,10 @@ NAPI_METHOD(db_open) {
 
     NAPI_STATUS_THROWS(GetProperty(env, options, "memTableHugePageSize", dbOptions.memtable_huge_page_size));
 
+    NAPI_STATUS_THROWS(GetProperty(env, options, "useDirectIOReads", dbOptions.use_direct_reads));
+
+    NAPI_STATUS_THROWS(GetProperty(env, options, "useDirectIOForFlushAndCompaction", dbOptions.use_direct_io_for_flush_and_compaction));
+
     // TODO (feat): dbOptions.listeners
 
     std::string infoLogLevel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/rocksdb",
-  "version": "13.2.0",
+  "version": "13.3.1",
   "description": "A low-level Node.js RocksDB binding",
   "license": "MIT",
   "main": "index.js",