rocksdb-native 3.11.0 → 3.11.2

package/CMakeLists.txt

@@ -9,7 +9,7 @@ project(rocksdb_native C CXX)
 
 bare_target(target)
 
-fetch_package("github:holepunchto/librocksdb#65ec235")
+fetch_package("github:holepunchto/librocksdb#6a480d5")
 fetch_package("github:holepunchto/libjstl#098664c")
 
 add_bare_module(rocksdb_native_bare)

package/binding.cc

@@ -1,3 +1,5 @@
+#include <set>
+
 #include <assert.h>
 #include <bare.h>
 #include <js.h>
@@ -21,14 +23,23 @@ using rocksdb_native_on_iterator_read_t = js_function_t<void, js_receiver_t, std
 using rocksdb_native_on_compact_range_t = js_function_t<void, js_receiver_t, std::optional<js_string_t>>;
 using rocksdb_native_on_approximate_size_t = js_function_t<void, js_receiver_t, std::optional<js_string_t>, uint64_t>;
 
+struct rocksdb_native_t;
+
 struct rocksdb_native_column_family_t {
   rocksdb_column_family_t *handle;
   rocksdb_column_family_descriptor_t descriptor;
 
-  rocksdb_t *db;
+  rocksdb_native_t *db;
 
-  js_env_t *env;
-  js_persistent_t<js_receiver_t> ctx;
+  js_persistent_t<js_arraybuffer_t> ctx;
+};
+
+struct rocksdb_native_snapshot_t {
+  rocksdb_snapshot_t handle;
+
+  rocksdb_native_t *db;
+
+  js_persistent_t<js_arraybuffer_t> ctx;
 };
 
 struct rocksdb_native_t {
@@ -41,6 +52,9 @@ struct rocksdb_native_t {
   bool closing;
   bool exiting;
 
+  std::set<rocksdb_native_column_family_t *> column_families;
+  std::set<rocksdb_native_snapshot_t *> snapshots;
+
   js_deferred_teardown_t *teardown;
 };
 
@@ -130,10 +144,6 @@ struct rocksdb_native_flush_t {
   js_persistent_t<rocksdb_native_column_family_t> column_family;
 };
 
-struct rocksdb_native_snapshot_t {
-  rocksdb_snapshot_t handle;
-};
-
 struct rocksdb_native_compact_range_t {
   rocksdb_compact_range_t handle;
 
@@ -170,9 +180,6 @@ rocksdb_native__try_create_external_arraybuffer(js_env_t *env, char *data, size_
   return 0;
 }
 
-static void
-rocksdb_native__on_column_family_teardown(void *data);
-
 static void
 rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
   int err;
@@ -238,11 +245,10 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
 
         column_family->handle = handles[i];
 
-        err = js_create_reference(env, ctx, column_family->ctx);
+        err = js_create_reference(env, handle, column_family->ctx);
         assert(err == 0);
 
-        err = js_add_teardown_callback(env, rocksdb_native__on_column_family_teardown, column_family);
-        assert(err == 0);
+        db->column_families.insert(column_family);
       }
     }
 
@@ -256,6 +262,32 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
   }
 }
 
+static void
+rocksdb_native__on_idle(rocksdb_t *handle) {
+  int err;
+
+  auto db = reinterpret_cast<rocksdb_native_t *>(handle);
+
+  for (auto &column_family : db->column_families) {
+    err = rocksdb_column_family_destroy(&column_family->db->handle, column_family->handle);
+    assert(err == 0);
+
+    column_family->handle = nullptr;
+
+    column_family->ctx.reset();
+  }
+
+  db->column_families.~set();
+
+  for (auto &snapshot : db->snapshots) {
+    rocksdb_snapshot_destroy(&snapshot->handle);
+
+    snapshot->ctx.reset();
+  }
+
+  db->snapshots.~set();
+}
+
 static void
 rocksdb_native__on_close(rocksdb_close_t *handle, int status) {
   int err;
@@ -271,14 +303,14 @@ rocksdb_native__on_close(rocksdb_close_t *handle, int status) {
   auto teardown = db->teardown;
 
   if (db->exiting) {
-    db->ctx.reset();
-
     if (db->closing) {
       req->on_close.reset();
       req->ctx.reset();
     } else {
       free(req);
     }
+
+    db->ctx.reset();
   } else {
     js_handle_scope_t *scope;
     err = js_open_handle_scope(env, &scope);
@@ -292,10 +324,11 @@ rocksdb_native__on_close(rocksdb_close_t *handle, int status) {
     err = js_get_reference_value(env, req->on_close, cb);
     assert(err == 0);
 
-    db->ctx.reset();
     req->on_close.reset();
     req->ctx.reset();
 
+    db->ctx.reset();
+
     js_call_function_with_checkpoint(env, cb, ctx);
 
     err = js_close_handle_scope(env, scope);
@@ -323,7 +356,7 @@ rocksdb_native__on_teardown(js_deferred_teardown_t *handle, void *data) {
   req->env = env;
   req->handle.data = req;
 
-  err = rocksdb_close(&db->handle, &req->handle, rocksdb_native__on_close);
+  err = rocksdb_close(&db->handle, &req->handle, rocksdb_native__on_idle, rocksdb_native__on_close);
   assert(err == 0);
 }
 
@@ -358,6 +391,9 @@ rocksdb_native_init(
   db->closing = false;
   db->exiting = false;
 
+  new (&db->column_families) std::set<rocksdb_native_column_family_t *>();
+  new (&db->snapshots) std::set<rocksdb_native_snapshot_t *>();
+
   db->options = (rocksdb_options_t) {
     3,
     read_only,
@@ -416,7 +452,7 @@ rocksdb_native_open(
 
     memcpy(&column_families[i], &column_family->descriptor, sizeof(rocksdb_column_family_descriptor_t));
 
-    column_family->db = &db->handle;
+    column_family->db = db;
   }
 
   auto handles = new rocksdb_column_family_t *[len];
@@ -432,7 +468,7 @@ rocksdb_native_open(
 
   db->options.lock = lock;
 
-  err = rocksdb_open(&db->handle, &req->handle, path, &db->options, column_families, handles, len, rocksdb_native__on_open);
+  err = rocksdb_open(&db->handle, &req->handle, path, &db->options, column_families, handles, len, nullptr, rocksdb_native__on_open);
 
   if (err < 0) {
     err = js_throw_error(env, uv_err_name(err), uv_strerror(err));
@@ -483,7 +519,7 @@ rocksdb_native_close(
   req->env = env;
   req->handle.data = req;
 
-  err = rocksdb_close(&db->handle, &req->handle, rocksdb_native__on_close);
+  err = rocksdb_close(&db->handle, &req->handle, rocksdb_native__on_idle, rocksdb_native__on_close);
 
   if (err < 0) {
     err = js_throw_error(env, uv_err_name(err), uv_strerror(err));
@@ -666,20 +702,6 @@ rocksdb_native_resume(
   return handle;
 }
 
-static void
-rocksdb_native__on_column_family_teardown(void *data) {
-  int err;
-
-  auto column_family = reinterpret_cast<rocksdb_native_column_family_t *>(data);
-
-  auto env = column_family->env;
-
-  err = rocksdb_column_family_destroy(column_family->db, column_family->handle);
-  assert(err == 0);
-
-  column_family->ctx.reset();
-}
-
 static js_arraybuffer_t
 rocksdb_native_column_family_init(
   js_env_t *env,
@@ -734,7 +756,6 @@ rocksdb_native_column_family_init(
   err = js_create_arraybuffer(env, column_family, handle);
   assert(err == 0);
 
-  column_family->env = env;
   column_family->db = nullptr;
   column_family->handle = nullptr;
 
@@ -774,15 +795,14 @@ rocksdb_native_column_family_destroy(
 
   if (column_family->handle == nullptr) return;
 
-  err = rocksdb_column_family_destroy(column_family->db, column_family->handle);
+  err = rocksdb_column_family_destroy(&column_family->db->handle, column_family->handle);
   assert(err == 0);
 
-  err = js_remove_teardown_callback(env, rocksdb_native__on_column_family_teardown, column_family);
-  assert(err == 0);
+  column_family->handle = nullptr;
 
-  column_family->ctx.reset();
+  column_family->db->column_families.erase(column_family);
 
-  column_family->handle = nullptr;
+  column_family->ctx.reset();
 }
 
 static js_arraybuffer_t
@@ -950,7 +970,7 @@ rocksdb_native_iterator_open(
   js_typedarray_t<> lte,
   bool reverse,
   bool keys_only,
-  std::optional<js_arraybuffer_t> snapshot,
+  std::optional<js_arraybuffer_span_of_t<rocksdb_native_snapshot_t, 1>> snapshot,
   js_receiver_t ctx,
   rocksdb_native_on_iterator_open_t on_open,
   rocksdb_native_on_iterator_close_t on_close,
@@ -978,10 +998,7 @@ rocksdb_native_iterator_open(
     .keys_only = keys_only
   };
 
-  if (snapshot) {
-    err = js_get_arraybuffer_info(env, snapshot.value(), options.snapshot);
-    assert(err == 0);
-  }
+  if (snapshot) options.snapshot = &snapshot.value()->handle;
 
   err = rocksdb_iterator_open(&db->handle, &req->handle, column_family->handle, range, &options, rocksdb_native__on_iterator_open);
 
@@ -1255,7 +1272,7 @@ rocksdb_native_read(
   js_arraybuffer_span_of_t<rocksdb_native_t, 1> db,
   js_arraybuffer_span_of_t<rocksdb_native_read_batch_t, 1> req,
   js_array_t operations,
-  std::optional<js_arraybuffer_t> snapshot,
+  std::optional<js_arraybuffer_span_of_t<rocksdb_native_snapshot_t, 1>> snapshot,
   bool async_io,
   bool fill_cache,
   js_receiver_t ctx,
@@ -1310,10 +1327,7 @@ rocksdb_native_read(
     .fill_cache = fill_cache
   };
 
-  if (snapshot) {
-    err = js_get_arraybuffer_info(env, snapshot.value(), options.snapshot);
-    assert(err == 0);
-  }
+  if (snapshot) options.snapshot = &snapshot.value()->handle;
 
   err = rocksdb_read(&db->handle, &req->handle, req->reads, len, &options, rocksdb_native__on_read);
 
@@ -1800,13 +1814,6 @@ rocksdb_native_approximate_size(
   return handle;
 }
 
-static void
-rocksdb_native__on_snapshot_teardown(void *data) {
-  auto snapshot = reinterpret_cast<rocksdb_native_snapshot_t *>(data);
-
-  rocksdb_snapshot_destroy(&snapshot->handle);
-}
-
 static js_arraybuffer_t
 rocksdb_native_snapshot_create(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_native_t, 1> db) {
   int err;
@@ -1817,6 +1824,8 @@ rocksdb_native_snapshot_create(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_n
   err = js_create_arraybuffer(env, snapshot, handle);
   assert(err == 0);
 
+  snapshot->db = db;
+
   err = rocksdb_snapshot_create(&db->handle, &snapshot->handle);
 
   if (err < 0) {
@@ -1826,9 +1835,11 @@ rocksdb_native_snapshot_create(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_n
     throw js_pending_exception;
   }
 
-  err = js_add_teardown_callback(env, rocksdb_native__on_snapshot_teardown, snapshot);
+  err = js_create_reference(env, handle, snapshot->ctx);
   assert(err == 0);
 
+  db->snapshots.insert(snapshot);
+
   return handle;
 }
 
@@ -1838,8 +1849,9 @@ rocksdb_native_snapshot_destroy(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_
 
   rocksdb_snapshot_destroy(&snapshot->handle);
 
-  err = js_remove_teardown_callback(env, rocksdb_native__on_snapshot_teardown, snapshot);
-  assert(err == 0);
+  snapshot->db->snapshots.erase(snapshot);
+
+  snapshot->ctx.reset();
 }
 
 static js_value_t *

package/lib/state.js

@@ -28,8 +28,7 @@ module.exports = class RocksDBState extends ReadyResource {
       skipStatsUpdateOnOpen = false,
       useDirectIOForFlushAndCompaction = false,
       maxFileOpeningThreads = 16,
-      lock = null,
-      preopen = null
+      lock = null
     } = opts
 
     this.path = path
@@ -47,7 +46,6 @@ module.exports = class RocksDBState extends ReadyResource {
     this._updatingSignal = new SignalPromise()
     this._columnsFlushed = false
     this._lock = lock
-    this._preopen = preopen
     this._readBatches = []
     this._writeBatches = []
 
@@ -142,8 +140,6 @@ module.exports = class RocksDBState extends ReadyResource {
 
     if (this._lock) await this._lock.ready()
 
-    if (this._preopen) await this._preopen
-
     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.11.0",
+  "version": "3.11.2",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",