rocksdb-native 3.5.0 → 3.5.2

package/CMakeLists.txt

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

package/binding.c

@@ -190,10 +190,15 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
       err = js_get_array_length(env, column_families, &len);
       assert(err == 0);
 
+      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);
+      assert(err == 0);
+      assert(fetched == len);
+
       for (uint32_t i = 0; i < len; i++) {
-        js_value_t *handle;
-        err = js_get_element(env, column_families, i, &handle);
-        assert(err == 0);
+        js_value_t *handle = elements[i];
 
         rocksdb_native_column_family_t *column_family;
         err = js_get_arraybuffer_info(env, handle, (void **) &column_family, NULL);
@@ -207,6 +212,8 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
         err = js_add_teardown_callback(env, rocksdb_native__on_column_family_teardown, (void *) column_family);
         assert(err == 0);
       }
+
+      free(elements);
     }
 
     js_call_function_with_checkpoint(env, ctx, cb, 1, (js_value_t *[]) {error}, NULL);
@@ -388,10 +395,15 @@ rocksdb_native_open(js_env_t *env, js_callback_info_t *info) {
 
   rocksdb_column_family_descriptor_t *column_families = calloc(len, sizeof(rocksdb_column_family_descriptor_t));
 
+  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);
+  assert(err == 0);
+  assert(fetched == len);
+
   for (uint32_t i = 0; i < len; i++) {
-    js_value_t *handle;
-    err = js_get_element(env, argv[3], i, &handle);
-    assert(err == 0);
+    js_value_t *handle = elements[i];
 
     rocksdb_native_column_family_t *column_family;
     err = js_get_arraybuffer_info(env, handle, (void **) &column_family, NULL);
@@ -402,6 +414,8 @@ rocksdb_native_open(js_env_t *env, js_callback_info_t *info) {
     column_family->db = &db->handle;
   }
 
+  free(elements);
+
   rocksdb_column_family_t **handles = calloc(len, sizeof(rocksdb_column_family_t *));
 
   js_value_t *handle;
@@ -1394,10 +1408,15 @@ rocksdb_native_read(js_env_t *env, js_callback_info_t *info) {
   err = js_create_reference(env, argv[5], 1, &req->on_status);
   assert(err == 0);
 
+  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);
+  assert(err == 0);
+  assert(fetched == len);
+
   for (uint32_t i = 0; i < len; i++) {
-    js_value_t *read;
-    err = js_get_element(env, argv[2], i, &read);
-    assert(err == 0);
+    js_value_t *read = elements[i];
 
     js_value_t *property;
 
@@ -1433,6 +1452,8 @@ rocksdb_native_read(js_env_t *env, js_callback_info_t *info) {
     }
   }
 
+  free(elements);
+
   rocksdb_read_options_t options = {
     .version = 0,
   };
@@ -1591,10 +1612,15 @@ rocksdb_native_write(js_env_t *env, js_callback_info_t *info) {
   err = js_create_reference(env, argv[4], 1, &req->on_status);
   assert(err == 0);
 
+  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);
+  assert(err == 0);
+  assert(fetched == len);
+
   for (uint32_t i = 0; i < len; i++) {
-    js_value_t *write;
-    err = js_get_element(env, argv[2], i, &write);
-    assert(err == 0);
+    js_value_t *write = elements[i];
 
     js_value_t *property;
 
@@ -1668,6 +1694,8 @@ rocksdb_native_write(js_env_t *env, js_callback_info_t *info) {
     }
   }
 
+  free(elements);
+
   err = rocksdb_write(&db->handle, &req->handle, req->writes, len, NULL, rocksdb_native__on_write);
   assert(err == 0);
 

package/index.js

@@ -172,10 +172,20 @@ class RocksDB {
     this._state.activity.inc()
   }
 
+  _refBatch() {
+    this._ref()
+    this._state.activeBatches.inc()
+  }
+
   _unref() {
     if (this._snapshot) this._snapshot.unref()
     this._state.activity.dec()
   }
+
+  _unrefBatch() {
+    this._unref()
+    this._state.activeBatches.dec()
+  }
 }
 
 module.exports = exports = RocksDB

package/lib/batch.js

@@ -8,7 +8,7 @@ class RocksDBBatch {
   constructor(db, opts = {}) {
     const { capacity = 8, autoDestroy = false } = opts
 
-    db._ref()
+    db._refBatch()
 
     this._db = db
     this._destroyed = false
@@ -32,7 +32,7 @@ class RocksDBBatch {
   _reuse(db, opts = {}) {
     const { autoDestroy = false } = opts
 
-    db._ref()
+    db._refBatch()
 
     this._db = db
     this._destroyed = false
@@ -81,7 +81,7 @@ class RocksDBBatch {
 
     if (this._promises.length) this._abort()
 
-    this._db._unref()
+    this._db._unrefBatch()
     this._onfree()
   }
 
@@ -101,12 +101,6 @@ class RocksDBBatch {
     if (this._request) throw new Error('Request in progress')
     if (this._destroyed) throw new Error('Batch is destroyed')
 
-    const state = this._db._state
-
-    if (state._suspending || state._suspended) {
-      throw new Error('Database is suspended')
-    }
-
     this._request = new Promise((resolve, reject) => {
       this._resolve = resolve
       this._reject = reject
@@ -121,19 +115,22 @@ class RocksDBBatch {
     if (this._request) throw new Error('Request in progress')
     if (this._destroyed) throw new Error('Batch is destroyed')
 
-    const state = this._db._state
-
-    if (state._suspending || state._suspended) {
-      throw new Error('Database is suspended')
-    }
-
     this._request = resolved
 
     this._flush()
   }
 
   async _flush() {
+    const state = this._db._state
+
     if (this._handle === null) await this.ready()
+    if (state.resumed !== null) await state.resumed.promise
+
+    if ((state._suspending || state._suspended) && !this._destroyed) {
+      this._destroyed = true
+      this._abort()
+      this._db._unrefBatch()
+    }
   }
 
   _enqueuePromise(resolve, reject) {
@@ -173,6 +170,7 @@ exports.ReadBatch = class RocksDBReadBatch extends RocksDBBatch {
 
   async _flush() {
     await super._flush()
+    if (this._destroyed) return
 
     binding.read(
       this._db._state._handle,
@@ -240,6 +238,7 @@ exports.WriteBatch = class RocksDBWriteBatch extends RocksDBBatch {
 
   async _flush() {
     await super._flush()
+    if (this._destroyed) return
 
     binding.write(
       this._db._state._handle,

package/lib/state.js

@@ -1,5 +1,6 @@
 const ReadyResource = require('ready-resource')
 const RefCounter = require('refcounter')
+const rrp = require('resolve-reject-promise')
 const { ReadBatch, WriteBatch } = require('./batch')
 const ColumnFamily = require('./column-family')
 const binding = require('../binding')
@@ -25,9 +26,11 @@ module.exports = class RocksDBState extends ReadyResource {
     this.path = path
     this.db = db
     this.activity = new RefCounter()
+    this.activeBatches = new RefCounter()
     this.sessions = []
     this.columnFamilies = [columnFamily]
     this.deferSnapshotInit = true
+    this.resumed = null
 
     this._suspended = false
     this._suspending = null
@@ -154,6 +157,7 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   async _close() {
+    if (this.resumed) this.resumed.resolve(false)
     while (!this.activity.isIdle()) await this.activity.idle()
 
     while (this.sessions.length > 0)
@@ -204,14 +208,18 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   async suspend() {
+    if (this._suspended === true) return
     if (this._suspending === null) this._suspending = this._suspend()
     return this._suspending
   }
 
   async _suspend() {
-    if (this._resuming) await this._resuming
+    if (this._resuming !== null) await this._resuming
     if (this.opened === false) await this.ready()
 
+    while (!this.activeBatches.isIdle()) await this.activeBatches.idle()
+    this.resumed = rrp()
+
     const req = { resolve: null, reject: null, handle: null }
 
     const promise = new Promise((resolve, reject) => {
@@ -236,12 +244,13 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   resume() {
+    if (this._suspended === false) return
     if (this._resuming === null) this._resuming = this._resume()
     return this._resuming
   }
 
   async _resume() {
-    if (this._suspending) await this._suspending
+    if (this._suspending !== null) await this._suspending
     if (this.opened === false) await this.ready()
 
     const req = { resolve: null, reject: null, handle: null }
@@ -261,6 +270,10 @@ module.exports = class RocksDBState extends ReadyResource {
       this._resuming = null
     }
 
+    const resumed = this.resumed
+    this.resumed = null
+    resumed.resolve(true)
+
     function onresume(err) {
       if (err) req.reject(new Error(err))
       else req.resolve()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -33,17 +33,18 @@
   },
   "homepage": "https://github.com/holepunchto/rocksdb-native",
   "engines": {
-    "bare": ">=1.7.0"
+    "bare": ">=1.16.0"
   },
   "dependencies": {
     "compact-encoding": "^2.15.0",
     "ready-resource": "^1.0.0",
     "refcounter": "^1.0.0",
     "require-addon": "^1.0.2",
+    "resolve-reject-promise": "^1.1.0",
     "streamx": "^2.16.1"
   },
   "devDependencies": {
-    "bare-compat-napi": "^1.1.0",
+    "bare-compat-napi": "^1.3.0",
     "brittle": "^3.5.0",
     "cmake-bare": "^1.1.14",
     "cmake-fetch": "^1.0.1",