@nxtedition/rocksdb 7.0.20 → 7.0.21

package/binding.cc

@@ -14,7 +14,6 @@
 #include <rocksdb/slice_transform.h>
 #include <rocksdb/table.h>
 #include <rocksdb/write_batch.h>
-#include <rocksdb/filter_policy.h>
 
 #include <array>
 #include <memory>
@@ -539,9 +538,7 @@ struct Iterator final : public BaseIterator {
 };
 
 struct Updates {
-  Updates(Database* database, int64_t seqNumber)
-      : database_(database),
-        seqNumber_(seqNumber) {}
+  Updates(Database* database, int64_t seqNumber) : database_(database), seqNumber_(seqNumber) {}
 
   void Close() { iterator_.reset(); }
 
@@ -944,7 +941,7 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
 
     updates_->seqNumber_ = batch.sequence;
 
-    cache_.reserve(batch.writeBatchPtr->Count() * 2);
+    cache_.reserve(batch.writeBatchPtr->Count() * 4);
 
     return batch.writeBatchPtr->Iterate(this);
   }
@@ -957,19 +954,31 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
       return CallFunction(env, callback, 1, argv);
     }
 
-    NAPI_STATUS_RETURN(napi_create_array_with_length(env, cache_.size(), &argv[1]));
-    for (size_t idx = 0; idx < cache_.size(); idx += 3) {
+    NAPI_STATUS_RETURN(napi_create_array_with_length(env, cache_.size() * 4, &argv[1]));
+    for (size_t idx = 0; idx < cache_.size(); idx++) {
       napi_value op;
-      NAPI_STATUS_RETURN(Convert(env, cache_[idx + 0], false, op));
-      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx + 0), op));
+      NAPI_STATUS_RETURN(Convert(env, std::get<0>(cache_[idx]), false, op));
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx * 4 + 0), op));
 
       napi_value key;
-      NAPI_STATUS_RETURN(Convert(env, cache_[idx + 1], false, key));
-      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx + 1), key));
+      NAPI_STATUS_RETURN(Convert(env, std::get<1>(cache_[idx]), false, key));
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx * 4 + 1), key));
 
       napi_value val;
-      NAPI_STATUS_RETURN(Convert(env, cache_[idx + 2], false, val));
-      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx + 2), val));
+      NAPI_STATUS_RETURN(Convert(env, std::get<2>(cache_[idx]), false, val));
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx * 4 + 2), val));
+
+      auto column_family_id = std::get<3>(cache_[idx]);
+      auto columns = database_->columns_;
+      auto columnIt = std::find_if(columns.begin(), columns.end(),
+                                   [&](const auto& handle) { return handle->GetID() == column_family_id; });
+      napi_value column;
+      if (columnIt != columns.end()) {
+        NAPI_STATUS_RETURN(napi_create_external(env, *columnIt, nullptr, nullptr, &column));
+      } else {
+        NAPI_STATUS_RETURN(napi_get_null(env, &column));
+      }
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx * 4 + 3), column));
     }
 
     NAPI_STATUS_RETURN(napi_create_bigint_int64(env, updates_->seqNumber_, &argv[2]));
@@ -982,34 +991,28 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
     Worker::Destroy(env);
   }
 
-  void Put(const rocksdb::Slice& key, const rocksdb::Slice& value) override {
-    cache_.emplace_back("put");
-    cache_.emplace_back(key.ToStringView());
-    cache_.emplace_back(value.ToStringView());
+  rocksdb::Status PutCF(uint32_t column_family_id, const rocksdb::Slice& key, const rocksdb::Slice& value) override {
+    cache_.emplace_back("put", key.ToStringView(), value.ToStringView(), column_family_id);
+    return rocksdb::Status::OK();
   }
 
-  void Delete(const rocksdb::Slice& key) override {
-    cache_.emplace_back("del");
-    cache_.emplace_back(key.ToStringView());
-    cache_.emplace_back(std::nullopt);
+  rocksdb::Status DeleteCF(uint32_t column_family_id, const rocksdb::Slice& key) override {
+    cache_.emplace_back("del", key.ToStringView(), std::nullopt, column_family_id);
+    return rocksdb::Status::OK();
   }
 
-  void Merge(const rocksdb::Slice& key, const rocksdb::Slice& value) override {
-    cache_.emplace_back("merge");
-    cache_.emplace_back(key.ToStringView());
-    cache_.emplace_back(value.ToStringView());
+  rocksdb::Status MergeCF(uint32_t column_family_id, const rocksdb::Slice& key, const rocksdb::Slice& value) override {
+    cache_.emplace_back("merge", key.ToStringView(), value.ToStringView(), column_family_id);
+    return rocksdb::Status::OK();
   }
 
-  void LogData(const rocksdb::Slice& data) override {
-    cache_.emplace_back("data");
-    cache_.emplace_back(std::nullopt);
-    cache_.emplace_back(data.ToStringView());
-  }
+  void LogData(const rocksdb::Slice& data) override { cache_.emplace_back("data", std::nullopt, data.ToStringView()); }
 
   bool Continue() override { return true; }
 
  private:
-  std::vector<std::optional<std::string>> cache_;
+  std::vector<std::tuple<std::optional<std::string>, std::optional<std::string>, std::optional<std::string>, uint32_t>>
+      cache_;
   Updates* updates_;
 };
 

package/index.js

@@ -208,12 +208,12 @@ class RocksLevel extends AbstractLevel {
           return {}
         }
 
-        this.promise = new Promise(resolve => binding.updates_next(this.context, (err, rows, sequence, data) => {
+        this.promise = new Promise(resolve => binding.updates_next(this.context, (err, rows, sequence) => {
           this.promise = null
           if (err) {
             resolve(Promise.reject(err))
           } else {
-            resolve({ rows, data, sequence: Number(sequence) })
+            resolve({ rows, sequence: Number(sequence) })
           }
         }))
 

package/package.json

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