rocksdb-native 3.5.4 → 3.5.5

package/CMakeLists.txt

@@ -13,7 +13,7 @@ if(target MATCHES "win32")
   add_compile_options(/MT$<$<CONFIG:Debug>:d>)
 endif()
 
-fetch_package("github:holepunchto/librocksdb#d2b6760")
+fetch_package("github:holepunchto/librocksdb#dbebf66")
 
 add_bare_module(rocksdb_native_bare)
 

package/binding.c

@@ -192,10 +192,8 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
 
       js_value_t **elements = malloc(len * sizeof(js_value_t *));
 
-      uint32_t fetched;
-      err = js_get_array_elements(env, column_families, elements, len, 0, &fetched);
+      err = js_get_array_elements(env, column_families, elements, len, 0, NULL);
       assert(err == 0);
-      assert(fetched == len);
 
       for (uint32_t i = 0; i < len; i++) {
         js_value_t *handle = elements[i];
@@ -397,10 +395,8 @@ rocksdb_native_open(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t **elements = malloc(len * sizeof(js_value_t *));
 
-  uint32_t fetched;
-  err = js_get_array_elements(env, argv[3], elements, len, 0, &fetched);
+  err = js_get_array_elements(env, argv[3], elements, len, 0, NULL);
   assert(err == 0);
-  assert(fetched == len);
 
   for (uint32_t i = 0; i < len; i++) {
     js_value_t *handle = elements[i];
@@ -1410,10 +1406,8 @@ rocksdb_native_read(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t **elements = malloc(len * sizeof(js_value_t *));
 
-  uint32_t fetched;
-  err = js_get_array_elements(env, argv[2], elements, len, 0, &fetched);
+  err = js_get_array_elements(env, argv[2], elements, len, 0, NULL);
   assert(err == 0);
-  assert(fetched == len);
 
   for (uint32_t i = 0; i < len; i++) {
     js_value_t *read = elements[i];
@@ -1614,10 +1608,8 @@ rocksdb_native_write(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t **elements = malloc(len * sizeof(js_value_t *));
 
-  uint32_t fetched;
-  err = js_get_array_elements(env, argv[2], elements, len, 0, &fetched);
+  err = js_get_array_elements(env, argv[2], elements, len, 0, NULL);
   assert(err == 0);
-  assert(fetched == len);
 
   for (uint32_t i = 0; i < len; i++) {
     js_value_t *write = elements[i];

package/lib/batch.js

@@ -96,6 +96,8 @@ class RocksDBBatch {
       const promise = this._promises[i]
       if (promise !== null) promise.reject(new Error('Batch is destroyed'))
     }
+
+    this._onfinished(new Error('Batch is destroyed'))
   }
 
   async flush() {
@@ -129,11 +131,14 @@ class RocksDBBatch {
     if (this._db._state.resumed !== null) {
       const resumed = await this._db._state.resumed.promise
 
-      if (!resumed && !this._destroyed) {
-        this._destroyed = true
-        this._abort()
-        this._db._state.io.dec()
-        this._db._unref()
+      if (!resumed) {
+        if (this._destroyed) {
+          this._db._state.io.dec()
+        } else {
+          this._destroyed = true
+          this._abort()
+          this._db._unref()
+        }
       }
     }
   }

package/lib/iterator.js

@@ -75,6 +75,7 @@ module.exports = class RocksDBIterator extends Readable {
   _onclose(err) {
     const cb = this._pendingDestroy
     this._pendingDestroy = null
+    this._db._state.io.dec()
     this._db._unref()
     cb(err)
   }
@@ -115,43 +116,70 @@ module.exports = class RocksDBIterator extends Readable {
 
     this._pendingOpen = cb
 
-    binding.iteratorOpen(
-      this._db._state._handle,
-      this._handle,
-      this._db._columnFamily._handle,
-      this._gt,
-      this._gte,
-      this._lt,
-      this._lte,
-      this._reverse,
-      this._db._snapshot ? this._db._snapshot._handle : null,
-      this,
-      this._onopen,
-      this._onclose,
-      this._onread
-    )
+    try {
+      binding.iteratorOpen(
+        this._db._state._handle,
+        this._handle,
+        this._db._columnFamily._handle,
+        this._gt,
+        this._gte,
+        this._lt,
+        this._lte,
+        this._reverse,
+        this._db._snapshot ? this._db._snapshot._handle : null,
+        this,
+        this._onopen,
+        this._onclose,
+        this._onread
+      )
+    } catch (err) {
+      this._db._state.io.dec()
+      throw err
+    }
   }
 
   async _read(cb) {
+    this._db._state.io.inc()
+
     if (this._db._state.resumed !== null) {
-      await this._db._state.resumed.promise
+      const resumed = await this._db._state.resumed.promise
+
+      if (!resumed) {
+        this._db._state.io.dec()
+
+        return cb(new Error('RocksDB session is closed'))
+      }
     }
 
     this._pendingRead = cb
 
-    binding.iteratorRead(this._handle, Math.min(this._capacity, this._limit))
-
-    this._db._state.io.inc()
+    try {
+      binding.iteratorRead(this._handle, Math.min(this._capacity, this._limit))
+    } catch (err) {
+      this._db._state.io.dec()
+      throw err
+    }
   }
 
   async _destroy(cb) {
     await this.ready()
 
+    this._db._state.io.inc()
+
     this._pendingDestroy = cb
 
-    if (this._opened === false) return this._onclose(null)
+    if (this._opened === false) {
+      this._db._state.io.dec()
+
+      return this._onclose(null)
+    }
 
-    binding.iteratorClose(this._handle)
+    try {
+      binding.iteratorClose(this._handle)
+    } catch (err) {
+      this._db._state.io.dec()
+      throw err
+    }
   }
 
   _encodeKey(k) {

package/lib/state.js

@@ -160,6 +160,7 @@ module.exports = class RocksDBState extends ReadyResource {
   async _close() {
     if (this.resumed) this.resumed.resolve(false)
 
+    while (!this.io.isIdle()) await this.io.idle()
     while (!this.handles.isIdle()) await this.handles.idle()
 
     while (this.sessions.length > 0) {
@@ -188,14 +189,12 @@ module.exports = class RocksDBState extends ReadyResource {
   async flush(db, opts) {
     if (this.opened === false) await this.ready()
 
-    this.handles.inc()
     this.io.inc()
 
     if (this.resumed !== null) {
       const resumed = await this.resumed.promise
 
       if (!resumed) {
-        this.handles.dec()
         this.io.dec()
 
         throw new Error('RocksDB session is closed')
@@ -219,7 +218,6 @@ module.exports = class RocksDBState extends ReadyResource {
 
       await promise
     } finally {
-      this.handles.dec()
       this.io.dec()
     }
 
@@ -241,6 +239,7 @@ module.exports = class RocksDBState extends ReadyResource {
 
     while (!this.io.isIdle()) await this.io.idle()
 
+    this.io.inc()
     this.resumed = rrp()
 
     const req = { resolve: null, reject: null, handle: null }
@@ -257,6 +256,8 @@ module.exports = class RocksDBState extends ReadyResource {
 
       this._suspended = true
     } finally {
+      this.io.dec()
+
       this._suspending = null
     }
 
@@ -276,6 +277,8 @@ module.exports = class RocksDBState extends ReadyResource {
     if (this._suspending !== null) await this._suspending
     if (this._suspended === false) return
 
+    this.io.inc()
+
     const req = { resolve: null, reject: null, handle: null }
 
     const promise = new Promise((resolve, reject) => {
@@ -290,6 +293,8 @@ module.exports = class RocksDBState extends ReadyResource {
 
       this._suspended = false
     } finally {
+      this.io.dec()
+
       this._resuming = null
     }
 

package/package.json

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