@nxtedition/rocksdb 13.5.3 → 13.5.7

package/binding.cc

@@ -127,11 +127,14 @@ struct BatchIterator : public rocksdb::WriteBatch::Handler {
         keyEncoding_(keyEncoding),
         valueEncoding_(valueEncoding) {}
 
-  napi_status Iterate(napi_env env, const rocksdb::WriteBatch& batch, napi_value* result) {
+  rocksdb::Status Read (const rocksdb::WriteBatch& batch) {
+    cache_.clear();
     cache_.reserve(batch.Count());
 
-    ROCKS_STATUS_RETURN_NAPI(batch.Iterate(this));
+    ROCKS_STATUS_RETURN(batch.Iterate(this));
+  }
 
+  napi_status Write(napi_env env, napi_value* result) {
     napi_value putStr;
     NAPI_STATUS_RETURN(napi_create_string_utf8(env, "put", NAPI_AUTO_LENGTH, &putStr));
 
@@ -182,6 +185,11 @@ struct BatchIterator : public rocksdb::WriteBatch::Handler {
     return napi_ok;
   }
 
+  napi_status Iterate(napi_env env, const rocksdb::WriteBatch& batch, napi_value* result) {
+    ROCKS_STATUS_RETURN_NAPI(Read(batch));
+    return Write(env, result);
+  }
+
   rocksdb::Status PutCF(uint32_t column_family_id, const rocksdb::Slice& key, const rocksdb::Slice& value) override {
     if (column_ && column_->GetID() != column_family_id) {
       return rocksdb::Status::OK();
@@ -474,10 +482,10 @@ class Iterator final : public BaseIterator {
     rocksdb::ColumnFamilyHandle* column = database->db->DefaultColumnFamily();
     NAPI_STATUS_THROWS(GetProperty(env, options, "column", column));
 
-    Encoding keyEncoding;
+    Encoding keyEncoding = Encoding::String;
     NAPI_STATUS_THROWS(GetProperty(env, options, "keyEncoding", keyEncoding));
 
-    Encoding valueEncoding;
+    Encoding valueEncoding = Encoding::String;
     NAPI_STATUS_THROWS(GetProperty(env, options, "valueEncoding", valueEncoding));
 
     rocksdb::ReadOptions readOptions;
@@ -569,8 +577,6 @@ class Iterator final : public BaseIterator {
               rocksdb::PinnableSlice v;
               v.PinSelf(CurrentValue());
               state.values.push_back(std::move(v));
-            } else {
-              assert(false);
             }
             state.count += 1;
 
@@ -609,7 +615,8 @@ class Iterator final : public BaseIterator {
               NAPI_STATUS_RETURN(napi_get_undefined(env, &key));
               NAPI_STATUS_RETURN(Convert(env, std::move(state.values[n]), valueEncoding_, val));
             } else {
-              assert(false);
+              NAPI_STATUS_RETURN(napi_get_undefined(env, &key));
+              NAPI_STATUS_RETURN(napi_get_undefined(env, &val));
             }
 
             NAPI_STATUS_RETURN(napi_set_element(env, rows, n * 2 + 0, key));
@@ -681,7 +688,7 @@ class Iterator final : public BaseIterator {
         break;
       }
 
-      if (deadline > 0 && database_->db->GetEnv()->NowMicros() > deadline) {
+      if (n & 0xf == 0 && deadline > 0 && database_->db->GetEnv()->NowMicros() > deadline) {
         break;
       }
     }
@@ -729,7 +736,7 @@ NAPI_METHOD(db_init) {
   napi_valuetype type;
   NAPI_STATUS_THROWS(napi_typeof(env, argv[0], &type));
 
-  napi_value result;
+  napi_value result = 0;
 
   if (type == napi_string) {
     std::string location;
@@ -1870,7 +1877,8 @@ NAPI_METHOD(batch_iterate) {
   return result;
 }
 
-struct Updates : public BatchIterator, public Closable {
+class Updates : public BatchIterator, public Closable {
+public:
   Updates(Database* database,
           const int64_t since,
           const bool keys,
@@ -1891,6 +1899,54 @@ struct Updates : public BatchIterator, public Closable {
     }
   }
 
+  napi_value nextv(napi_env env, uint32_t count, uint32_t timeout, napi_value callback) {
+    struct State {
+      uint64_t sequence = 0;
+      bool finished = false;
+    };
+    runAsync<State>("updates.next", env, callback,
+      [=](auto& state) {
+        if (!iterator_) {
+          rocksdb::TransactionLogIterator::ReadOptions options;
+          ROCKS_STATUS_RETURN(database_->db->GetUpdatesSince(start_, &iterator_, options));
+        }
+
+        ROCKS_STATUS_RETURN(iterator_->status());
+
+        if (!iterator_->Valid()) {
+          state.finished = true;
+          return rocksdb::Status::OK();
+        }
+
+        auto batchResult = iterator_->GetBatch();
+        Read(*batchResult.writeBatchPtr);
+        state.sequence = batchResult.sequence;
+
+        iterator_->Next();
+
+        return rocksdb::Status::OK();
+      },
+      [=](auto& state, auto env, auto& argv) {
+        argv.resize(2);
+
+        if (!state.finished) {
+          napi_value rows;
+          napi_value sequence;
+
+          NAPI_STATUS_RETURN(Write(env, &rows));
+          NAPI_STATUS_RETURN(napi_create_int64(env, state.sequence, &sequence));
+
+          NAPI_STATUS_RETURN(napi_create_object(env, &argv[1]));
+          NAPI_STATUS_RETURN(napi_set_named_property(env, argv[1], "rows", rows));
+          NAPI_STATUS_RETURN(napi_set_named_property(env, argv[1], "seq", sequence));
+        } else {
+          NAPI_STATUS_RETURN(napi_get_null(env, &argv[1]));
+        }
+
+        return napi_ok;
+      });
+  }
+
   rocksdb::Status Close() override {
     if (iterator_) {
       iterator_.reset();
@@ -1899,11 +1955,10 @@ struct Updates : public BatchIterator, public Closable {
     return rocksdb::Status::OK();
   }
 
+ private:
   Database* database_;
   int64_t start_;
   std::unique_ptr<rocksdb::TransactionLogIterator> iterator_;
-
- private:
   napi_ref ref_ = nullptr;
 };
 
@@ -1958,33 +2013,7 @@ NAPI_METHOD(updates_next) {
     Updates* updates;
     NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&updates)));
 
-    if (!updates->iterator_) {
-      rocksdb::TransactionLogIterator::ReadOptions options;
-      ROCKS_STATUS_THROWS_NAPI(updates->database_->db->GetUpdatesSince(updates->start_, &updates->iterator_, options));
-    }
-
-    ROCKS_STATUS_THROWS_NAPI(updates->iterator_->status());
-
-    if (!updates->iterator_->Valid()) {
-      return 0;
-    }
-
-    auto batchResult = updates->iterator_->GetBatch();
-
-    napi_value rows;
-    napi_value sequence;
-
-    NAPI_STATUS_THROWS(updates->Iterate(env, *batchResult.writeBatchPtr, &rows));
-    NAPI_STATUS_THROWS(napi_create_int64(env, batchResult.sequence, &sequence));
-
-    ROCKS_STATUS_THROWS_NAPI(updates->iterator_->status());
-    updates->iterator_->Next();
-
-    napi_value ret;
-    NAPI_STATUS_THROWS(napi_create_object(env, &ret));
-    NAPI_STATUS_THROWS(napi_set_named_property(env, ret, "rows", rows));
-    NAPI_STATUS_THROWS(napi_set_named_property(env, ret, "seq", sequence));
-    return ret;
+    return updates->nextv(env, -1, -1, argv[1]);
   } catch (const std::exception& e) {
     napi_throw_error(env, nullptr, e.what());
     return nullptr;

package/binding.gyp

@@ -16,8 +16,8 @@
                           "/usr/lib/x86_64-linux-gnu/include",
                           "/usr/lib/include",
                         ],
-                        "cflags": ["-march=znver1"],
-                        "ccflags": ["-flto", '-march=znver1'],
+                        "cflags": ["-march=znver2", '-mtune=znver3'],
+                        "cflags_cc": ["-flto", '-march=znver2', '-mtune=znver3'],
                         "cflags!": ["-fno-exceptions"],
                         "cflags_cc!": ["-fno-exceptions"],
                         "ldflags": ["-flto", "-fuse-linker-plugin"],

package/deps/rocksdb/rocksdb.gyp

@@ -67,15 +67,15 @@
               "rocksdb/env/io_posix.cc"
             ],
             "defines": ["ROCKSDB_PLATFORM_POSIX=1", "ROCKSDB_LIB_IO_POSIX=1"],
-            "ccflags": [
+            "cflags_cc": [
               "-fno-omit-frame-pointer",
               "-momit-leaf-frame-pointer",
               "-fno-builtin-memcmp",
             ],
-            "cflags": ["-std=c++20", "-march=znver1"],
+            "cflags": ["-std=c++20", "-march=znver2", "-mtune=znver3"],
             "cflags!": ["-fno-rtti"],
             "cflags_cc!": ["-fno-rtti"],
-            "cflags_cc+": ["-frtti", '-march=znver1']
+            "cflags_cc+": ["-frtti", '-march=znver2', "-mtune=znver3"],
           }
         ],
         [
@@ -116,7 +116,7 @@
               "/usr/lib/include",
             ],
             "cflags": ["-march=znver1"],
-            "ccflags": ["-march=znver1", "-flto", "-fcoroutines"],
+            "cflags_cc": ["-march=znver1", "-flto", "-fcoroutines"],
             "cflags!": ["-fno-exceptions"],
             "cflags_cc!": ["-fno-exceptions"],
             "ldflags": ["-flto", "-fuse-linker-plugin"],
@@ -128,11 +128,11 @@
             "defines": ["OS_MACOSX=1"],
             "direct_dependent_settings": {
               "libraries": [
-                "/opt/homebrew/Cellar/zstd/1.5.6/lib/libzstd.a"
+                "/opt/homebrew/Cellar/zstd/1.5.7/lib/libzstd.a"
               ],
             },
             "include_dirs": [
-              "/opt/homebrew/Cellar/zstd/1.5.6/include"
+              "/opt/homebrew/Cellar/zstd/1.5.7/include"
             ],
             "xcode_settings": {
               "OTHER_CPLUSPLUSFLAGS": [

package/index.js

@@ -271,10 +271,24 @@ class RocksLevel extends AbstractLevel {
   }
 
   async * updates (options) {
+    yield * this.updatesAsync(options)
+  }
+
+  async * updatesAsync (options) {
+    if (this.status !== 'open') {
+      throw new ModuleError('Database is not open', {
+        code: 'LEVEL_DATABASE_NOT_OPEN'
+      })
+    }
+
     const handle = binding.updates_init(this[kContext], options)
     try {
       while (true) {
-        const value = binding.updates_next(handle)
+        const value = await new Promise((resolve, reject) => {
+          binding.updates_next(
+            handle,
+            (err, val) => err ? reject(err) : resolve(val))
+        })
         if (!value) {
           break
         }

package/package.json

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