rocksdb-native 3.4.1 → 3.5.1

package/CMakeLists.txt

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

package/binding.c

@@ -107,6 +107,16 @@ typedef struct {
   js_ref_t *on_status;
 } rocksdb_native_write_batch_t;
 
+typedef struct {
+  rocksdb_flush_t handle;
+
+  js_env_t *env;
+  js_ref_t *ctx;
+  js_ref_t *on_flush;
+
+  js_ref_t *column_family;
+} rocksdb_native_flush_t;
+
 typedef struct {
   rocksdb_snapshot_t handle;
 } rocksdb_native_snapshot_t;
@@ -180,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);
@@ -197,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);
@@ -378,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);
@@ -392,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;
@@ -1384,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;
 
@@ -1423,6 +1452,8 @@ rocksdb_native_read(js_env_t *env, js_callback_info_t *info) {
     }
   }
 
+  free(elements);
+
   rocksdb_read_options_t options = {
     .version = 0,
   };
@@ -1581,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;
 
@@ -1658,12 +1694,109 @@ 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);
 
   return NULL;
 }
 
+static void
+rocksdb_native__on_flush(rocksdb_flush_t *handle, int status) {
+  int err;
+
+  assert(status == 0);
+
+  rocksdb_native_flush_t *req = (rocksdb_native_flush_t *) handle->data;
+
+  rocksdb_native_t *db = (rocksdb_native_t *) req->handle.req.db;
+
+  js_env_t *env = req->env;
+
+  if (db->exiting) {
+    err = js_delete_reference(env, req->on_flush);
+    assert(err == 0);
+
+    err = js_delete_reference(env, req->ctx);
+    assert(err == 0);
+  } else {
+    js_handle_scope_t *scope;
+    err = js_open_handle_scope(env, &scope);
+    assert(err == 0);
+
+    js_value_t *error;
+
+    if (req->handle.error) {
+      err = js_create_string_utf8(env, (utf8_t *) req->handle.error, -1, &error);
+      assert(err == 0);
+    } else {
+      err = js_get_null(env, &error);
+      assert(err == 0);
+    }
+
+    js_value_t *ctx;
+    err = js_get_reference_value(env, req->ctx, &ctx);
+    assert(err == 0);
+
+    js_value_t *cb;
+    err = js_get_reference_value(env, req->on_flush, &cb);
+    assert(err == 0);
+
+    err = js_delete_reference(env, req->on_flush);
+    assert(err == 0);
+
+    err = js_delete_reference(env, req->ctx);
+    assert(err == 0);
+
+    js_call_function_with_checkpoint(env, ctx, cb, 1, (js_value_t *[]) {error}, NULL);
+
+    err = js_close_handle_scope(env, scope);
+    assert(err == 0);
+  }
+}
+
+static js_value_t *
+rocksdb_native_flush(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 4;
+  js_value_t *argv[4];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 4);
+
+  rocksdb_native_t *db;
+  err = js_get_arraybuffer_info(env, argv[0], (void **) &db, NULL);
+  assert(err == 0);
+
+  rocksdb_native_column_family_t *column_family;
+  err = js_get_arraybuffer_info(env, argv[1], (void **) &column_family, NULL);
+  assert(err == 0);
+
+  js_value_t *handle;
+
+  rocksdb_native_flush_t *req;
+  err = js_create_arraybuffer(env, sizeof(rocksdb_native_flush_t), (void **) &req, &handle);
+  assert(err == 0);
+
+  req->env = env;
+  req->handle.data = (void *) req;
+
+  err = js_create_reference(env, argv[2], 1, &req->ctx);
+  assert(err == 0);
+
+  err = js_create_reference(env, argv[3], 1, &req->on_flush);
+  assert(err == 0);
+
+  err = rocksdb_flush(&db->handle, &req->handle, column_family->handle, NULL, rocksdb_native__on_flush);
+  assert(err == 0);
+
+  return NULL;
+}
+
 static js_value_t *
 rocksdb_native_snapshot_create(js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -1749,6 +1882,8 @@ rocksdb_native_exports(js_env_t *env, js_value_t *exports) {
   V("writeBuffer", rocksdb_native_write_buffer)
   V("write", rocksdb_native_write)
 
+  V("flush", rocksdb_native_flush)
+
   V("snapshotCreate", rocksdb_native_snapshot_create)
   V("snapshotDestroy", rocksdb_native_snapshot_destroy)
 #undef V

package/index.js

@@ -134,6 +134,12 @@ class RocksDB {
     return this._state.createWriteBatch(this, opts)
   }
 
+  flush(opts) {
+    maybeClosed(this)
+
+    return this._state.flush(this, opts)
+  }
+
   async get(key, opts) {
     const batch = this.read({ ...opts, capacity: 1, autoDestroy: true })
     const value = batch.get(key)
@@ -166,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()
   }
 
@@ -175,7 +175,7 @@ exports.ReadBatch = class RocksDBReadBatch extends RocksDBBatch {
     await super._flush()
 
     binding.read(
-      this._db._state.handle,
+      this._db._state._handle,
       this._handle,
       this._operations,
       this._db._snapshot ? this._db._snapshot._handle : null,
@@ -242,7 +242,7 @@ exports.WriteBatch = class RocksDBWriteBatch extends RocksDBBatch {
     await super._flush()
 
     binding.write(
-      this._db._state.handle,
+      this._db._state._handle,
       this._handle,
       this._operations,
       this,

package/lib/column-family.js

@@ -19,6 +19,7 @@ class RocksDBColumnFamily {
     } = opts
 
     this._name = name
+    this._flushing = null
     this._options = {
       enableBlobFiles,
       minBlobSize,

package/lib/iterator.js

@@ -106,7 +106,7 @@ module.exports = class RocksDBIterator extends Readable {
     this._pendingOpen = cb
 
     binding.iteratorOpen(
-      this._db._state.handle,
+      this._db._state._handle,
       this._handle,
       this._db._columnFamily._handle,
       this._gt,

package/lib/snapshot.js

@@ -11,7 +11,7 @@ module.exports = class RocksDBSnapshot {
   }
 
   _init() {
-    this._handle = binding.snapshotCreate(this._state.handle)
+    this._handle = binding.snapshotCreate(this._state._handle)
   }
 
   ref() {

package/lib/state.js

@@ -25,6 +25,7 @@ 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
@@ -36,13 +37,15 @@ module.exports = class RocksDBState extends ReadyResource {
     this._readBatches = []
     this._writeBatches = []
 
-    for (const col of columnFamilies) {
+    for (const columnFamily of columnFamilies) {
       this.columnFamilies.push(
-        typeof col === 'string' ? new ColumnFamily(col, opts) : col
+        typeof columnFamily === 'string'
+          ? new ColumnFamily(columnFamily, opts)
+          : columnFamily
       )
     }
 
-    this.handle = binding.init(
+    this._handle = binding.init(
       readOnly,
       createIfMissing,
       createMissingColumnFamilies,
@@ -130,7 +133,7 @@ module.exports = class RocksDBState extends ReadyResource {
     this._columnsFlushed = true
 
     req.handle = binding.open(
-      this.handle,
+      this._handle,
       this,
       this.path,
       this.columnFamilies.map((c) => c._handle),
@@ -166,7 +169,7 @@ module.exports = class RocksDBState extends ReadyResource {
       req.reject = reject
     })
 
-    req.handle = binding.close(this.handle, req, onclose)
+    req.handle = binding.close(this._handle, req, onclose)
 
     await promise
 
@@ -176,15 +179,43 @@ module.exports = class RocksDBState extends ReadyResource {
     }
   }
 
+  async flush(db, opts) {
+    if (this.opened === false) await this.ready()
+
+    const req = { resolve: null, reject: null, handle: null }
+
+    const promise = new Promise((resolve, reject) => {
+      req.resolve = resolve
+      req.reject = reject
+    })
+
+    req.handle = binding.flush(
+      this._handle,
+      db._columnFamily._handle,
+      req,
+      onflush
+    )
+
+    await promise
+
+    function onflush(err) {
+      if (err) req.reject(new Error(err))
+      else req.resolve()
+    }
+  }
+
   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()
+
     const req = { resolve: null, reject: null, handle: null }
 
     const promise = new Promise((resolve, reject) => {
@@ -192,7 +223,7 @@ module.exports = class RocksDBState extends ReadyResource {
       req.reject = reject
     })
 
-    req.handle = binding.suspend(this.handle, req, onsuspend)
+    req.handle = binding.suspend(this._handle, req, onsuspend)
 
     try {
       await promise
@@ -209,12 +240,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 }
@@ -224,7 +256,7 @@ module.exports = class RocksDBState extends ReadyResource {
       req.reject = reject
     })
 
-    req.handle = binding.resume(this.handle, req, onresume)
+    req.handle = binding.resume(this._handle, req, onresume)
 
     try {
       await promise

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "3.4.1",
+  "version": "3.5.1",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/holepunchto/rocksdb-native",
   "engines": {
-    "bare": ">=1.7.0"
+    "bare": ">=1.16.0"
   },
   "dependencies": {
     "compact-encoding": "^2.15.0",
@@ -43,7 +43,7 @@
     "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",