rocksdb-native 3.7.2 → 3.7.4

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.2",
+  "version": "3.7.4",
   "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": {