rocksdb-native 3.7.3 → 3.7.5

package/binding.cc

@@ -94,7 +94,7 @@ struct rocksdb_native_iterator_t {
   js_persistent_t<cb_on_iterator_close_t> on_close;
   js_persistent_t<cb_on_iterator_read_t> on_read;
 
-  bool closing;
+  bool active;
   bool exiting;
 
   js_deferred_teardown_t *teardown;
@@ -717,7 +717,7 @@ rocksdb_native_iterator_init(js_env_t *env) {
   assert(err == 0);
 
   req->env = env;
-  req->closing = false;
+  req->active = false;
   req->exiting = false;
   req->handle.data = req;
 
@@ -757,6 +757,8 @@ rocksdb_native__on_iterator_close(rocksdb_iterator_t *handle, int status) {
 
   rocksdb_native_iterator_t *req = (rocksdb_native_iterator_t *) handle->data;
 
+  req->active = false;
+
   js_env_t *env = req->env;
 
   js_deferred_teardown_t *teardown = req->teardown;
@@ -809,33 +811,38 @@ rocksdb_native__on_iterator_open(rocksdb_iterator_t *handle, int status) {
 
   rocksdb_native_iterator_t *req = (rocksdb_native_iterator_t *) handle->data;
 
-  if (req->exiting) return;
+  req->active = false;
 
-  js_env_t *env = req->env;
+  if (req->exiting) {
+    err = rocksdb_iterator_close(&req->handle, rocksdb_native__on_iterator_close);
+    assert(err == 0);
+  } else {
+    js_env_t *env = req->env;
 
-  js_handle_scope_t *scope;
-  err = js_open_handle_scope(env, &scope);
-  assert(err == 0);
+    js_handle_scope_t *scope;
+    err = js_open_handle_scope(env, &scope);
+    assert(err == 0);
 
-  js_receiver_t ctx;
-  err = js_get_reference_value(env, req->ctx, ctx);
-  assert(err == 0);
+    js_receiver_t ctx;
+    err = js_get_reference_value(env, req->ctx, ctx);
+    assert(err == 0);
 
-  cb_on_iterator_open_t cb;
-  err = js_get_reference_value(env, req->on_open, cb);
-  assert(err == 0);
+    cb_on_iterator_open_t cb;
+    err = js_get_reference_value(env, req->on_open, cb);
+    assert(err == 0);
 
-  std::optional<js_string_t> error;
+    std::optional<js_string_t> error;
 
-  if (req->handle.error) {
-    err = js_create_string(env, req->handle.error, error.emplace());
-    assert(err == 0);
-  }
+    if (req->handle.error) {
+      err = js_create_string(env, req->handle.error, error.emplace());
+      assert(err == 0);
+    }
 
-  js_call_function_with_checkpoint(env, cb, ctx, error);
+    js_call_function_with_checkpoint(env, cb, ctx, error);
 
-  err = js_close_handle_scope(env, scope);
-  assert(err == 0);
+    err = js_close_handle_scope(env, scope);
+    assert(err == 0);
+  }
 }
 
 static void
@@ -846,7 +853,7 @@ rocksdb_native__on_iterator_teardown(js_deferred_teardown_t *handle, void *data)
 
   req->exiting = true;
 
-  if (req->closing) return;
+  if (req->active) return;
 
   err = rocksdb_iterator_close(&req->handle, rocksdb_native__on_iterator_close);
   assert(err == 0);
@@ -872,6 +879,8 @@ rocksdb_native_iterator_open(
 ) {
   int err;
 
+  req->active = true;
+
   rocksdb_range_t range;
 
   err = js_get_typedarray_info(env, gt, range.gt.data, range.gt.len);
@@ -920,7 +929,7 @@ static void
 rocksdb_native_iterator_close(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_native_iterator_t, 1> req) {
   int err;
 
-  req->closing = true;
+  req->active = true;
 
   err = rocksdb_iterator_close(&req->handle, rocksdb_native__on_iterator_close);
   assert(err == 0);
@@ -944,6 +953,8 @@ rocksdb_native__on_iterator_read(rocksdb_iterator_t *handle, int status) {
 
   rocksdb_native_iterator_t *req = (rocksdb_native_iterator_t *) handle->data;
 
+  req->active = false;
+
   rocksdb_native_t *db = (rocksdb_native_t *) req->handle.req.db;
 
   size_t len = req->handle.len;
@@ -958,6 +969,9 @@ rocksdb_native__on_iterator_read(rocksdb_iterator_t *handle, int status) {
         rocksdb_slice_destroy(&req->values[i]);
       }
     }
+
+    err = rocksdb_iterator_close(&req->handle, rocksdb_native__on_iterator_close);
+    assert(err == 0);
   } else {
     js_env_t *env = req->env;
 
@@ -1019,6 +1033,8 @@ rocksdb_native_iterator_read(
 ) {
   int err;
 
+  req->active = true;
+
   err = rocksdb_iterator_read(&req->handle, req->keys, req->values, capacity, rocksdb_native__on_iterator_read);
   assert(err == 0);
 }

package/lib/state.js

@@ -1,6 +1,7 @@
 const ReadyResource = require('ready-resource')
 const RefCounter = require('refcounter')
 const rrp = require('resolve-reject-promise')
+const SignalPromise = require('signal-promise')
 const { ReadBatch, WriteBatch } = require('./batch')
 const ColumnFamily = require('./column-family')
 const binding = require('../binding')
@@ -33,8 +34,9 @@ module.exports = class RocksDBState extends ReadyResource {
     this.resumed = null
 
     this._suspended = false
-    this._suspending = null
-    this._resuming = null
+    this._suspending = false
+    this._updating = false
+    this._updatingSignal = new SignalPromise()
     this._columnsFlushed = false
     this._readBatches = []
     this._writeBatches = []
@@ -158,6 +160,7 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   async _close() {
+    while (this._updating) await this._updatingSignal.wait()
     if (this.resumed) this.resumed.resolve(false)
 
     while (!this.io.isIdle()) await this.io.idle()
@@ -227,20 +230,30 @@ module.exports = class RocksDBState extends ReadyResource {
     }
   }
 
-  async suspend() {
-    if (this._suspending === null) this._suspending = this._suspend()
-    return this._suspending
+  suspend() {
+    this._suspending = true
+    return this.update()
   }
 
-  async _suspend() {
-    if (this.opened === false) await this.ready()
-
-    this.io.inc()
-
-    if (this._resuming !== null) await this._resuming
+  resume() {
+    this._suspending = false
+    return this.update()
+  }
 
-    this.io.dec()
+  async update() {
+    while (this._updating) await this._updatingSignal.wait()
+    if (this._suspending === this._suspended || this.closing) return
+    this._updating = true
+    try {
+      if (this._suspending) await this._suspend()
+      else await this._resume()
+    } finally {
+      this._updating = false
+      this._updatingSignal.notify()
+    }
+  }
 
+  async _suspend() {
     if (this._suspended === true) return
 
     while (!this.io.isIdle()) await this.io.idle()
@@ -263,8 +276,6 @@ module.exports = class RocksDBState extends ReadyResource {
       this._suspended = true
     } finally {
       this.io.dec()
-
-      this._suspending = null
     }
 
     function onsuspend(err) {
@@ -273,19 +284,8 @@ module.exports = class RocksDBState extends ReadyResource {
     }
   }
 
-  resume() {
-    if (this._resuming === null) this._resuming = this._resume()
-    return this._resuming
-  }
-
   async _resume() {
-    if (this.opened === false) await this.ready()
-
-    this.io.inc()
-
-    if (this._suspending !== null) await this._suspending
-
-    if (this._suspended === false) return this.io.dec()
+    if (this._suspended === false) return
 
     const req = { resolve: null, reject: null, handle: null }
 
@@ -294,17 +294,11 @@ module.exports = class RocksDBState extends ReadyResource {
       req.reject = reject
     })
 
-    try {
-      req.handle = binding.resume(this._handle, req, onresume)
-
-      await promise
+    req.handle = binding.resume(this._handle, req, onresume)
 
-      this._suspended = false
-    } finally {
-      this.io.dec()
+    await promise
 
-      this._resuming = null
-    }
+    this._suspended = false
 
     const resumed = this.resumed
     this.resumed = null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "3.7.3",
+  "version": "3.7.5",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -41,6 +41,7 @@
     "refcounter": "^1.0.0",
     "require-addon": "^1.0.2",
     "resolve-reject-promise": "^1.1.0",
+    "signal-promise": "^1.0.3",
     "streamx": "^2.16.1"
   },
   "devDependencies": {