@nxtedition/rocksdb 13.3.0 → 13.4.0

package/binding.cc

@@ -904,71 +904,76 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
   NAPI_STATUS_RETURN(GetProperty(env, options, "optimizeFiltersForHits", columnOptions.optimize_filters_for_hits));
   NAPI_STATUS_RETURN(GetProperty(env, options, "periodicCompactionSeconds", columnOptions.periodic_compaction_seconds));
 
+  // Compat
   NAPI_STATUS_RETURN(GetProperty(env, options, "enableBlobFiles", columnOptions.enable_blob_files));
   NAPI_STATUS_RETURN(GetProperty(env, options, "minBlobSize", columnOptions.min_blob_size));
-  NAPI_STATUS_RETURN(GetProperty(env, options, "blobFileSize", columnOptions.blob_file_size));
   NAPI_STATUS_RETURN(GetProperty(env, options, "enableBlobGarbageCollection", columnOptions.enable_blob_garbage_collection));
+
+  NAPI_STATUS_RETURN(GetProperty(env, options, "blobFiles", columnOptions.enable_blob_files));
+  NAPI_STATUS_RETURN(GetProperty(env, options, "blobMinSize", columnOptions.min_blob_size));
+  NAPI_STATUS_RETURN(GetProperty(env, options, "blobGarbageCollection", columnOptions.enable_blob_garbage_collection));
+  NAPI_STATUS_RETURN(GetProperty(env, options, "blobFileSize", columnOptions.blob_file_size));
   NAPI_STATUS_RETURN(GetProperty(env, options, "blobGarbageCollectionAgeCutoff", columnOptions.blob_garbage_collection_age_cutoff));
   NAPI_STATUS_RETURN(GetProperty(env, options, "blobGarbageCollectionForceThreshold", columnOptions.blob_garbage_collection_force_threshold));
   NAPI_STATUS_RETURN(GetProperty(env, options, "blobCompactionReadaheadSize", columnOptions.blob_compaction_readahead_size));
   NAPI_STATUS_RETURN(GetProperty(env, options, "blobFileStartingLevel", columnOptions.blob_file_starting_level));
-
-  bool blobCompression = true;
-  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;
+  NAPI_STATUS_RETURN(GetProperty(env, options, "blobCompression", columnOptions.blob_compression_type));
 
   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));
+
+    // Compat
+    NAPI_STATUS_RETURN(GetProperty(env, options, "cacheSize", cacheSize));
+    NAPI_STATUS_RETURN(GetProperty(env, options, "cacheCompressedRatio", compressedRatio));
+    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) {
-      // 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();
     }
   }
 
   {
-    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));
 
-    if (cacheSize == 0) {
-      tableOptions.no_block_cache = true;
-    } else if (compressedRatio > 0.0) {
+    // Compat
+    NAPI_STATUS_RETURN(GetProperty(env, options, "prepopulateBlobCache", columnOptions.prepopulate_blob_cache));
+
+    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheSize", cacheSize));
+    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCacheCompressedRatio", compressedRatio));
+    NAPI_STATUS_RETURN(GetProperty(env, options, "blobCachePrepopulate", columnOptions.prepopulate_blob_cache));
+
+    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;
-
   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.4.0",
   "description": "A low-level Node.js RocksDB binding",
   "license": "MIT",
   "main": "index.js",

package/util.h

@@ -283,6 +283,82 @@ static napi_status GetValue(napi_env env, napi_value value, Encoding& result) {
   return napi_ok;
 }
 
+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;
+    } else if (str == "disable") {
+      result = rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kDisable;
+    } else {
+      return napi_invalid_arg;
+    }
+  }
+
+  bool boolean;
+  if (GetValue(env, value, boolean) == napi_ok) {
+    result = boolean ? rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kFlushOnly
+                     : rocksdb::BlockBasedTableOptions::PrepopulateBlockCache::kDisable;
+  }
+
+  return napi_invalid_arg;
+}
+
+static napi_status GetValue(napi_env env, napi_value value, rocksdb::PrepopulateBlobCache& result) {
+  std::string str;
+
+  if (GetValue(env, value, str) == napi_ok) {
+    if (str == "flushOnly") {
+      result = rocksdb::PrepopulateBlobCache::kFlushOnly;
+    } else if (str == "disable") {
+      result = rocksdb::PrepopulateBlobCache::kDisable;
+    } else {
+      return napi_invalid_arg;
+    }
+  }
+
+  bool boolean;
+  if (GetValue(env, value, boolean) == napi_ok) {
+    result = boolean ? rocksdb::PrepopulateBlobCache::kFlushOnly
+                     : rocksdb::PrepopulateBlobCache::kDisable;
+  }
+
+  return napi_invalid_arg;
+}
+
+static napi_status GetValue(napi_env env, napi_value value, rocksdb::CompressionType& result) {
+  std::string str;
+
+  if (GetValue(env, value, str) == napi_ok) {
+    if (str == "no") {
+      result = rocksdb::CompressionType::kNoCompression;
+    } else if (str == "snappy") {
+      result = rocksdb::CompressionType::kSnappyCompression;
+    } else if (str == "zlib") {
+      result = rocksdb::CompressionType::kZlibCompression;
+    } else if (str == "bzip2") {
+      result = rocksdb::CompressionType::kBZip2Compression;
+    } else if (str == "lz4") {
+      result = rocksdb::CompressionType::kLZ4Compression;
+    } else if (str == "lz4hc") {
+      result = rocksdb::CompressionType::kLZ4HCCompression;
+    } else if (str == "xpress") {
+      result = rocksdb::CompressionType::kXpressCompression;
+    } else if (str == "zstd") {
+      result = rocksdb::CompressionType::kZSTD;
+    }
+  }
+
+  bool boolean;
+  if (GetValue(env, value, boolean) == napi_ok) {
+    result = boolean ? rocksdb::kZSTD
+                     : rocksdb::kNoCompression;
+  }
+
+  return napi_invalid_arg;
+}
+
 template <typename T>
 static napi_status GetValue(napi_env env, napi_value value, std::optional<T>& result) {
   result = T{};