@nxtedition/rocksdb 13.4.1 → 13.4.3

package/binding.cc

@@ -922,21 +922,44 @@ 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.total_capacity = cacheSize;
+      options.compressed_secondary_ratio = compressedRatio;
+      options.comp_cache_opts.compression_type = rocksdb::CompressionType::kZSTD;
+      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.total_capacity = cacheSize;
@@ -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.1",
+  "version": "13.4.3",
   "description": "A low-level Node.js RocksDB binding",
   "license": "MIT",
   "main": "index.js",

package/util.h

@@ -38,12 +38,12 @@
     }                                         \
   }
 
-#define ROCKS_STATUS_RETURN(call)        \
-  {                                           \
-    auto _status = (call);                    \
-    if (!_status.ok()) {                      \
-      return _status;                         \
-    }                                         \
+#define ROCKS_STATUS_RETURN(call) \
+  {                               \
+    auto _status = (call);        \
+    if (!_status.ok()) {          \
+      return _status;             \
+    }                             \
   }
 
 template <typename T>
@@ -249,7 +249,6 @@ static napi_status GetValue(napi_env env, napi_value value, double& result) {
   return napi_ok;
 }
 
-
 static napi_status GetValue(napi_env env, napi_value value, std::string& result) {
   return GetString(env, value, result);
 }
@@ -276,21 +275,27 @@ static napi_status GetValue(napi_env env, napi_value value, Encoding& result) {
 
   if (size == 6) {
     result = Encoding::Buffer;
+    return napi_ok;
   } else {
     result = Encoding::String;
+    return napi_ok;
   }
 
-  return napi_ok;
+  return napi_invalid_arg;
 }
 
-static napi_status GetValue(napi_env env, napi_value value, rocksdb::BlockBasedTableOptions::PrepopulateBlockCache& result) {
+static napi_status GetValue(napi_env env,
+                            napi_value value,
+                            rocksdb::BlockBasedTableOptions::PrepopulateBlockCache& result) {
   std::string str;
 
   if (GetValue(env, value, str) == napi_ok) {
     if (str == "flushOnly") {
       result = rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kFlushOnly;
+      return napi_ok;
     } else if (str == "disable") {
       result = rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kDisable;
+      return napi_ok;
     } else {
       return napi_invalid_arg;
     }
@@ -300,6 +305,7 @@ static napi_status GetValue(napi_env env, napi_value value, rocksdb::BlockBasedT
   if (GetValue(env, value, boolean) == napi_ok) {
     result = boolean ? rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kFlushOnly
                      : rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kDisable;
+    return napi_ok;
   }
 
   return napi_invalid_arg;
@@ -311,8 +317,10 @@ static napi_status GetValue(napi_env env, napi_value value, rocksdb::Prepopulate
   if (GetValue(env, value, str) == napi_ok) {
     if (str == "flushOnly") {
       result = rocksdb::PrepopulateBlobCache::kFlushOnly;
+      return napi_ok;
     } else if (str == "disable") {
       result = rocksdb::PrepopulateBlobCache::kDisable;
+      return napi_ok;
     } else {
       return napi_invalid_arg;
     }
@@ -320,8 +328,8 @@ static napi_status GetValue(napi_env env, napi_value value, rocksdb::Prepopulate
 
   bool boolean;
   if (GetValue(env, value, boolean) == napi_ok) {
-    result = boolean ? rocksdb::PrepopulateBlobCache::kFlushOnly
-                     : rocksdb::PrepopulateBlobCache::kDisable;
+    result = boolean ? rocksdb::PrepopulateBlobCache::kFlushOnly : rocksdb::PrepopulateBlobCache::kDisable;
+    return napi_ok;
   }
 
   return napi_invalid_arg;
@@ -333,27 +341,37 @@ static napi_status GetValue(napi_env env, napi_value value, rocksdb::Compression
   if (GetValue(env, value, str) == napi_ok) {
     if (str == "no") {
       result = rocksdb::CompressionType::kNoCompression;
+      return napi_ok;
     } else if (str == "snappy") {
       result = rocksdb::CompressionType::kSnappyCompression;
+      return napi_ok;
     } else if (str == "zlib") {
       result = rocksdb::CompressionType::kZlibCompression;
+      return napi_ok;
     } else if (str == "bzip2") {
       result = rocksdb::CompressionType::kBZip2Compression;
+      return napi_ok;
     } else if (str == "lz4") {
       result = rocksdb::CompressionType::kLZ4Compression;
+      return napi_ok;
     } else if (str == "lz4hc") {
       result = rocksdb::CompressionType::kLZ4HCCompression;
+      return napi_ok;
     } else if (str == "xpress") {
       result = rocksdb::CompressionType::kXpressCompression;
+      return napi_ok;
     } else if (str == "zstd") {
       result = rocksdb::CompressionType::kZSTD;
+      return napi_ok;
+    } else {
+      return napi_invalid_arg;
     }
   }
 
   bool boolean;
   if (GetValue(env, value, boolean) == napi_ok) {
-    result = boolean ? rocksdb::kZSTD
-                     : rocksdb::kNoCompression;
+    result = boolean ? rocksdb::kZSTD : rocksdb::kNoCompression;
+    return napi_ok;
   }
 
   return napi_invalid_arg;