rocksdb-native 3.5.5 → 3.5.7

package/CMakeLists.txt

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

package/binding.c

@@ -85,7 +85,6 @@ typedef struct {
   rocksdb_read_batch_t handle;
 
   rocksdb_read_t *reads;
-  char **errors;
 
   size_t capacity;
 
@@ -98,7 +97,6 @@ typedef struct {
   rocksdb_write_batch_t handle;
 
   rocksdb_write_t *writes;
-  char **errors;
 
   size_t capacity;
 
@@ -141,6 +139,10 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
 
   js_env_t *env = req->env;
 
+  const rocksdb_column_family_descriptor_t *descriptors = handle->column_families;
+
+  rocksdb_column_family_t **handles = handle->handles;
+
   if (db->exiting) {
     err = js_delete_reference(env, req->on_open);
     assert(err == 0);
@@ -220,9 +222,9 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
     assert(err == 0);
   }
 
-  free((void *) handle->column_families);
+  free((void *) descriptors);
 
-  free(handle->handles);
+  free(handles);
 }
 
 static void
@@ -1264,19 +1266,12 @@ rocksdb_native_read_buffer(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t *handle;
 
-  uint8_t *data;
-  err = js_create_arraybuffer(env, capacity * sizeof(rocksdb_read_t) + capacity * sizeof(char *), (void **) &data, &handle);
+  rocksdb_read_t *reads;
+  err = js_create_arraybuffer(env, capacity * sizeof(rocksdb_read_t), (void **) &reads, &handle);
   assert(err == 0);
 
   req->capacity = capacity;
-
-  size_t offset = 0;
-
-  req->reads = (rocksdb_read_t *) &data[offset];
-
-  offset += capacity * sizeof(rocksdb_read_t);
-
-  req->errors = (char **) &data[offset];
+  req->reads = reads;
 
   return handle;
 }
@@ -1300,7 +1295,7 @@ rocksdb_native__on_read(rocksdb_read_batch_t *handle, int status) {
       for (size_t i = 0; i < len; i++) {
         js_value_t *result;
 
-        char *error = req->errors[i];
+        char *error = req->handle.errors[i];
 
         if (error) continue;
 
@@ -1329,7 +1324,7 @@ rocksdb_native__on_read(rocksdb_read_batch_t *handle, int status) {
     for (size_t i = 0; i < len; i++) {
       js_value_t *result;
 
-      char *error = req->errors[i];
+      char *error = req->handle.errors[i];
 
       if (error) {
         err = js_create_string_utf8(env, (utf8_t *) error, -1, &result);
@@ -1461,7 +1456,7 @@ rocksdb_native_read(js_env_t *env, js_callback_info_t *info) {
     assert(err == 0);
   }
 
-  err = rocksdb_read(&db->handle, &req->handle, req->reads, req->errors, len, &options, rocksdb_native__on_read);
+  err = rocksdb_read(&db->handle, &req->handle, req->reads, len, &options, rocksdb_native__on_read);
   assert(err == 0);
 
   return NULL;
@@ -1505,19 +1500,12 @@ rocksdb_native_write_buffer(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t *handle;
 
-  uint8_t *data;
-  err = js_create_arraybuffer(env, capacity * sizeof(rocksdb_write_t) + capacity * sizeof(char *), (void **) &data, &handle);
+  rocksdb_write_t *writes;
+  err = js_create_arraybuffer(env, capacity * sizeof(rocksdb_write_t), (void **) &writes, &handle);
   assert(err == 0);
 
   req->capacity = capacity;
-
-  size_t offset = 0;
-
-  req->writes = (rocksdb_write_t *) &data[offset];
-
-  offset += capacity * sizeof(rocksdb_write_t);
-
-  req->errors = (char **) &data[offset];
+  req->writes = writes;
 
   return handle;
 }
@@ -1786,7 +1774,7 @@ rocksdb_native_flush(js_env_t *env, js_callback_info_t *info) {
   err = rocksdb_flush(&db->handle, &req->handle, column_family->handle, NULL, rocksdb_native__on_flush);
   assert(err == 0);
 
-  return NULL;
+  return handle;
 }
 
 static js_value_t *

package/lib/state.js

@@ -234,7 +234,13 @@ module.exports = class RocksDBState extends ReadyResource {
 
   async _suspend() {
     if (this.opened === false) await this.ready()
+
+    this.io.inc()
+
     if (this._resuming !== null) await this._resuming
+
+    this.io.dec()
+
     if (this._suspended === true) return
 
     while (!this.io.isIdle()) await this.io.idle()
@@ -274,11 +280,13 @@ module.exports = class RocksDBState extends ReadyResource {
 
   async _resume() {
     if (this.opened === false) await this.ready()
-    if (this._suspending !== null) await this._suspending
-    if (this._suspended === false) return
 
     this.io.inc()
 
+    if (this._suspending !== null) await this._suspending
+
+    if (this._suspended === false) return this.io.dec()
+
     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.5.5",
+  "version": "3.5.7",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",