@nxtedition/rocksdb 7.0.60 → 7.0.63

package/binding.cc

@@ -408,7 +408,8 @@ struct BatchIterator : public rocksdb::WriteBatch::Handler {
 
   napi_status Iterate(napi_env env, const rocksdb::WriteBatch& batch, napi_value* result) {
     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));
@@ -455,6 +456,8 @@ struct BatchIterator : public rocksdb::WriteBatch::Handler {
       NAPI_STATUS_RETURN(napi_set_element(env, *result, n * 4 + 3, nullVal));
     }
 
+    cache_.clear();
+
     return napi_ok;
   }
 
@@ -1156,9 +1159,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 +1380,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

@@ -66,7 +66,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 +178,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)
@@ -343,17 +347,14 @@ 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.`)
-            for await (const update of db[kUpdates]({ ...options, since: 0 })) {
-              yield update
-            }
+            first = null
             break
           } else {
             first = false
@@ -361,6 +362,12 @@ class RocksLevel extends AbstractLevel {
         }
         yield update
       }
+
+      if (first === null) {
+        for await (const update of db[kUpdates]({ ...options, since: 0 })) {
+          yield update
+        }
+      }
     }
 
     try {
@@ -371,22 +378,18 @@ class RocksLevel extends AbstractLevel {
           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)
           }
         })
@@ -397,11 +400,23 @@ class RocksLevel extends AbstractLevel {
 
         try {
           if (since <= db.sequence) {
-            for await (const update of _updates(options)) {
+            let first = true
+            for await (const update of _updates({
+              ...options,
+              // HACK: https://github.com/facebook/rocksdb/issues/10476
+              since: Math.max(0, options.since - 2048)
+            })) {
               if (ac.signal.aborted) {
                 throw new AbortError()
               }
 
+              if (first) {
+                if (update.sequence > since) {
+                  db.emit('warning', `Invalid updates sequence ${update.sequence} > ${options.since}.`)
+                }
+                first = false
+              }
+
               if (update.sequence >= since) {
                 yield update
                 since = update.sequence + update.count
@@ -420,11 +435,13 @@ class RocksLevel extends AbstractLevel {
 
         let first = true
         for await (const update of buffer) {
+          if (ac.signal.aborted) {
+            throw new AbortError()
+          }
+
           if (first) {
             if (update.sequence > since) {
-              // HACK
-              db.emit('warning', `Invalid batch sequence. Restarting.`)
-              break
+              db.emit('warning', `Invalid batch sequence ${update.sequence} > ${options.since}.`)
             }
             first = false
           }

package/package.json

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