@nxtedition/rocksdb 7.0.58 → 7.0.61

package/deps/rocksdb/rocksdb/db/wal_manager.cc

@@ -366,7 +366,7 @@ Status WalManager::RetainProbableWalFiles(VectorLogPtr& all_logs,
     }
   }
   // end could be -ve.
-  size_t start_index = static_cast<size_t>(std::max(static_cast<int64_t>(0), end - 1));
+  size_t start_index = static_cast<size_t>(std::max(static_cast<int64_t>(0), end));
   // The last wal file is always included
   all_logs.erase(all_logs.begin(), all_logs.begin() + start_index);
   return Status::OK();

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')
@@ -349,8 +350,11 @@ class RocksLevel extends AbstractLevel {
       for await (const update of db[kUpdates](options)) {
         if (first) {
           if (update.sequence > options.since) {
-            db.emit('warning', `Invalid sequence ${update.sequence} > ${options.since}. Starting from 0.`)
-            first = null
+            // 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
+            }
             break
           } else {
             first = false
@@ -358,17 +362,13 @@ class RocksLevel extends AbstractLevel {
         }
         yield update
       }
-
-      if (first === null) {
-        for await (const update of db[kUpdates]({ ...options, since: 0 })) {
-          yield update
-        }
-      }
     }
 
     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,
@@ -408,6 +408,7 @@ class RocksLevel extends AbstractLevel {
               if (update.sequence >= since) {
                 yield update
                 since = update.sequence + update.count
+                retryCount = 0
               }
             }
           }
@@ -421,10 +422,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. Restarting.`)
+              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.58",
+  "version": "7.0.61",
   "description": "A low-level Node.js RocksDB binding",
   "license": "MIT",
   "main": "index.js",