rocksdb-native 3.10.1 → 3.11.1

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#8adf3cf")
 fetch_package("github:holepunchto/libjstl#098664c")
 
 add_bare_module(rocksdb_native_bare)

package/binding.cc

@@ -8,12 +8,6 @@
 #include <utf.h>
 #include <uv.h>
 
-#ifdef _WIN32
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
 using rocksdb_native_on_open_t = js_function_t<void, js_receiver_t, std::optional<js_string_t>>;
 using rocksdb_native_on_close_t = js_function_t<void, js_receiver_t>;
 using rocksdb_native_on_suspend_t = js_function_t<void, js_receiver_t, std::optional<js_string_t>>;
@@ -41,8 +35,6 @@ struct rocksdb_native_t {
   rocksdb_t handle;
   rocksdb_options_t options;
 
-  int lock;
-
   js_env_t *env;
   js_persistent_t<js_receiver_t> ctx;
 
@@ -276,18 +268,17 @@ rocksdb_native__on_close(rocksdb_close_t *handle, int status) {
 
   auto env = req->env;
 
-  auto lock = db->lock;
   auto teardown = db->teardown;
 
   if (db->exiting) {
-    db->ctx.reset();
-
     if (db->closing) {
       req->on_close.reset();
       req->ctx.reset();
     } else {
       free(req);
     }
+
+    db->ctx.reset();
   } else {
     js_handle_scope_t *scope;
     err = js_open_handle_scope(env, &scope);
@@ -301,24 +292,17 @@ rocksdb_native__on_close(rocksdb_close_t *handle, int status) {
     err = js_get_reference_value(env, req->on_close, cb);
     assert(err == 0);
 
-    db->ctx.reset();
     req->on_close.reset();
     req->ctx.reset();
 
+    db->ctx.reset();
+
     js_call_function_with_checkpoint(env, cb, ctx);
 
     err = js_close_handle_scope(env, scope);
     assert(err == 0);
   }
 
-  if (lock != -1) {
-#ifdef _WIN32
-    _close(lock);
-#else
-    close(lock);
-#endif
-  }
-
   err = js_finish_deferred_teardown_callback(teardown);
   assert(err == 0);
 }
@@ -357,8 +341,7 @@ rocksdb_native_init(
   bool avoid_unnecessary_blocking_io,
   bool skip_stats_update_on_db_open,
   bool use_direct_io_for_flush_and_compaction,
-  int32_t max_file_opening_threads,
-  int32_t lock
+  int32_t max_file_opening_threads
 ) {
   int err;
 
@@ -373,12 +356,11 @@ rocksdb_native_init(
   assert(err == 0);
 
   db->env = env;
-  db->lock = lock;
   db->closing = false;
   db->exiting = false;
 
   db->options = (rocksdb_options_t) {
-    1,
+    3,
     read_only,
     create_if_missing,
     create_missing_column_families,
@@ -389,7 +371,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);
@@ -411,6 +394,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
 ) {
@@ -447,12 +431,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;
   }
 
@@ -1314,7 +1306,7 @@ rocksdb_native_read(
   }
 
   rocksdb_read_options_t options = {
-    .version = 0,
+    .version = 1,
     .async_io = async_io,
     .fill_cache = fill_cache
   };

package/lib/state.js

@@ -28,8 +28,7 @@ module.exports = class RocksDBState extends ReadyResource {
       skipStatsUpdateOnOpen = false,
       useDirectIOForFlushAndCompaction = false,
       maxFileOpeningThreads = 16,
-      lock = -1,
-      preopen = null
+      lock = null
     } = opts
 
     this.path = path
@@ -46,7 +45,7 @@ module.exports = class RocksDBState extends ReadyResource {
     this._updating = false
     this._updatingSignal = new SignalPromise()
     this._columnsFlushed = false
-    this._preopen = preopen
+    this._lock = lock
     this._readBatches = []
     this._writeBatches = []
 
@@ -67,8 +66,7 @@ module.exports = class RocksDBState extends ReadyResource {
       avoidUnnecessaryBlockingIO,
       skipStatsUpdateOnOpen,
       useDirectIOForFlushAndCompaction,
-      maxFileOpeningThreads,
-      lock
+      maxFileOpeningThreads
     )
   }
 
@@ -138,9 +136,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._preopen) await this._preopen
+    if (this._lock) await this._lock.ready()
 
     const req = { resolve: null, reject: null, handle: null }
 
@@ -151,11 +149,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
     )
@@ -196,7 +197,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.1",
+  "version": "3.11.1",
   "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"
   }