@nxtedition/rocksdb 10.1.3 → 10.1.5

package/binding.cc

@@ -980,21 +980,18 @@ NAPI_METHOD(db_get_many) {
   auto snapshot = std::shared_ptr<const rocksdb::Snapshot>(
       database->db->GetSnapshot(), [database](auto ptr) { database->db->ReleaseSnapshot(ptr); });
 
-  // TODO (fix): Ensure lifetime of buffer?
-  std::vector<rocksdb::Slice> keys { size };
+  std::vector<rocksdb::PinnableSlice> keys { size };
 
   for (uint32_t n = 0; n < size; n++) {
     napi_value element;
-    char* buf;
-    size_t length;
     NAPI_STATUS_THROWS(napi_get_element(env, argv[1], n, &element));
-    NAPI_STATUS_THROWS(napi_get_buffer_info(env, element, reinterpret_cast<void**>(&buf), &length));
-    keys[n] = rocksdb::Slice{ buf, length };
+    NAPI_STATUS_THROWS(GetValue(env, element, keys[n]));
   }
 
   struct State {
     std::vector<rocksdb::Status> statuses;
     std::vector<rocksdb::PinnableSlice> values;
+    std::vector<rocksdb::Slice> keys;
   };
 
   runAsync<State>(
@@ -1009,8 +1006,13 @@ NAPI_METHOD(db_get_many) {
 
         state.statuses.resize(size);
         state.values.resize(size);
+        state.keys.resize(size);
 
-        database->db->MultiGet(readOptions, column, size, keys.data(), state.values.data(), state.statuses.data());
+        for (auto n = 0; n < size; n++) {
+          state.keys[n] = keys[n];
+        }
+
+        database->db->MultiGet(readOptions, column, size, state.keys.data(), state.values.data(), state.statuses.data());
 
         return rocksdb::Status::OK();
       },
@@ -1033,6 +1035,10 @@ NAPI_METHOD(db_get_many) {
           NAPI_STATUS_RETURN(napi_set_element(env, argv[1], idx, element));
         }
 
+        state.statuses.clear();
+        state.values.clear();
+        state.keys.clear();
+
         return napi_ok;
       });
 

package/index.js

@@ -156,9 +156,8 @@ class RocksLevel extends AbstractLevel {
 
     try {
       this[kRef]()
-      // NOTE: `keys` needs to be referenced until callback is called
       binding.db_get_many(this[kContext], keys, options ?? EMPTY, (err, val) => {
-        callback(err, val, keys)
+        callback(err, val)
         this[kUnref]()
       })
     } catch (err) {
@@ -289,7 +288,6 @@ class RocksLevel extends AbstractLevel {
         } else {
           resolve({
             rows,
-            sequence: binding.iterator_get_sequence(context),
             finished
           })
         }

package/iterator.js

@@ -36,10 +36,6 @@ class Iterator extends AbstractIterator {
     this[kPosition] = 0
   }
 
-  get sequence () {
-    return binding.iterator_get_sequence(this[kContext])
-  }
-
   _seek (target) {
     if (target.length === 0) {
       throw new Error('cannot seek() to an empty target')

package/package.json

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

package/util.h

@@ -133,12 +133,35 @@ static napi_status GetString(napi_env env, napi_value from, std::string& to) {
   return napi_ok;
 }
 
+void CleanupString(void* env, void* ref) {
+  napi_delete_reference(static_cast<napi_env>(env), static_cast<napi_ref>(ref));
+}
+
 static napi_status GetString(napi_env env, napi_value from, rocksdb::PinnableSlice& to) {
   napi_valuetype type;
   NAPI_STATUS_RETURN(napi_typeof(env, from, &type));
 
-  NAPI_STATUS_RETURN(GetString(env, from, *to.GetSelf()));
-  to.PinSelf();
+  if (type == napi_string) {
+    size_t length = 0;
+    NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, nullptr, 0, &length));
+    to.GetSelf()->resize(length, '\0');
+    NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, to.GetSelf()->data(), length + 1, &length));
+    to.PinSelf();
+  } else {
+    bool isBuffer;
+    NAPI_STATUS_RETURN(napi_is_buffer(env, from, &isBuffer));
+
+    if (isBuffer) {
+      char* buf = nullptr;
+      size_t length = 0;
+      napi_ref ref;
+      NAPI_STATUS_RETURN(napi_get_buffer_info(env, from, reinterpret_cast<void**>(&buf), &length));
+      NAPI_STATUS_RETURN(napi_create_reference(env, from, 1, &ref));
+      to.PinSlice(rocksdb::Slice{buf,length}, CleanupString, env, ref);
+    } else {
+      return napi_invalid_arg;
+    }
+  }
 
   return napi_ok;
 }

package/tmp/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000104

package/tmp/IDENTITY

@@ -1 +0,0 @@
-6d5096a1-16eb-423d-8e1e-c703b4fdbc14

package/tmp/OPTIONS-000098

@@ -1,207 +0,0 @@
-# This is a RocksDB option file.
-#
-# For detailed file format spec, please refer to the example file
-# in examples/rocksdb_option_file_example.ini
-#
-
-[Version]
-  rocksdb_version=9.3.1
-  options_file_version=1.1
-
-[DBOptions]
-  max_background_flushes=-1
-  compaction_readahead_size=2097152
-  strict_bytes_per_sync=false
-  wal_bytes_per_sync=0
-  max_open_files=-1
-  stats_history_buffer_size=1048576
-  max_total_wal_size=0
-  stats_persist_period_sec=600
-  stats_dump_period_sec=600
-  avoid_flush_during_shutdown=false
-  max_subcompactions=1
-  bytes_per_sync=0
-  delayed_write_rate=16777216
-  max_background_compactions=-1
-  max_background_jobs=4
-  delete_obsolete_files_period_micros=21600000000
-  writable_file_max_buffer_size=1048576
-  follower_catchup_retry_wait_ms=100
-  file_checksum_gen_factory=nullptr
-  allow_data_in_errors=false
-  max_bgerror_resume_count=2147483647
-  best_efforts_recovery=false
-  write_dbid_to_manifest=false
-  atomic_flush=false
-  manual_wal_flush=false
-  two_write_queues=false
-  avoid_flush_during_recovery=false
-  dump_malloc_stats=false
-  info_log_level=HEADER_LEVEL
-  write_thread_slow_yield_usec=3
-  unordered_write=false
-  allow_ingest_behind=false
-  fail_if_options_file_error=true
-  persist_stats_to_disk=false
-  WAL_ttl_seconds=0
-  bgerror_resume_retry_interval=1000000
-  allow_concurrent_memtable_write=true
-  paranoid_checks=true
-  WAL_size_limit_MB=0
-  lowest_used_cache_tier=kNonVolatileBlockTier
-  keep_log_file_num=1000
-  table_cache_numshardbits=6
-  max_file_opening_threads=16
-  random_access_max_buffer_size=1048576
-  follower_refresh_catchup_period_ms=10000
-  log_readahead_size=0
-  enable_pipelined_write=false
-  wal_recovery_mode=kPointInTimeRecovery
-  follower_catchup_retry_count=10
-  db_write_buffer_size=0
-  allow_2pc=false
-  skip_checking_sst_file_sizes_on_db_open=false
-  skip_stats_update_on_db_open=false
-  recycle_log_file_num=0
-  db_host_id=__hostname__
-  track_and_verify_wals_in_manifest=false
-  use_fsync=false
-  wal_compression=kNoCompression
-  compaction_verify_record_count=true
-  error_if_exists=false
-  manifest_preallocation_size=4194304
-  is_fd_close_on_exec=true
-  enable_write_thread_adaptive_yield=true
-  enable_thread_tracking=false
-  avoid_unnecessary_blocking_io=true
-  allow_fallocate=true
-  max_log_file_size=0
-  advise_random_on_open=true
-  create_missing_column_families=true
-  max_write_batch_group_size_bytes=1048576
-  use_adaptive_mutex=false
-  wal_filter=nullptr
-  create_if_missing=true
-  enforce_single_del_contracts=true
-  allow_mmap_writes=false
-  verify_sst_unique_id_in_manifest=true
-  log_file_time_to_roll=0
-  use_direct_io_for_flush_and_compaction=false
-  flush_verify_memtable_count=true
-  max_manifest_file_size=1073741824
-  write_thread_max_yield_usec=100
-  use_direct_reads=false
-  allow_mmap_reads=false
-  
-
-[CFOptions "default"]
-  bottommost_file_compaction_delay=0
-  memtable_protection_bytes_per_key=0
-  compression_per_level=kNoCompression:kNoCompression:kZSTD:kZSTD:kZSTD:kZSTD:kZSTD
-  bottommost_compression=kDisableCompressionOption
-  sample_for_compression=0
-  blob_garbage_collection_age_cutoff=0.250000
-  blob_compression_type=kNoCompression
-  compression=kZSTD
-  default_write_temperature=kUnknown
-  last_level_temperature=kUnknown
-  compaction_options_universal={allow_trivial_move=false;stop_style=kCompactionStopStyleTotalSize;min_merge_width=2;compression_size_percent=-1;max_size_amplification_percent=200;incremental=false;max_merge_width=4294967295;size_ratio=1;}
-  target_file_size_base=16000000
-  memtable_whole_key_filtering=false
-  blob_file_starting_level=0
-  soft_pending_compaction_bytes_limit=68719476736
-  max_write_buffer_number=6
-  ttl=2592000
-  compaction_options_fifo={file_temperature_age_thresholds=;allow_compaction=false;age_for_warm=0;max_table_files_size=1073741824;}
-  memtable_huge_page_size=0
-  max_sequential_skip_in_iterations=8
-  strict_max_successive_merges=false
-  max_successive_merges=0
-  inplace_update_num_locks=10000
-  enable_blob_garbage_collection=false
-  arena_block_size=1048576
-  bottommost_compression_opts={use_zstd_dict_trainer=true;enabled=false;zstd_max_train_bytes=0;parallel_threads=1;max_compressed_bytes_per_kb=896;checksum=false;max_dict_bytes=0;strategy=0;max_dict_buffer_bytes=0;level=32767;window_bits=-14;}
-  target_file_size_multiplier=1
-  max_bytes_for_level_multiplier_additional=1:1:1:1:1:1:1
-  prepopulate_blob_cache=kDisable
-  blob_compaction_readahead_size=0
-  min_blob_size=0
-  level0_stop_writes_trigger=36
-  blob_garbage_collection_force_threshold=1.000000
-  enable_blob_files=false
-  level0_slowdown_writes_trigger=20
-  level0_file_num_compaction_trigger=2
-  block_protection_bytes_per_key=0
-  prefix_extractor=nullptr
-  max_bytes_for_level_multiplier=10.000000
-  write_buffer_size=67108864
-  disable_auto_compactions=false
-  max_compaction_bytes=400000000
-  memtable_max_range_deletions=0
-  compression_opts={use_zstd_dict_trainer=true;enabled=false;zstd_max_train_bytes=1638400;parallel_threads=1;max_compressed_bytes_per_kb=896;checksum=false;max_dict_bytes=16384;strategy=0;max_dict_buffer_bytes=0;level=32767;window_bits=-14;}
-  hard_pending_compaction_bytes_limit=274877906944
-  blob_file_size=268435456
-  periodic_compaction_seconds=0
-  paranoid_file_checks=false
-  experimental_mempurge_threshold=0.000000
-  memtable_prefix_bloom_size_ratio=0.000000
-  max_bytes_for_level_base=128000000
-  report_bg_io_stats=false
-  sst_partitioner_factory=nullptr
-  compaction_pri=kMinOverlappingRatio
-  compaction_style=kCompactionStyleLevel
-  compaction_filter_factory=nullptr
-  compaction_filter=nullptr
-  memtable_factory=SkipListFactory
-  comparator=leveldb.BytewiseComparator
-  bloom_locality=0
-  min_write_buffer_number_to_merge=2
-  table_factory=BlockBasedTable
-  max_write_buffer_size_to_maintain=0
-  max_write_buffer_number_to_maintain=0
-  optimize_filters_for_hits=false
-  default_temperature=kUnknown
-  preserve_internal_time_seconds=0
-  force_consistency_checks=true
-  merge_operator=nullptr
-  num_levels=7
-  memtable_insert_with_hint_prefix_extractor=nullptr
-  level_compaction_dynamic_level_bytes=true
-  persist_user_defined_timestamps=true
-  preclude_last_level_data_seconds=0
-  inplace_update_support=false
-  
-[TableOptions/BlockBasedTable "default"]
-  num_file_reads_for_auto_readahead=2
-  metadata_cache_options={unpartitioned_pinning=kFallback;partition_pinning=kFallback;top_level_index_pinning=kFallback;}
-  read_amp_bytes_per_bit=0
-  verify_compression=false
-  format_version=5
-  optimize_filters_for_memory=true
-  partition_filters=false
-  detect_filter_construct_corruption=false
-  initial_auto_readahead_size=8192
-  max_auto_readahead_size=262144
-  enable_index_compression=true
-  checksum=kXXH3
-  index_block_restart_interval=1
-  pin_top_level_index_and_filter=true
-  block_align=false
-  block_size=4096
-  index_type=kBinarySearch
-  filter_policy=bloomfilter:10:false
-  metadata_block_size=4096
-  no_block_cache=false
-  whole_key_filtering=true
-  index_shortening=kShortenSeparators
-  block_size_deviation=10
-  data_block_index_type=kDataBlockBinarySearch
-  use_delta_encoding=true
-  data_block_hash_table_util_ratio=0.750000
-  cache_index_and_filter_blocks=false
-  prepopulate_block_cache=kDisable
-  block_restart_interval=16
-  pin_l0_filter_and_index_blocks_in_cache=false
-  cache_index_and_filter_blocks_with_high_priority=true
-  flush_block_policy_factory=FlushBlockBySizePolicyFactory
-  

package/tmp/OPTIONS-000106

@@ -1,207 +0,0 @@
-# This is a RocksDB option file.
-#
-# For detailed file format spec, please refer to the example file
-# in examples/rocksdb_option_file_example.ini
-#
-
-[Version]
-  rocksdb_version=9.3.1
-  options_file_version=1.1
-
-[DBOptions]
-  max_background_flushes=-1
-  compaction_readahead_size=2097152
-  strict_bytes_per_sync=false
-  wal_bytes_per_sync=0
-  max_open_files=-1
-  stats_history_buffer_size=1048576
-  max_total_wal_size=0
-  stats_persist_period_sec=600
-  stats_dump_period_sec=600
-  avoid_flush_during_shutdown=false
-  max_subcompactions=1
-  bytes_per_sync=0
-  delayed_write_rate=16777216
-  max_background_compactions=-1
-  max_background_jobs=4
-  delete_obsolete_files_period_micros=21600000000
-  writable_file_max_buffer_size=1048576
-  follower_catchup_retry_wait_ms=100
-  file_checksum_gen_factory=nullptr
-  allow_data_in_errors=false
-  max_bgerror_resume_count=2147483647
-  best_efforts_recovery=false
-  write_dbid_to_manifest=false
-  atomic_flush=false
-  manual_wal_flush=false
-  two_write_queues=false
-  avoid_flush_during_recovery=false
-  dump_malloc_stats=false
-  info_log_level=HEADER_LEVEL
-  write_thread_slow_yield_usec=3
-  unordered_write=false
-  allow_ingest_behind=false
-  fail_if_options_file_error=true
-  persist_stats_to_disk=false
-  WAL_ttl_seconds=0
-  bgerror_resume_retry_interval=1000000
-  allow_concurrent_memtable_write=true
-  paranoid_checks=true
-  WAL_size_limit_MB=0
-  lowest_used_cache_tier=kNonVolatileBlockTier
-  keep_log_file_num=1000
-  table_cache_numshardbits=6
-  max_file_opening_threads=16
-  random_access_max_buffer_size=1048576
-  follower_refresh_catchup_period_ms=10000
-  log_readahead_size=0
-  enable_pipelined_write=false
-  wal_recovery_mode=kPointInTimeRecovery
-  follower_catchup_retry_count=10
-  db_write_buffer_size=0
-  allow_2pc=false
-  skip_checking_sst_file_sizes_on_db_open=false
-  skip_stats_update_on_db_open=false
-  recycle_log_file_num=0
-  db_host_id=__hostname__
-  track_and_verify_wals_in_manifest=false
-  use_fsync=false
-  wal_compression=kNoCompression
-  compaction_verify_record_count=true
-  error_if_exists=false
-  manifest_preallocation_size=4194304
-  is_fd_close_on_exec=true
-  enable_write_thread_adaptive_yield=true
-  enable_thread_tracking=false
-  avoid_unnecessary_blocking_io=true
-  allow_fallocate=true
-  max_log_file_size=0
-  advise_random_on_open=true
-  create_missing_column_families=true
-  max_write_batch_group_size_bytes=1048576
-  use_adaptive_mutex=false
-  wal_filter=nullptr
-  create_if_missing=true
-  enforce_single_del_contracts=true
-  allow_mmap_writes=false
-  verify_sst_unique_id_in_manifest=true
-  log_file_time_to_roll=0
-  use_direct_io_for_flush_and_compaction=false
-  flush_verify_memtable_count=true
-  max_manifest_file_size=1073741824
-  write_thread_max_yield_usec=100
-  use_direct_reads=false
-  allow_mmap_reads=false
-  
-
-[CFOptions "default"]
-  bottommost_file_compaction_delay=0
-  memtable_protection_bytes_per_key=0
-  compression_per_level=kNoCompression:kNoCompression:kZSTD:kZSTD:kZSTD:kZSTD:kZSTD
-  bottommost_compression=kDisableCompressionOption
-  sample_for_compression=0
-  blob_garbage_collection_age_cutoff=0.250000
-  blob_compression_type=kNoCompression
-  compression=kZSTD
-  default_write_temperature=kUnknown
-  last_level_temperature=kUnknown
-  compaction_options_universal={allow_trivial_move=false;stop_style=kCompactionStopStyleTotalSize;min_merge_width=2;compression_size_percent=-1;max_size_amplification_percent=200;incremental=false;max_merge_width=4294967295;size_ratio=1;}
-  target_file_size_base=16000000
-  memtable_whole_key_filtering=false
-  blob_file_starting_level=0
-  soft_pending_compaction_bytes_limit=68719476736
-  max_write_buffer_number=6
-  ttl=2592000
-  compaction_options_fifo={file_temperature_age_thresholds=;allow_compaction=false;age_for_warm=0;max_table_files_size=1073741824;}
-  memtable_huge_page_size=0
-  max_sequential_skip_in_iterations=8
-  strict_max_successive_merges=false
-  max_successive_merges=0
-  inplace_update_num_locks=10000
-  enable_blob_garbage_collection=false
-  arena_block_size=1048576
-  bottommost_compression_opts={use_zstd_dict_trainer=true;enabled=false;zstd_max_train_bytes=0;parallel_threads=1;max_compressed_bytes_per_kb=896;checksum=false;max_dict_bytes=0;strategy=0;max_dict_buffer_bytes=0;level=32767;window_bits=-14;}
-  target_file_size_multiplier=1
-  max_bytes_for_level_multiplier_additional=1:1:1:1:1:1:1
-  prepopulate_blob_cache=kDisable
-  blob_compaction_readahead_size=0
-  min_blob_size=0
-  level0_stop_writes_trigger=36
-  blob_garbage_collection_force_threshold=1.000000
-  enable_blob_files=false
-  level0_slowdown_writes_trigger=20
-  level0_file_num_compaction_trigger=2
-  block_protection_bytes_per_key=0
-  prefix_extractor=nullptr
-  max_bytes_for_level_multiplier=10.000000
-  write_buffer_size=67108864
-  disable_auto_compactions=false
-  max_compaction_bytes=400000000
-  memtable_max_range_deletions=0
-  compression_opts={use_zstd_dict_trainer=true;enabled=false;zstd_max_train_bytes=1638400;parallel_threads=1;max_compressed_bytes_per_kb=896;checksum=false;max_dict_bytes=16384;strategy=0;max_dict_buffer_bytes=0;level=32767;window_bits=-14;}
-  hard_pending_compaction_bytes_limit=274877906944
-  blob_file_size=268435456
-  periodic_compaction_seconds=0
-  paranoid_file_checks=false
-  experimental_mempurge_threshold=0.000000
-  memtable_prefix_bloom_size_ratio=0.000000
-  max_bytes_for_level_base=128000000
-  report_bg_io_stats=false
-  sst_partitioner_factory=nullptr
-  compaction_pri=kMinOverlappingRatio
-  compaction_style=kCompactionStyleLevel
-  compaction_filter_factory=nullptr
-  compaction_filter=nullptr
-  memtable_factory=SkipListFactory
-  comparator=leveldb.BytewiseComparator
-  bloom_locality=0
-  min_write_buffer_number_to_merge=2
-  table_factory=BlockBasedTable
-  max_write_buffer_size_to_maintain=0
-  max_write_buffer_number_to_maintain=0
-  optimize_filters_for_hits=false
-  default_temperature=kUnknown
-  preserve_internal_time_seconds=0
-  force_consistency_checks=true
-  merge_operator=nullptr
-  num_levels=7
-  memtable_insert_with_hint_prefix_extractor=nullptr
-  level_compaction_dynamic_level_bytes=true
-  persist_user_defined_timestamps=true
-  preclude_last_level_data_seconds=0
-  inplace_update_support=false
-  
-[TableOptions/BlockBasedTable "default"]
-  num_file_reads_for_auto_readahead=2
-  metadata_cache_options={unpartitioned_pinning=kFallback;partition_pinning=kFallback;top_level_index_pinning=kFallback;}
-  read_amp_bytes_per_bit=0
-  verify_compression=false
-  format_version=5
-  optimize_filters_for_memory=true
-  partition_filters=false
-  detect_filter_construct_corruption=false
-  initial_auto_readahead_size=8192
-  max_auto_readahead_size=262144
-  enable_index_compression=true
-  checksum=kXXH3
-  index_block_restart_interval=1
-  pin_top_level_index_and_filter=true
-  block_align=false
-  block_size=4096
-  index_type=kBinarySearch
-  filter_policy=bloomfilter:10:false
-  metadata_block_size=4096
-  no_block_cache=false
-  whole_key_filtering=true
-  index_shortening=kShortenSeparators
-  block_size_deviation=10
-  data_block_index_type=kDataBlockBinarySearch
-  use_delta_encoding=true
-  data_block_hash_table_util_ratio=0.750000
-  cache_index_and_filter_blocks=false
-  prepopulate_block_cache=kDisable
-  block_restart_interval=16
-  pin_l0_filter_and_index_blocks_in_cache=false
-  cache_index_and_filter_blocks_with_high_priority=true
-  flush_block_policy_factory=FlushBlockBySizePolicyFactory
-