@nxtedition/rocksdb 7.0.62 → 7.0.65

package/binding.gyp

@@ -1,83 +1,54 @@
 {
-  "variables": { "openssl_fips": "0" },
-  "targets": [
-    {
-      "target_name": "leveldown",
-      "conditions": [
-        [
-          "OS == 'win'",
-          {
-            "defines": ["_HAS_EXCEPTIONS=1", "OS_WIN=1"],
-            "msvs_settings": {
-              "VCCLCompilerTool": {
-                "RuntimeTypeInfo": "false",
-                "EnableFunctionLevelLinking": "true",
-                "ExceptionHandling": "2",
-                "DisableSpecificWarnings": [
-                  "4355",
-                  "4530",
-                  "4267",
-                  "4244",
-                  "4506"
+    "variables": {"openssl_fips": "0"},
+    "targets": [
+        {
+            "target_name": "leveldown",
+            "conditions": [
+                [
+                    "OS == 'linux'",
+                    {
+                        "cflags": [
+                            "-msse4.2",
+                            "-mpclmul",
+                            "-mavx",
+                            "-mavx2",
+                            "-mbmi",
+                            "-mlzcnt"
+                        ],
+                        "ccflags": ["-flto"],
+                        "cflags!": ["-fno-exceptions"],
+                        "cflags_cc!": ["-fno-exceptions"],
+                        "ldflags": ["-flto", "-fuse-linker-plugin"]
+                    }
+                ],
+                [
+                    "OS == 'mac'",
+                    {
+                        "xcode_settings": {
+                            "WARNING_CFLAGS": [
+                                "-Wno-sign-compare",
+                                "-Wno-unused-variable",
+                                "-Wno-unused-function",
+                                "-Wno-ignored-qualifiers"
+                            ],
+                            "OTHER_CPLUSPLUSFLAGS": [
+                                "-mmacosx-version-min=12.2.1",
+                                "-std=c++20",
+                                "-fno-omit-frame-pointer",
+                                "-momit-leaf-frame-pointer",
+                                "-arch x86_64",
+                                "-arch arm64"
+                            ],
+                            "GCC_ENABLE_CPP_RTTI": "YES",
+                            "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
+                            "MACOSX_DEPLOYMENT_TARGET": "12.2.1"
+                        }
+                    }
                 ]
-              },
-              "VCLinkerTool": {
-                "AdditionalDependencies": ["Shlwapi.lib", "rpcrt4.lib"]
-              }
-            }
-          },
-          {
-            "cflags": ["-std=c++20"],
-            "cflags!": ["-fno-rtti"],
-            "cflags_cc!": ["-fno-rtti"],
-            "cflags_cc+": ["-frtti"]
-          }
-        ],
-        [
-          "OS == 'linux'",
-          {
-            "cflags": [
-              "-msse4.2",
-              "-mpclmul",
-              "-mavx",
-              "-mavx2",
-              "-mbmi",
-              "-mlzcnt"
             ],
-            "ccflags": ["-flto"],
-            "cflags!": ["-fno-exceptions"],
-            "cflags_cc!": ["-fno-exceptions"],
-            "ldflags": ["-flto", "-fuse-linker-plugin"]
-          }
-        ],
-        [
-          "OS == 'mac'",
-          {
-            "xcode_settings": {
-              "WARNING_CFLAGS": [
-                "-Wno-sign-compare",
-                "-Wno-unused-variable",
-                "-Wno-unused-function",
-                "-Wno-ignored-qualifiers"
-              ],
-              "OTHER_CPLUSPLUSFLAGS": [
-                "-mmacosx-version-min=12.2.1",
-                "-std=c++20",
-                "-fno-omit-frame-pointer",
-                "-momit-leaf-frame-pointer",
-                "-arch x86_64",
-                "-arch arm64"
-              ],
-              "GCC_ENABLE_CPP_RTTI": "YES",
-              "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-              "MACOSX_DEPLOYMENT_TARGET": "12.2.1"
-            }
-          }
-        ]
-      ],
-      "dependencies": ["<(module_root_dir)/deps/rocksdb/rocksdb.gyp:rocksdb"],
-      "include_dirs": ["<!(node -e \"require('napi-macros')\")"],
-      "sources": ["binding.cc"]
-    }
-  ]
+            "dependencies": ["<(module_root_dir)/deps/rocksdb/rocksdb.gyp:rocksdb"],
+            "include_dirs": ["<!(node -e \"require('napi-macros')\")"],
+            "sources": ["binding.cc"]
+        }
+    ]
 }

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

@@ -120,6 +120,10 @@ Status WalManager::GetUpdatesSince(
     return s;
   }
 
+  std::sort(std::begin(*wal_files), std::end(*wal_files), [](auto& lhs, auto& rhs) {
+    return lhs->StartSequence() > rhs->StartSequence();
+  });
+
   s = RetainProbableWalFiles(*wal_files, seq);
   if (!s.ok()) {
     return s;

package/index.js

@@ -11,13 +11,16 @@ 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')
 const kLocation = Symbol('location')
 const kPromise = Symbol('promise')
 const kUpdates = Symbol('updates')
+const kRef = Symbol('ref')
+const kUnref = Symbol('unref')
+const kRefs = Symbol('refs')
+const kPendingClose = Symbol('pendingClose')
 
 const EMPTY = {}
 
@@ -67,6 +70,9 @@ class RocksLevel extends AbstractLevel {
     this[kContext] = binding.db_init()
     this[kColumns] = {}
 
+    this[kRefs] = 0
+    this[kPendingClose] = null
+
     // .updates(...) uses 'update' listener.
     this.setMaxListeners(100)
   }
@@ -102,8 +108,23 @@ class RocksLevel extends AbstractLevel {
     }
   }
 
+  [kRef] () {
+    this[kRefs]++
+  }
+
+  [kUnref] () {
+    this[kRefs]--
+    if (this[kRefs] === 0 && this[kPendingClose]) {
+      this[kPendingClose]()
+    }
+  }
+
   _close (callback) {
-    binding.db_close(this[kContext], callback)
+    if (this[kRefs]) {
+      this[kPendingClose] = callback
+    } else {
+      binding.db_close(this[kContext], callback)
+    }
   }
 
   _put (key, value, options, callback) {
@@ -138,9 +159,14 @@ class RocksLevel extends AbstractLevel {
     callback = fromCallback(callback, kPromise)
 
     try {
-      binding.db_get_many(this[kContext], keys, options ?? EMPTY, callback)
+      this[kRef]()
+      binding.db_get_many(this[kContext], keys, options ?? EMPTY, (err, val) => {
+        callback(err, val)
+        this[kUnref]()
+      })
     } catch (err) {
       process.nextTick(callback, err)
+      this[kUnref]()
     }
 
     return callback[kPromise]
@@ -223,36 +249,6 @@ class RocksLevel extends AbstractLevel {
     return binding.db_get_property(this[kContext], property)
   }
 
-  async getCurrentWALFile () {
-    if (this.status !== 'open') {
-      throw new ModuleError('Database is not open', {
-        code: 'LEVEL_DATABASE_NOT_OPEN'
-      })
-    }
-
-    return binding.db_get_current_wal_file(this[kContext])
-  }
-
-  async getSortedWALFiles () {
-    if (this.status !== 'open') {
-      throw new ModuleError('Database is not open', {
-        code: 'LEVEL_DATABASE_NOT_OPEN'
-      })
-    }
-
-    return binding.db_get_sorted_wal_files(this[kContext])
-  }
-
-  async flushWAL (options) {
-    if (this.status !== 'open') {
-      throw new ModuleError('Database is not open', {
-        code: 'LEVEL_DATABASE_NOT_OPEN'
-      })
-    }
-
-    binding.db_flush_wal(this[kContext], options)
-  }
-
   async query (options) {
     if (this.status !== 'open') {
       throw new ModuleError('Database is not open', {
@@ -260,17 +256,9 @@ class RocksLevel extends AbstractLevel {
       })
     }
 
-    const context = binding.iterator_init(this[kContext], options)
-    const resource = {
-      callback: null,
-      close (callback) {
-        this.callback = callback
-      }
-    }
-
+    const context = binding.iterator_init(this[kContext], options ?? {})
     try {
-      this.attachResource(resource)
-
+      this[kRef]()
       const limit = options.limit ?? 1000
       return await new Promise((resolve, reject) => binding.iterator_nextv(context, limit, (err, rows, finished) => {
         if (err) {
@@ -284,11 +272,8 @@ class RocksLevel extends AbstractLevel {
         }
       }))
     } finally {
-      this.detachResource(resource)
       binding.iterator_close(context)
-      if (resource.callback) {
-        resource.callback()
-      }
+      this[kUnref]()
     }
   }
 
@@ -348,35 +333,9 @@ class RocksLevel extends AbstractLevel {
 
     const db = this
 
-    // HACK: https://github.com/facebook/rocksdb/issues/10476
-    async function * _updates (options) {
-      let first = true
-      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
-          } else {
-            first = false
-          }
-        }
-        yield update
-      }
-
-      if (first === null) {
-        for await (const update of db[kUpdates]({ ...options, since: 0 })) {
-          yield update
-        }
-      }
-    }
-
     try {
       let since = options.since
-      for (let retryCount = 0; true; retryCount++) {
-        assert(retryCount < 8)
-
+      while (true) {
         const buffer = new Readable({
           signal: ac.signal,
           objectMode: true,
@@ -404,15 +363,23 @@ class RocksLevel extends AbstractLevel {
 
         try {
           if (since <= db.sequence) {
-            for await (const update of _updates(options)) {
-              if (ac.signal.aborted) {
-                throw new AbortError()
+            let first = true
+            for await (const update of db[kUpdates]({
+              ...options,
+              signal: ac.signal,
+              // HACK: https://github.com/facebook/rocksdb/issues/10476
+              since: Math.max(0, options.since)
+            })) {
+              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
-                retryCount = 0
               }
             }
           }
@@ -430,16 +397,13 @@ class RocksLevel extends AbstractLevel {
         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
+              db.emit('warning', `Invalid batch sequence ${update.sequence} > ${options.since}.`)
             }
             first = false
           }
           if (update.sequence >= since) {
             yield update
             since = update.sequence + update.count
-            retryCount = 0
           }
         }
       }
@@ -449,72 +413,32 @@ class RocksLevel extends AbstractLevel {
     }
   }
 
-  async * [kUpdates] (options) {
-    class Updates {
-      constructor (db, options) {
-        this.context = binding.updates_init(db[kContext], options)
-        this.closed = false
-        this.promise = null
-        this.db = db
-        this.db.attachResource(this)
-      }
-
-      async next () {
-        if (this.closed) {
-          return {}
+  async * [kUpdates] ({ signal, ...options }) {
+    const context = binding.updates_init(this[kContext], options)
+    this[kRef]()
+    try {
+      while (true) {
+        if (signal?.aborted) {
+          throw new AbortError()
         }
 
-        this.promise = new Promise(resolve => binding.updates_next(this.context, (err, rows, sequence, count) => {
-          this.promise = null
+        const entry = await new Promise((resolve, reject) => binding.updates_next(context, (err, rows, sequence, count) => {
           if (err) {
-            resolve(Promise.reject(err))
+            reject(err)
           } else {
             resolve({ rows, sequence, count })
           }
         }))
 
-        return this.promise
-      }
-
-      async close (callback) {
-        try {
-          await this.promise
-        } catch {
-          // Do nothing...
-        }
-
-        try {
-          if (!this.closed) {
-            this.closed = true
-            binding.updates_close(this.context)
-          }
-
-          if (callback) {
-            process.nextTick(callback)
-          }
-        } catch (err) {
-          if (callback) {
-            process.nextTick(callback, err)
-          } else {
-            throw err
-          }
-        } finally {
-          this.db.detachResource(this)
-        }
-      }
-    }
-
-    const updates = new Updates(this, options)
-    try {
-      while (true) {
-        const entry = await updates.next()
         if (!entry.rows) {
           return
         }
+
         yield entry
       }
     } finally {
-      await updates.close()
+      binding.updates_close(context)
+      this[kUnref]()
     }
   }
 }

package/package.json

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