@nxtedition/rocksdb 7.0.59 → 7.0.62

package/binding.cc

@@ -407,8 +407,10 @@ struct BatchIterator : public rocksdb::WriteBatch::Handler {
         valueAsBuffer_(valueAsBuffer) {}
 
   napi_status Iterate(napi_env env, const rocksdb::WriteBatch& batch, napi_value* result) {
+    cache_.clear();
     cache_.reserve(batch.Count());
-    batch.Iterate(this);  // TODO (fix): Error?
+
+    batch.Iterate(this);  // TODO (fix): Handle error?
 
     napi_value putStr;
     NAPI_STATUS_RETURN(napi_create_string_utf8(env, "put", NAPI_AUTO_LENGTH, &putStr));
@@ -1156,9 +1158,8 @@ NAPI_METHOD(db_open) {
       "leveldown.open", env, callback, database, false,
       [=](auto& handles, auto& database) -> rocksdb::Status {
         rocksdb::DB* db = nullptr;
-        const auto status = descriptors.empty()
-                                ? rocksdb::DB::Open(dbOptions, location, &db)
-                                : rocksdb::DB::Open(dbOptions, location, descriptors, &handles, &db);
+        const auto status = descriptors.empty() ? rocksdb::DB::Open(dbOptions, location, &db)
+                                                : rocksdb::DB::Open(dbOptions, location, descriptors, &handles, &db);
         database.db_.reset(db);
         return status;
       },
@@ -1378,7 +1379,7 @@ NAPI_METHOD(db_get_many) {
           keys2.emplace_back(key);
         }
         std::vector<rocksdb::Status> statuses;
-        
+
         statuses.resize(keys2.size());
         values.resize(keys2.size());
 

package/index.js

@@ -11,6 +11,7 @@ const { Iterator } = require('./iterator')
 const { Readable } = require('readable-stream')
 const os = require('os')
 const AbortController = require('abort-controller')
+const assert = require('assert')
 
 const kContext = Symbol('context')
 const kColumns = Symbol('columns')
@@ -66,7 +67,7 @@ class RocksLevel extends AbstractLevel {
     this[kContext] = binding.db_init()
     this[kColumns] = {}
 
-    // .updates(...) uses 'write' listener.
+    // .updates(...) uses 'update' listener.
     this.setMaxListeners(100)
   }
 
@@ -178,7 +179,11 @@ class RocksLevel extends AbstractLevel {
       try {
         const seq = this.sequence
         binding.batch_write(this[kContext], context, options)
-        this.emit('write', batch, seq + 1)
+        this.emit('update', {
+          rows: batch.toArray(),
+          count: batch.length,
+          sequence: seq + 1
+        })
         process.nextTick(callback, null)
       } catch (err) {
         process.nextTick(callback, err)
@@ -344,11 +349,12 @@ class RocksLevel extends AbstractLevel {
     const db = this
 
     // HACK: https://github.com/facebook/rocksdb/issues/10476
-    async function* _updates (options) {
+    async function * _updates (options) {
       let first = true
-      for await (const update of db[kUpdates](options)) {
+      for await (const update of db[kUpdates]({ ...options, since: Math.max(0, options.since - 1024) })) {
         if (first) {
           if (update.sequence > options.since) {
+            // HACK
             db.emit('warning', `Invalid update sequence ${update.sequence} > ${options.since}. Starting from 0.`)
             first = null
             break
@@ -368,28 +374,26 @@ class RocksLevel extends AbstractLevel {
 
     try {
       let since = options.since
-      while (true) {
+      for (let retryCount = 0; true; retryCount++) {
+        assert(retryCount < 8)
+
         const buffer = new Readable({
           signal: ac.signal,
           objectMode: true,
           readableHighWaterMark: 1024,
           construct (callback) {
-            this._next = (batch, sequence) => {
-              if (!this.push({
-                rows: batch.toArray(options),
-                count: batch.length,
-                sequence
-              })) {
+            this._next = (update) => {
+              if (!this.push(update)) {
                 this.push(null)
-                db.off('write', this._next)
+                db.off('update', this._next)
               }
             }
-            db.on('write', this._next)
+            db.on('update', this._next)
             callback()
           },
           read () {},
           destroy (err, callback) {
-            db.off('write', this._next)
+            db.off('update', this._next)
             callback(err)
           }
         })
@@ -408,6 +412,7 @@ class RocksLevel extends AbstractLevel {
               if (update.sequence >= since) {
                 yield update
                 since = update.sequence + update.count
+                retryCount = 0
               }
             }
           }
@@ -421,10 +426,20 @@ class RocksLevel extends AbstractLevel {
           return
         }
 
+        let first = true
         for await (const update of buffer) {
+          if (first) {
+            if (update.sequence > since) {
+              // HACK
+              db.emit('warning', `Invalid batch sequence ${update.sequence} > ${options.since}. Starting from ${since}.`)
+              break
+            }
+            first = false
+          }
           if (update.sequence >= since) {
             yield update
             since = update.sequence + update.count
+            retryCount = 0
           }
         }
       }

package/package.json

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