@nxtedition/rocksdb 7.0.34 → 7.0.37

package/binding.cc

@@ -976,7 +976,7 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
 
     NAPI_STATUS_RETURN(napi_get_null(env, &argv[0]));
 
-    if (cache_.empty()) {
+    if (count_ == -1) {
       return CallFunction(env, callback, 1, argv);
     }
 
@@ -1068,7 +1068,7 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
       return rocksdb::Status::OK();
     }
 
-    cache_.emplace_back("put");
+    cache_.emplace_back("merge");
 
     if (updates_->keys_) {
       cache_.emplace_back(key.ToStringView());
@@ -1103,7 +1103,7 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
   bool Continue() override { return true; }
 
  private:
-  size_t count_;
+  int64_t count_ = -1;
   std::vector<std::optional<std::string>> cache_;
   Updates* updates_;
 };
@@ -1845,6 +1845,18 @@ NAPI_METHOD(batch_clear) {
   return 0;
 }
 
+NAPI_METHOD(batch_count) {
+  NAPI_ARGV(2);
+
+  rocksdb::WriteBatch* batch;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[1], reinterpret_cast<void**>(&batch)));
+
+  napi_value result;
+  NAPI_STATUS_THROWS(napi_create_bigint_int64(env, batch->Count(), &result));
+
+  return result;
+}
+
 NAPI_METHOD(batch_write) {
   NAPI_ARGV(3);
 

package/chained-batch.js

@@ -48,6 +48,10 @@ class ChainedBatch extends AbstractChainedBatch {
     // TODO (fix): Check if open...
     binding.batch_merge(this[kDbContext], this[kBatchContext], key, value, options)
   }
+
+  get count () {
+    return binding.batch_count(this[kDbContext], this[kBatchContext])
+  }
 }
 
 exports.ChainedBatch = ChainedBatch

package/index.js

@@ -241,7 +241,13 @@ class RocksLevel extends AbstractLevel {
       since: options?.since ?? 0,
       keys: options?.keys ?? true,
       values: options?.values ?? true,
-      data: options?.data ?? true
+      data: options?.data ?? true,
+      column: options?.column ?? null
+    }
+
+    // HACK: We don't properly check for nully column in binding.
+    if (!options.column) {
+      delete options.column
     }
 
     if (typeof options.since !== 'number') {
@@ -264,11 +270,6 @@ class RocksLevel extends AbstractLevel {
       throw new TypeError("'column' must be nully or a object")
     }
 
-    // HACK: We don't properly check for nully column in binding.
-    if (!options.column) {
-      delete options.column
-    }
-
     class Updates {
       constructor (db, options) {
         this.context = binding.updates_init(db[kContext], options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/rocksdb",
-  "version": "7.0.34",
+  "version": "7.0.37",
   "description": "A low-level Node.js RocksDB binding",
   "license": "MIT",
   "main": "index.js",