@nxtedition/rocksdb 13.4.2 → 13.4.4

package/binding.cc

@@ -922,26 +922,49 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
   rocksdb::BlockBasedTableOptions tableOptions;
   tableOptions.decouple_partitioned_filters = true;
 
+  std::shared_ptr<rocksdb::Cache> cache;
   {
     uint32_t cacheSize = 8 << 20;
     double compressedRatio = 0.0;
 
-    // Compat
     NAPI_STATUS_RETURN(GetProperty(env, options, "cacheSize", cacheSize));
     NAPI_STATUS_RETURN(GetProperty(env, options, "cacheCompressedRatio", compressedRatio));
+
+    if (cacheSize == 0) {
+      cache = nullptr;
+    } else if (compressedRatio > 0.0) {
+      rocksdb::TieredCacheOptions options;
+      options.cache_type = rocksdb::PrimaryCacheType::kCacheTypeHCC;
+      options.total_capacity = cacheSize;
+      options.compressed_secondary_ratio = compressedRatio;
+      cache = rocksdb::NewTieredCache(options);
+    } else {
+      cache = rocksdb::HyperClockCacheOptions(cacheSize, 0).MakeSharedCache();
+    }
+  }
+
+  {
+    uint32_t cacheSize = -1;
+    double compressedRatio = 0.0;
+
+    NAPI_STATUS_RETURN(GetProperty(env, options, "cachePrepopulate", tableOptions.prepopulate_block_cache));
     NAPI_STATUS_RETURN(GetProperty(env, options, "prepopulateBlockCache", tableOptions.prepopulate_block_cache));
 
     NAPI_STATUS_RETURN(GetProperty(env, options, "blockCacheSize", cacheSize));
     NAPI_STATUS_RETURN(GetProperty(env, options, "blockCacheCompressedRatio", compressedRatio));
     NAPI_STATUS_RETURN(GetProperty(env, options, "blockCachePrepopulate", tableOptions.prepopulate_block_cache));
 
-    if (cacheSize == 0) {
-      tableOptions.no_block_cache = true;
+    if (cacheSize == -1) {
+      if (cache) {
+        tableOptions.block_cache = cache;
+      } else {
+        tableOptions.no_block_cache = true;
+      }
     } else if (compressedRatio > 0.0) {
       rocksdb::TieredCacheOptions options;
+      options.cache_type = rocksdb::PrimaryCacheType::kCacheTypeHCC;
       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();
@@ -952,7 +975,7 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
     uint32_t cacheSize = -1;
     double compressedRatio = 0.0;
 
-    // Compat
+    NAPI_STATUS_RETURN(GetProperty(env, options, "cachePrepopulate", columnOptions.prepopulate_blob_cache));
     NAPI_STATUS_RETURN(GetProperty(env, options, "prepopulateBlobCache", columnOptions.prepopulate_blob_cache));
 
     NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheSize", cacheSize));
@@ -960,7 +983,7 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
     NAPI_STATUS_RETURN(GetProperty(env, options, "blobCachePrepopulate", columnOptions.prepopulate_blob_cache));
 
     if (cacheSize == -1) {
-      columnOptions.blob_cache = tableOptions.block_cache;
+      columnOptions.blob_cache = cache;
     } else if (cacheSize == 0) {
       columnOptions.blob_cache = nullptr;
     } else  if (compressedRatio > 0.0) {

package/package.json

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