@nxtedition/rocksdb 7.0.65 → 7.1.1

package/binding.cc

@@ -18,6 +18,7 @@
 #include <rocksdb/table.h>
 #include <rocksdb/write_batch.h>
 
+#include <iostream>
 #include <memory>
 #include <optional>
 #include <set>
@@ -594,8 +595,12 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
   std::optional<std::string> mergeOperatorOpt;
   NAPI_STATUS_RETURN(GetProperty(env, options, "mergeOperator", mergeOperatorOpt));
   if (mergeOperatorOpt) {
-    ROCKS_STATUS_RETURN_NAPI(
-        rocksdb::MergeOperator::CreateFromString(configOptions, *mergeOperatorOpt, &columnOptions.merge_operator));
+    if (*mergeOperatorOpt == "maxRev") {
+      columnOptions.merge_operator = std::make_shared<MaxRevOperator>();
+    } else {
+      ROCKS_STATUS_RETURN_NAPI(
+          rocksdb::MergeOperator::CreateFromString(configOptions, *mergeOperatorOpt, &columnOptions.merge_operator));
+    }
   }
 
   uint32_t cacheSize = 8 << 20;
@@ -1549,6 +1554,58 @@ NAPI_METHOD(batch_iterate) {
   return result;
 }
 
+NAPI_METHOD(db_get_sorted_wal_files) {
+  NAPI_ARGV(3);
+
+  Database* database;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
+
+  auto callback = argv[1];
+
+  runAsync<rocksdb::VectorLogPtr>(
+      "leveldown.open", env, callback,
+      [=](auto& files) {
+        return database->db->GetSortedWalFiles(files);
+      },
+      [=](auto& files, auto env, auto& argv) {
+        argv.resize(2);
+
+        const auto size = files.size();
+        NAPI_STATUS_RETURN(napi_create_array_with_length(env, size, &argv[1]));
+
+        for (size_t n = 0; n < size; ++n) {
+          napi_value element;
+          NAPI_STATUS_RETURN(napi_create_object(env, &element));
+
+          napi_value pathName;
+          NAPI_STATUS_RETURN(napi_create_string_utf8(env, files[n]->PathName().data(), NAPI_AUTO_LENGTH, &pathName))
+          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "pathName", pathName));
+
+          napi_value logNumber;
+          NAPI_STATUS_RETURN(napi_create_int32(env, files[n]->LogNumber(), &logNumber))
+          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "logNumber", logNumber));
+
+          napi_value type;
+          NAPI_STATUS_RETURN(napi_create_int32(env, files[n]->Type(), &type))
+          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "type", type));
+
+          napi_value startSequence;
+          NAPI_STATUS_RETURN(napi_create_int64(env, files[n]->StartSequence(), &startSequence))
+          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "startSequence", startSequence));
+
+          napi_value sizeFileBytes;
+          NAPI_STATUS_RETURN(napi_create_int64(env, files[n]->SizeFileBytes(), &sizeFileBytes))
+          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "sizeFileBytes", sizeFileBytes));
+
+          NAPI_STATUS_RETURN(napi_set_element(env, argv[1], n, element));
+        }
+
+        return napi_ok;
+      });
+
+  return 0;
+}
+
 NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(db_init);
   NAPI_EXPORT_FUNCTION(db_open);
@@ -1557,6 +1614,7 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(db_clear);
   NAPI_EXPORT_FUNCTION(db_get_property);
   NAPI_EXPORT_FUNCTION(db_get_latest_sequence);
+  NAPI_EXPORT_FUNCTION(db_get_sorted_wal_files);
 
   NAPI_EXPORT_FUNCTION(iterator_init);
   NAPI_EXPORT_FUNCTION(iterator_seek);

package/index.js

@@ -441,6 +441,12 @@ class RocksLevel extends AbstractLevel {
       this[kUnref]()
     }
   }
+
+  async getSortedWalFiles () {
+    return new Promise((resolve, reject) => {
+      binding.db_get_sorted_wal_files(this[kContext], (err, val) => err ? reject(err) : resolve(val))
+    })
+  }
 }
 
 exports.RocksLevel = RocksLevel

package/max_rev_operator.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <rocksdb/slice.h>
+#include <rocksdb/merge_operator.h>
+
 int compareRev(const rocksdb::Slice& a, const rocksdb::Slice& b) {
   auto indexA = 0UL;
   auto indexB = 0UL;

package/package.json

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

package/util.h

@@ -121,7 +121,9 @@ class NapiSlice : public rocksdb::Slice {
   NapiSlice(NapiSlice&) = delete;
   NapiSlice& operator=(NapiSlice&) = delete;
 
-  std::string self_space_;
+  std::array<char, 128> stack_;
+  std::unique_ptr<char[]> heap_;
+  size_t heap_size_ = 0;
 };
 
 static napi_status GetString(napi_env env, napi_value from, NapiSlice& to) {
@@ -131,10 +133,22 @@ static napi_status GetString(napi_env env, napi_value from, NapiSlice& to) {
   if (type == napi_string) {
     size_t length = 0;
     NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, nullptr, 0, &length));
-    to.self_space_.resize(length, '\0');
-    NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, &to.self_space_[0], length + 1, &length));
 
-    to.data_ = to.self_space_.data();
+    char* data;
+    if (length + 1 > to.stack_.size()) {
+      if (to.heap_size_ < length + 1) {
+        to.heap_size_ = length + 1;
+        to.heap_.reset(new char[to.heap_size_]);
+      }
+      data = to.heap_.get();
+    } else {
+      data = to.stack_.data();
+    }
+    data[length] = 0;
+
+    NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, data, length + 1, &length));
+
+    to.data_ = data;
     to.size_ = length;
   } else {
     bool isBuffer;