rocksdb-native 3.7.4 → 3.8.0

package/CMakeLists.txt

@@ -9,7 +9,7 @@ project(rocksdb_native C CXX)
 
 bare_target(target)
 
-fetch_package("github:holepunchto/librocksdb#46df5ef")
+fetch_package("github:holepunchto/librocksdb#ac350df")
 fetch_package("github:holepunchto/libjstl#34a7894")
 
 add_bare_module(rocksdb_native_bare)

package/binding.cc

@@ -23,6 +23,7 @@ using cb_on_iterator_read_t = js_function_t<
   std::optional<js_string_t>,
   std::vector<js_arraybuffer_t>,
   std::vector<js_arraybuffer_t>>;
+using cb_on_compact_range_t = js_function_t<void, js_receiver_t, std::optional<js_string_t>>;
 }; // namespace
 
 struct rocksdb_native_column_family_t {
@@ -94,7 +95,7 @@ struct rocksdb_native_iterator_t {
   js_persistent_t<cb_on_iterator_close_t> on_close;
   js_persistent_t<cb_on_iterator_read_t> on_read;
 
-  bool closing;
+  bool active;
   bool exiting;
 
   js_deferred_teardown_t *teardown;
@@ -138,6 +139,14 @@ struct rocksdb_native_snapshot_t {
   rocksdb_snapshot_t handle;
 };
 
+struct rocksdb_native_compact_range_t {
+  rocksdb_compact_range_t handle;
+
+  js_env_t *env;
+  js_persistent_t<js_receiver_t> ctx;
+  js_persistent_t<cb_on_compact_range_t> on_compact_range;
+};
+
 static void
 rocksdb_native__on_free(js_env_t *env, char *data) {
   free(data);
@@ -717,7 +726,7 @@ rocksdb_native_iterator_init(js_env_t *env) {
   assert(err == 0);
 
   req->env = env;
-  req->closing = false;
+  req->active = false;
   req->exiting = false;
   req->handle.data = req;
 
@@ -757,6 +766,8 @@ rocksdb_native__on_iterator_close(rocksdb_iterator_t *handle, int status) {
 
   rocksdb_native_iterator_t *req = (rocksdb_native_iterator_t *) handle->data;
 
+  req->active = false;
+
   js_env_t *env = req->env;
 
   js_deferred_teardown_t *teardown = req->teardown;
@@ -809,33 +820,38 @@ rocksdb_native__on_iterator_open(rocksdb_iterator_t *handle, int status) {
 
   rocksdb_native_iterator_t *req = (rocksdb_native_iterator_t *) handle->data;
 
-  if (req->exiting) return;
+  req->active = false;
 
-  js_env_t *env = req->env;
+  if (req->exiting) {
+    err = rocksdb_iterator_close(&req->handle, rocksdb_native__on_iterator_close);
+    assert(err == 0);
+  } else {
+    js_env_t *env = req->env;
 
-  js_handle_scope_t *scope;
-  err = js_open_handle_scope(env, &scope);
-  assert(err == 0);
+    js_handle_scope_t *scope;
+    err = js_open_handle_scope(env, &scope);
+    assert(err == 0);
 
-  js_receiver_t ctx;
-  err = js_get_reference_value(env, req->ctx, ctx);
-  assert(err == 0);
+    js_receiver_t ctx;
+    err = js_get_reference_value(env, req->ctx, ctx);
+    assert(err == 0);
 
-  cb_on_iterator_open_t cb;
-  err = js_get_reference_value(env, req->on_open, cb);
-  assert(err == 0);
+    cb_on_iterator_open_t cb;
+    err = js_get_reference_value(env, req->on_open, cb);
+    assert(err == 0);
 
-  std::optional<js_string_t> error;
+    std::optional<js_string_t> error;
 
-  if (req->handle.error) {
-    err = js_create_string(env, req->handle.error, error.emplace());
-    assert(err == 0);
-  }
+    if (req->handle.error) {
+      err = js_create_string(env, req->handle.error, error.emplace());
+      assert(err == 0);
+    }
 
-  js_call_function_with_checkpoint(env, cb, ctx, error);
+    js_call_function_with_checkpoint(env, cb, ctx, error);
 
-  err = js_close_handle_scope(env, scope);
-  assert(err == 0);
+    err = js_close_handle_scope(env, scope);
+    assert(err == 0);
+  }
 }
 
 static void
@@ -846,7 +862,7 @@ rocksdb_native__on_iterator_teardown(js_deferred_teardown_t *handle, void *data)
 
   req->exiting = true;
 
-  if (req->closing) return;
+  if (req->active) return;
 
   err = rocksdb_iterator_close(&req->handle, rocksdb_native__on_iterator_close);
   assert(err == 0);
@@ -872,6 +888,8 @@ rocksdb_native_iterator_open(
 ) {
   int err;
 
+  req->active = true;
+
   rocksdb_range_t range;
 
   err = js_get_typedarray_info(env, gt, range.gt.data, range.gt.len);
@@ -920,7 +938,7 @@ static void
 rocksdb_native_iterator_close(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_native_iterator_t, 1> req) {
   int err;
 
-  req->closing = true;
+  req->active = true;
 
   err = rocksdb_iterator_close(&req->handle, rocksdb_native__on_iterator_close);
   assert(err == 0);
@@ -944,6 +962,8 @@ rocksdb_native__on_iterator_read(rocksdb_iterator_t *handle, int status) {
 
   rocksdb_native_iterator_t *req = (rocksdb_native_iterator_t *) handle->data;
 
+  req->active = false;
+
   rocksdb_native_t *db = (rocksdb_native_t *) req->handle.req.db;
 
   size_t len = req->handle.len;
@@ -958,6 +978,9 @@ rocksdb_native__on_iterator_read(rocksdb_iterator_t *handle, int status) {
         rocksdb_slice_destroy(&req->values[i]);
       }
     }
+
+    err = rocksdb_iterator_close(&req->handle, rocksdb_native__on_iterator_close);
+    assert(err == 0);
   } else {
     js_env_t *env = req->env;
 
@@ -1019,6 +1042,8 @@ rocksdb_native_iterator_read(
 ) {
   int err;
 
+  req->active = true;
+
   err = rocksdb_iterator_read(&req->handle, req->keys, req->values, capacity, rocksdb_native__on_iterator_read);
   assert(err == 0);
 }
@@ -1498,6 +1523,98 @@ rocksdb_native_snapshot_destroy(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_
   rocksdb_snapshot_destroy(&snapshot->handle);
 }
 
+static void
+rocksdb_native__on_compact_range(rocksdb_compact_range_t *handle, int status) {
+  int err;
+
+  assert(status == 0);
+
+  rocksdb_native_compact_range_t *req = (rocksdb_native_compact_range_t *) handle->data;
+
+  rocksdb_native_t *db = (rocksdb_native_t *) req->handle.req.db;
+
+  js_env_t *env = req->env;
+
+  if (db->exiting) {
+    req->on_compact_range.reset();
+    req->ctx.reset();
+  } else {
+    js_handle_scope_t *scope;
+    err = js_open_handle_scope(env, &scope);
+    assert(err == 0);
+
+    std::optional<js_string_t> error;
+
+    if (req->handle.error) {
+      err = js_create_string(env, req->handle.error, error.emplace());
+      assert(err == 0);
+    }
+
+    js_receiver_t ctx;
+    err = js_get_reference_value(env, req->ctx, ctx);
+    assert(err == 0);
+
+    cb_on_compact_range_t cb;
+    err = js_get_reference_value(env, req->on_compact_range, cb);
+    assert(err == 0);
+
+    req->on_compact_range.reset();
+    req->ctx.reset();
+
+    js_call_function_with_checkpoint(env, cb, ctx, error);
+
+    err = js_close_handle_scope(env, scope);
+    assert(err == 0);
+  }
+}
+
+static js_arraybuffer_t
+rocksdb_native_compact_range(
+  js_env_t *env,
+  js_arraybuffer_span_of_t<rocksdb_native_t, 1> db,
+  js_arraybuffer_span_of_t<rocksdb_native_column_family_t, 1> column_family,
+  js_typedarray_t<> start,
+  js_typedarray_t<> end,
+  bool exclusive,
+  js_receiver_t ctx,
+  cb_on_compact_range_t on_compact_range
+) {
+  int err;
+
+  js_arraybuffer_t handle;
+
+  rocksdb_native_compact_range_t *req;
+  err = js_create_arraybuffer(env, req, handle);
+  assert(err == 0);
+
+  req->env = env;
+  req->handle.data = (void *) req;
+
+  err = js_create_reference(env, ctx, req->ctx);
+  assert(err == 0);
+
+  err = js_create_reference(env, on_compact_range, req->on_compact_range);
+  assert(err == 0);
+
+  rocksdb_compact_range_options_t options = {
+    .version = 0,
+    .exclusive_manual_compaction = exclusive
+  };
+
+  rocksdb_slice_t start_slice;
+  err = js_get_typedarray_info(env, start, start_slice.data, start_slice.len);
+  assert(err == 0);
+
+  rocksdb_slice_t end_slice;
+  err = js_get_typedarray_info(env, start, end_slice.data, end_slice.len);
+  assert(err == 0);
+
+  err = rocksdb_compact_range(&db->handle, &req->handle, column_family->handle, start_slice, end_slice, &options, rocksdb_native__on_compact_range);
+  assert(err == 0);
+
+  return handle;
+}
+
 static js_value_t *
 rocksdb_native_exports(js_env_t *env, js_value_t *exports) {
   int err;
@@ -1533,6 +1650,8 @@ rocksdb_native_exports(js_env_t *env, js_value_t *exports) {
 
   V("snapshotCreate", rocksdb_native_snapshot_create)
   V("snapshotDestroy", rocksdb_native_snapshot_destroy)
+
+  V("compactRange", rocksdb_native_compact_range)
 #undef V
 
 #define V(name, n) \

package/index.js

@@ -176,6 +176,19 @@ class RocksDB {
     await batch.flush()
   }
 
+  async compactRange(start = null, end = null, opts = {}) {
+    if (typeof end === 'object' && end !== null) {
+      opts = end
+      end = null
+    } else if (typeof start === 'object' && start !== null) {
+      opts = start
+      start = null
+      end = null
+    }
+
+    await this._state.compactRange(this, start, end, opts)
+  }
+
   _ref() {
     if (this._snapshot) this._snapshot.ref()
     this._state.handles.inc()

package/lib/state.js

@@ -2,11 +2,13 @@ const ReadyResource = require('ready-resource')
 const RefCounter = require('refcounter')
 const rrp = require('resolve-reject-promise')
 const SignalPromise = require('signal-promise')
+const c = require('compact-encoding')
 const { ReadBatch, WriteBatch } = require('./batch')
 const ColumnFamily = require('./column-family')
 const binding = require('../binding')
 
 const MAX_BATCH_REUSE = 64
+const empty = Buffer.alloc(0)
 
 module.exports = class RocksDBState extends ReadyResource {
   constructor(db, path, opts) {
@@ -309,4 +311,47 @@ module.exports = class RocksDBState extends ReadyResource {
       else req.resolve()
     }
   }
+
+  async compactRange(db, start, end, opts) {
+    if (this.opened === false) await this.ready()
+
+    this.io.inc()
+
+    const { exclusive = false } = opts
+
+    const req = { resolve: null, reject: null, handle: null }
+
+    const promise = new Promise((resolve, reject) => {
+      req.resolve = resolve
+      req.reject = reject
+    })
+
+    try {
+      req.handle = binding.compactRange(
+        this._handle,
+        db._columnFamily._handle,
+        this._encodeKey(start),
+        this._encodeKey(end),
+        exclusive,
+        req,
+        oncompactrange
+      )
+
+      await promise
+    } finally {
+      this.io.dec()
+    }
+
+    function oncompactrange(err) {
+      if (err) req.reject(new Error(err))
+      else req.resolve()
+    }
+  }
+
+  _encodeKey(k) {
+    if (this.db._keyEncoding) return c.encode(this.db._keyEncoding, k)
+    if (typeof k === 'string') return Buffer.from(k)
+    if (k === null) return empty
+    return k
+  }
 }

package/package.json

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