@nxtedition/rocksdb 7.0.33 → 7.0.36

package/binding.cc

@@ -544,7 +544,13 @@ struct Updates {
           bool values,
           bool data,
           const rocksdb::ColumnFamilyHandle* column)
-      : database_(database), seqNumber_(seqNumber), keys_(keys), values_(values), data_(data), column_(column) {}
+      : database_(database),
+        sequence_(seqNumber),
+        start_(seqNumber),
+        keys_(keys),
+        values_(values),
+        data_(data),
+        column_(column) {}
 
   void Close() { iterator_.reset(); }
 
@@ -561,7 +567,8 @@ struct Updates {
   }
 
   Database* database_;
-  int64_t seqNumber_;
+  int64_t sequence_;
+  int64_t start_;
   std::unique_ptr<rocksdb::TransactionLogIterator> iterator_;
   bool keys_;
   bool values_;
@@ -940,24 +947,23 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
   }
 
   rocksdb::Status Execute(Database& database) override {
-    rocksdb::TransactionLogIterator::ReadOptions options;
-
     if (!updates_->iterator_) {
-      const auto status = database_->db_->GetUpdatesSince(updates_->seqNumber_, &updates_->iterator_, options);
+      rocksdb::TransactionLogIterator::ReadOptions options;
+      const auto status = database_->db_->GetUpdatesSince(updates_->sequence_, &updates_->iterator_, options);
       if (!status.ok()) {
         return status;
       }
-    } else {
+    } else if (updates_->iterator_->Valid()) {
       updates_->iterator_->Next();
     }
 
-    if (!updates_->iterator_->Valid()) {
+    if (!updates_->iterator_->Valid() || !updates_->iterator_->status().ok()) {
       return updates_->iterator_->status();
     }
 
     auto batch = updates_->iterator_->GetBatch();
 
-    updates_->seqNumber_ = batch.sequence;
+    updates_->sequence_ = batch.sequence;
 
     count_ = batch.writeBatchPtr->Count();
     cache_.reserve(batch.writeBatchPtr->Count() * 4);
@@ -966,11 +972,11 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
   }
 
   napi_status OnOk(napi_env env, napi_value callback) override {
-    napi_value argv[4];
+    napi_value argv[5];
 
     NAPI_STATUS_RETURN(napi_get_null(env, &argv[0]));
 
-    if (cache_.empty()) {
+    if (count_ == -1) {
       return CallFunction(env, callback, 1, argv);
     }
 
@@ -981,11 +987,13 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
       NAPI_STATUS_RETURN(napi_set_element(env, argv[1], idx, val));
     }
 
-    NAPI_STATUS_RETURN(napi_create_int64(env, updates_->seqNumber_, &argv[2]));
+    NAPI_STATUS_RETURN(napi_create_int64(env, updates_->sequence_, &argv[2]));
 
     NAPI_STATUS_RETURN(napi_create_int64(env, count_, &argv[3]));
 
-    return CallFunction(env, callback, 4, argv);
+    NAPI_STATUS_RETURN(napi_create_int64(env, updates_->start_, &argv[4]));
+
+    return CallFunction(env, callback, 5, argv);
   }
 
   void Destroy(napi_env env) override {
@@ -1060,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());
@@ -1095,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_;
 };
@@ -1126,6 +1134,7 @@ NAPI_METHOD(updates_init) {
   NAPI_STATUS_THROWS(napi_get_named_property(env, argv[1], "data", &dataProperty));
   NAPI_STATUS_THROWS(napi_get_value_bool(env, dataProperty, &data));
 
+  // TODO (fix): Needs to support { column: null }
   rocksdb::ColumnFamilyHandle* column;
   NAPI_STATUS_THROWS(GetColumnFamily(database, env, argv[1], &column, false));
 

package/index.js

@@ -245,6 +245,11 @@ class RocksLevel extends AbstractLevel {
       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') {
       throw new TypeError("'since' must be nully or a number")
     }
@@ -261,7 +266,7 @@ class RocksLevel extends AbstractLevel {
       throw new TypeError("'data' must be nully or a boolean")
     }
 
-    if (typeof options.column !== 'object') {
+    if (options.column !== undefined && typeof options.column !== 'object') {
       throw new TypeError("'column' must be nully or a object")
     }
 

package/package.json

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