rocksdb-native 3.9.3 → 3.10.1

package/binding.cc

@@ -8,6 +8,12 @@
 #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>>;
@@ -35,6 +41,8 @@ struct rocksdb_native_t {
   rocksdb_t handle;
   rocksdb_options_t options;
 
+  int lock;
+
   js_env_t *env;
   js_persistent_t<js_receiver_t> ctx;
 
@@ -268,6 +276,7 @@ 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) {
@@ -302,6 +311,14 @@ rocksdb_native__on_close(rocksdb_close_t *handle, int status) {
     assert(err == 0);
   }
 
+  if (lock != -1) {
+#ifdef _WIN32
+    _close(lock);
+#else
+    close(lock);
+#endif
+  }
+
   err = js_finish_deferred_teardown_callback(teardown);
   assert(err == 0);
 }
@@ -340,7 +357,8 @@ 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 max_file_opening_threads,
+  int32_t lock
 ) {
   int err;
 
@@ -355,6 +373,7 @@ rocksdb_native_init(
   assert(err == 0);
 
   db->env = env;
+  db->lock = lock;
   db->closing = false;
   db->exiting = false;
 
@@ -1790,6 +1809,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 +1835,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/batch.js

@@ -214,18 +214,14 @@ exports.ReadBatch = class RocksDBReadBatch extends RocksDBBatch {
     let applied = true
 
     for (let i = 0, n = this._promises.length; i < n; i++) {
-      const promise = this._promises[i]
-      if (promise === null) continue
-
       const err = errs[i]
+      if (err) applied = false
 
-      if (err) {
-        applied = false
+      const promise = this._promises[i]
+      if (promise === null) continue
 
-        promise.reject(new Error(err))
-      } else {
-        promise.resolve(values[i] ? this._decodeValue(Buffer.from(values[i])) : null)
-      }
+      if (err) promise.reject(new Error(err))
+      else promise.resolve(values[i] ? this._decodeValue(Buffer.from(values[i])) : null)
     }
 
     this._onfinished(applied ? null : new Error('Batch was not applied'))
@@ -274,19 +270,14 @@ exports.WriteBatch = class RocksDBWriteBatch extends RocksDBBatch {
   }
 
   _onwrite(err) {
-    let applied = true
+    const applied = !err
 
     for (let i = 0, n = this._promises.length; i < n; i++) {
       const promise = this._promises[i]
       if (promise === null) continue
 
-      if (err) {
-        applied = false
-
-        promise.reject(new Error(err))
-      } else {
-        promise.resolve()
-      }
+      if (err) promise.reject(new Error(err))
+      else promise.resolve()
     }
 
     this._onfinished(applied ? null : new Error('Batch was not applied'))

package/lib/state.js

@@ -27,7 +27,9 @@ module.exports = class RocksDBState extends ReadyResource {
       avoidUnnecessaryBlockingIO = false,
       skipStatsUpdateOnOpen = false,
       useDirectIOForFlushAndCompaction = false,
-      maxFileOpeningThreads = 16
+      maxFileOpeningThreads = 16,
+      lock = -1,
+      preopen = null
     } = opts
 
     this.path = path
@@ -44,6 +46,7 @@ module.exports = class RocksDBState extends ReadyResource {
     this._updating = false
     this._updatingSignal = new SignalPromise()
     this._columnsFlushed = false
+    this._preopen = preopen
     this._readBatches = []
     this._writeBatches = []
 
@@ -64,7 +67,8 @@ module.exports = class RocksDBState extends ReadyResource {
       avoidUnnecessaryBlockingIO,
       skipStatsUpdateOnOpen,
       useDirectIOForFlushAndCompaction,
-      maxFileOpeningThreads
+      maxFileOpeningThreads,
+      lock
     )
   }
 
@@ -136,6 +140,8 @@ module.exports = class RocksDBState extends ReadyResource {
   async _open() {
     await Promise.resolve() // allow column families to populate if ondemand
 
+    if (this._preopen) await this._preopen
+
     const req = { resolve: null, reject: null, handle: null }
 
     const promise = new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "3.9.3",
+  "version": "3.10.1",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",