rocksdb-native 3.10.0 → 3.11.0

package/CMakeLists.txt

@@ -9,7 +9,7 @@ project(rocksdb_native C CXX)
 
 bare_target(target)
 
-fetch_package("github:holepunchto/librocksdb#1fa9c8c")
+fetch_package("github:holepunchto/librocksdb#65ec235")
 fetch_package("github:holepunchto/libjstl#098664c")
 
 add_bare_module(rocksdb_native_bare)

package/binding.cc

@@ -359,7 +359,7 @@ rocksdb_native_init(
   db->exiting = false;
 
   db->options = (rocksdb_options_t) {
-    1,
+    3,
     read_only,
     create_if_missing,
     create_missing_column_families,
@@ -370,7 +370,8 @@ rocksdb_native_init(
     avoid_unnecessary_blocking_io,
     skip_stats_update_on_db_open,
     use_direct_io_for_flush_and_compaction,
-    max_file_opening_threads
+    max_file_opening_threads,
+    -1,
   };
 
   err = rocksdb_init(loop, &db->handle);
@@ -392,6 +393,7 @@ rocksdb_native_open(
   js_receiver_t self,
   char *path,
   js_array_t column_families_array,
+  int lock,
   js_receiver_t ctx,
   rocksdb_native_on_open_t on_open
 ) {
@@ -428,12 +430,20 @@ rocksdb_native_open(
   req->env = env;
   req->handle.data = req;
 
+  db->options.lock = lock;
+
   err = rocksdb_open(&db->handle, &req->handle, path, &db->options, column_families, handles, len, rocksdb_native__on_open);
 
   if (err < 0) {
     err = js_throw_error(env, uv_err_name(err), uv_strerror(err));
     assert(err == 0);
 
+    if (lock >= 0) {
+      uv_fs_t fs;
+      err = uv_fs_close(NULL, &fs, lock, NULL);
+      assert(err == 0);
+    }
+
     throw js_pending_exception;
   }
 
@@ -1295,7 +1305,7 @@ rocksdb_native_read(
   }
 
   rocksdb_read_options_t options = {
-    .version = 0,
+    .version = 1,
     .async_io = async_io,
     .fill_cache = fill_cache
   };
@@ -1790,6 +1800,13 @@ rocksdb_native_approximate_size(
   return handle;
 }
 
+static void
+rocksdb_native__on_snapshot_teardown(void *data) {
+  auto snapshot = reinterpret_cast<rocksdb_native_snapshot_t *>(data);
+
+  rocksdb_snapshot_destroy(&snapshot->handle);
+}
+
 static js_arraybuffer_t
 rocksdb_native_snapshot_create(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_native_t, 1> db) {
   int err;
@@ -1809,12 +1826,20 @@ rocksdb_native_snapshot_create(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_n
     throw js_pending_exception;
   }
 
+  err = js_add_teardown_callback(env, rocksdb_native__on_snapshot_teardown, snapshot);
+  assert(err == 0);
+
   return handle;
 }
 
 static void
 rocksdb_native_snapshot_destroy(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_native_snapshot_t, 1> snapshot) {
+  int err;
+
   rocksdb_snapshot_destroy(&snapshot->handle);
+
+  err = js_remove_teardown_callback(env, rocksdb_native__on_snapshot_teardown, snapshot);
+  assert(err == 0);
 }
 
 static js_value_t *

package/index.js

@@ -79,6 +79,8 @@ class RocksDB {
   }
 
   async close({ force } = {}) {
+    if (!this._state.opened) await this._state.ready()
+
     if (this._index !== -1) this._state.removeSession(this)
 
     if (force) {

package/lib/state.js

@@ -28,6 +28,7 @@ module.exports = class RocksDBState extends ReadyResource {
       skipStatsUpdateOnOpen = false,
       useDirectIOForFlushAndCompaction = false,
       maxFileOpeningThreads = 16,
+      lock = null,
       preopen = null
     } = opts
 
@@ -45,6 +46,7 @@ module.exports = class RocksDBState extends ReadyResource {
     this._updating = false
     this._updatingSignal = new SignalPromise()
     this._columnsFlushed = false
+    this._lock = lock
     this._preopen = preopen
     this._readBatches = []
     this._writeBatches = []
@@ -136,7 +138,9 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   async _open() {
-    await Promise.resolve() // allow column families to populate if ondemand
+    await Promise.resolve() // Allow column families to populate if on-demand
+
+    if (this._lock) await this._lock.ready()
 
     if (this._preopen) await this._preopen
 
@@ -149,11 +153,14 @@ module.exports = class RocksDBState extends ReadyResource {
 
     this._columnsFlushed = true
 
+    const lock = this._lock === null ? -1 : this._lock.transfer()
+
     req.handle = binding.open(
       this._handle,
       this,
       this.path,
       this.columnFamilies.map((c) => c._handle),
+      lock,
       req,
       onopen
     )
@@ -194,7 +201,11 @@ module.exports = class RocksDBState extends ReadyResource {
 
     req.handle = binding.close(this._handle, req, onclose)
 
-    await promise
+    try {
+      await promise
+    } finally {
+      if (this._lock) await this._lock.close()
+    }
 
     function onclose(err) {
       if (err) req.reject(new Error(err))

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "rocksdb-native",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",
     "./package": "./package.json"
   },
+  "imports": {
+    "fs": "bare-fs",
+    "default": "fs"
+  },
   "files": [
     "index.js",
     "binding.cc",
@@ -47,10 +51,12 @@
   },
   "devDependencies": {
     "bare-compat-napi": "^1.3.0",
+    "bare-fs": "^4.5.0",
     "brittle": "^3.5.0",
     "cmake-bare": "^1.1.14",
     "cmake-fetch": "^1.0.1",
     "cmake-napi": "^1.0.6",
+    "fd-lock": "^2.0.0",
     "prettier": "^3.6.2",
     "prettier-config-holepunch": "^2.0.0"
   }