@nxtedition/rocksdb 15.4.0 → 15.5.0

package/index.js

@@ -18,7 +18,7 @@ const kPendingClose = Symbol('pendingClose')
 
 const { kRef, kUnref } = require('./util')
 
-const kEmpty = {}
+const kEmpty = Object.freeze({})
 
 class RocksLevel extends AbstractLevel {
   constructor (locationOrHandle, { ...options } = {}) {
@@ -41,6 +41,10 @@ class RocksLevel extends AbstractLevel {
     this[kPendingClose] = null
   }
 
+  [Symbol.asyncDispose] () {
+    return this.close()
+  }
+
   static async open (...args) {
     const db = new this(...args)
     await db.open()
@@ -90,7 +94,7 @@ class RocksLevel extends AbstractLevel {
 
     if (options.createIfMissing) {
       fs.mkdir(this.location, { recursive: true }, (err) => {
-        if (err) {
+        if (err && err.code !== 'EEXIST') {
           callback(err)
         } else {
           doOpen()
@@ -157,6 +161,10 @@ class RocksLevel extends AbstractLevel {
   }
 
   _getManyAsync (keys, options, callback) {
+    if (keys.some(key => typeof key === 'string')) {
+      keys = keys.map(key => typeof key === 'string' ? Buffer.from(key) : key)
+    }
+
     callback = fromCallback(callback, kPromise)
 
     try {
@@ -170,6 +178,7 @@ class RocksLevel extends AbstractLevel {
         }
       })
     } catch (err) {
+      this[kUnref]()
       process.nextTick(callback, err)
     }
 

package/iterator.js

@@ -16,7 +16,7 @@ const kFirst = Symbol('first')
 const kPosition = Symbol('position')
 const kBusy = Symbol('busy')
 
-const kEmpty = []
+const kEmpty = Object.freeze([])
 
 class Iterator extends AbstractIterator {
   constructor (db, context, options) {
@@ -32,6 +32,10 @@ class Iterator extends AbstractIterator {
     this[kBusy] = false
   }
 
+  [Symbol.asyncDispose] () {
+    return this.close()
+  }
+
   _seek (target) {
     this._seekSync(target)
   }
@@ -88,14 +92,14 @@ class Iterator extends AbstractIterator {
       if (err) {
         callback(err)
       } else {
-        const { rows, finished } = val
+        const { rows, finished, limited } = val
 
         const entries = []
         for (let n = 0; n < rows.length; n += 2) {
           entries.push([rows[n + 0], rows[n + 1]])
         }
 
-        callback(null, entries, finished)
+        callback(null, entries, finished, limited)
       }
     })
 
@@ -132,6 +136,8 @@ class Iterator extends AbstractIterator {
     this[kPosition] = 0
 
     try {
+      this[kDB][kRef]()
+      this[kBusy] = true
       binding.iterator_seek(this[kContext], target, (err) => {
         this[kBusy] = false
         this[kDB][kUnref]()
@@ -142,9 +148,9 @@ class Iterator extends AbstractIterator {
           callback(null)
         }
       })
-      this[kDB][kRef]()
-      this[kBusy] = true
     } catch (err) {
+      this[kBusy] = false
+      this[kDB][kUnref]()
       process.nextTick(callback, err)
     }
 
@@ -175,6 +181,8 @@ class Iterator extends AbstractIterator {
       if (this[kFinished]) {
         process.nextTick(callback, null, { rows: [], finished: true })
       } else {
+        this[kDB][kRef]()
+        this[kBusy] = true
         binding.iterator_nextv(this[kContext], size, options, (err, result) => {
           this[kBusy] = false
           this[kDB][kUnref]()
@@ -186,10 +194,10 @@ class Iterator extends AbstractIterator {
             callback(null, result)
           }
         })
-        this[kBusy] = true
-        this[kDB][kRef]()
       }
     } catch (err) {
+      this[kBusy] = false
+      this[kDB][kUnref]()
       process.nextTick(callback, err)
     }
 

package/package.json

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

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/lua/rocks_lua_custom_library.h

@@ -1,43 +0,0 @@
-//  Copyright (c) 2016, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#pragma once
-#ifdef LUA
-
-// lua headers
-extern "C" {
-#include <lauxlib.h>
-#include <lua.h>
-#include <lualib.h>
-}
-
-namespace ROCKSDB_NAMESPACE {
-namespace lua {
-// A class that used to define custom C Library that is callable
-// from Lua script
-class RocksLuaCustomLibrary {
- public:
-  virtual ~RocksLuaCustomLibrary() {}
-  // The name of the C library.  This name will also be used as the table
-  // (namespace) in Lua that contains the C library.
-  virtual const char* Name() const = 0;
-
-  // Returns a "static const struct luaL_Reg[]", which includes a list of
-  // C functions.  Note that the last entry of this static array must be
-  // {nullptr, nullptr} as required by Lua.
-  //
-  // More details about how to implement Lua C libraries can be found
-  // in the official Lua document http://www.lua.org/pil/26.2.html
-  virtual const struct luaL_Reg* Lib() const = 0;
-
-  // A function that will be called right after the library has been created
-  // and pushed on the top of the lua_State.  This custom setup function
-  // allows developers to put additional table or constant values inside
-  // the same table / namespace.
-  virtual void CustomSetup(lua_State* /*L*/) const {}
-};
-}  // namespace lua
-}  // namespace ROCKSDB_NAMESPACE
-#endif  // LUA

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/lua/rocks_lua_util.h

@@ -1,55 +0,0 @@
-//  Copyright (c) 2016, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#pragma once
-// lua headers
-extern "C" {
-#include <lauxlib.h>
-#include <lua.h>
-#include <lualib.h>
-}
-
-#ifdef LUA
-#include <string>
-#include <vector>
-
-#include "rocksdb/utilities/lua/rocks_lua_custom_library.h"
-
-namespace ROCKSDB_NAMESPACE {
-namespace lua {
-class LuaStateWrapper {
- public:
-  explicit LuaStateWrapper(const std::string& lua_script) {
-    lua_state_ = luaL_newstate();
-    Init(lua_script, {});
-  }
-  LuaStateWrapper(
-      const std::string& lua_script,
-      const std::vector<std::shared_ptr<RocksLuaCustomLibrary>>& libraries) {
-    lua_state_ = luaL_newstate();
-    Init(lua_script, libraries);
-  }
-  lua_State* GetLuaState() const { return lua_state_; }
-  ~LuaStateWrapper() { lua_close(lua_state_); }
-
- private:
-  void Init(
-      const std::string& lua_script,
-      const std::vector<std::shared_ptr<RocksLuaCustomLibrary>>& libraries) {
-    if (lua_state_) {
-      luaL_openlibs(lua_state_);
-      for (const auto& library : libraries) {
-        luaL_openlib(lua_state_, library->Name(), library->Lib(), 0);
-        library->CustomSetup(lua_state_);
-      }
-      luaL_dostring(lua_state_, lua_script.c_str());
-    }
-  }
-
-  lua_State* lua_state_;
-};
-}  // namespace lua
-}  // namespace ROCKSDB_NAMESPACE
-#endif  // LUA