@nxtedition/rocksdb 13.3.0 → 13.3.1

package/binding.cc

@@ -917,57 +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;
+    uint32_t cacheSize = 8 << 20;
     double compressedRatio = 0.0;
-    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheSize", cacheSize));
-    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheCompressedRatio", compressedRatio));
+    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 == 0) {
-      // Do nothing..
-    } else  if (compressedRatio > 0.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;
-      columnOptions.blob_cache = rocksdb::NewTieredCache(options);
+      tableOptions.block_cache = rocksdb::NewTieredCache(options);
     } else {
-      columnOptions.blob_cache = rocksdb::HyperClockCacheOptions(cacheSize, 0).MakeSharedCache();
+      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;
   }
 
   {
-    uint32_t cacheSize = 8 << 20;
+    uint32_t cacheSize = -1;
     double compressedRatio = 0.0;
-    NAPI_STATUS_RETURN(GetProperty(env, options, "cacheSize", cacheSize));
-    NAPI_STATUS_RETURN(GetProperty(env, options, "blockCacheSize", cacheSize));
-    NAPI_STATUS_RETURN(GetProperty(env, options, "blockCacheCompressedRatio", compressedRatio));
+    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheSize", cacheSize));
+    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheCompressedRatio", compressedRatio));
 
-    if (cacheSize == 0) {
-      tableOptions.no_block_cache = true;
-    } else if (compressedRatio > 0.0) {
+    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;
-      tableOptions.block_cache = rocksdb::NewTieredCache(options);
+      columnOptions.blob_cache = rocksdb::NewTieredCache(options);
     } else {
-      tableOptions.block_cache = rocksdb::HyperClockCacheOptions(cacheSize, 0).MakeSharedCache();
+      columnOptions.blob_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 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));

package/package.json

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