@nxtedition/rocksdb 12.2.0 → 12.2.3

package/binding.cc

@@ -283,8 +283,7 @@ struct BaseIterator : public Closable {
                const std::optional<std::string>& gt,
                const std::optional<std::string>& gte,
                const int limit,
-               const bool fillCache,
-               bool tailing = false)
+               rocksdb::ReadOptions readOptions = {})
       : database_(database), column_(column), reverse_(reverse), limit_(limit) {
     if (lte) {
       upper_bound_ = rocksdb::PinnableSlice();
@@ -306,8 +305,6 @@ struct BaseIterator : public Closable {
       lower_bound_->PinSelf();
     }
 
-    rocksdb::ReadOptions readOptions;
-
     if (upper_bound_) {
       readOptions.iterate_upper_bound = &*upper_bound_;
     }
@@ -316,11 +313,6 @@ struct BaseIterator : public Closable {
       readOptions.iterate_lower_bound = &*lower_bound_;
     }
 
-    readOptions.fill_cache = fillCache;
-    readOptions.async_io = true;
-    readOptions.adaptive_readahead = true;
-    readOptions.tailing = tailing;
-
     iterator_.reset(database_->db->NewIterator(readOptions, column_));
 
     if (reverse_) {
@@ -430,12 +422,11 @@ class Iterator final : public BaseIterator {
            const std::optional<std::string>& lte,
            const std::optional<std::string>& gt,
            const std::optional<std::string>& gte,
-           const bool fillCache,
            const size_t highWaterMarkBytes,
-           bool tailing = false,
            Encoding keyEncoding = Encoding::Invalid,
-           Encoding valueEncoding = Encoding::Invalid)
-      : BaseIterator(database, column, reverse, lt, lte, gt, gte, limit, fillCache, tailing),
+           Encoding valueEncoding = Encoding::Invalid,
+           rocksdb::ReadOptions readOptions = {})
+      : BaseIterator(database, column, reverse, lt, lte, gt, gte, limit, readOptions),
         keys_(keys),
         values_(values),
         highWaterMarkBytes_(highWaterMarkBytes),
@@ -460,16 +451,10 @@ class Iterator final : public BaseIterator {
     bool values = true;
     NAPI_STATUS_THROWS(GetProperty(env, options, "values", values));
 
-    bool tailing = false;
-    NAPI_STATUS_THROWS(GetProperty(env, options, "tailing", tailing));
-
-    bool fillCache = false;
-    NAPI_STATUS_THROWS(GetProperty(env, options, "fillCache", fillCache));
-
     int32_t limit = -1;
     NAPI_STATUS_THROWS(GetProperty(env, options, "limit", limit));
 
-    int32_t highWaterMarkBytes = 64 * 1024;
+    int32_t highWaterMarkBytes = std::numeric_limits<int32_t>::max();
     NAPI_STATUS_THROWS(GetProperty(env, options, "highWaterMarkBytes", highWaterMarkBytes));
 
     std::optional<std::string> lt;
@@ -493,8 +478,41 @@ class Iterator final : public BaseIterator {
     Encoding valueEncoding;
     NAPI_STATUS_THROWS(GetProperty(env, options, "valueEncoding", valueEncoding));
 
-    return std::make_unique<Iterator>(database, column, reverse, keys, values, limit, lt, lte, gt, gte, fillCache,
-                                      highWaterMarkBytes, tailing, keyEncoding, valueEncoding);
+    rocksdb::ReadOptions readOptions;
+
+    readOptions.background_purge_on_iterator_cleanup = true;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "backgroundPurgeOnIteratorCleanup", readOptions.background_purge_on_iterator_cleanup));
+
+    readOptions.tailing = false;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "tailing", readOptions.tailing));
+
+    readOptions.fill_cache = false;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "fillCache", readOptions.fill_cache));
+
+    readOptions.async_io = true;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "asyncIO", readOptions.async_io));
+
+    readOptions.adaptive_readahead = true;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "adaptiveReadahead", readOptions.adaptive_readahead));
+
+    readOptions.readahead_size = 0;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "readaheadSize", readOptions.readahead_size));
+
+    readOptions.auto_readahead_size = true;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "autoReadaheadSize", readOptions.auto_readahead_size));
+
+    readOptions.ignore_range_deletions = false;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "ignoreRangeDeletions", readOptions.ignore_range_deletions));
+
+    uint32_t timeout = 0;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "timeout", timeout));
+
+    readOptions.deadline = timeout
+      ? std::chrono::microseconds(database->db->GetEnv()->NowMicros() + timeout * 1000)
+      : std::chrono::microseconds::zero();
+
+    return std::make_unique<Iterator>(database, column, reverse, keys, values, limit, lt, lte, gt, gte,
+                                      highWaterMarkBytes, keyEncoding, valueEncoding, readOptions);
   }
 
   napi_value nextv(napi_env env, uint32_t count, napi_value callback) {
@@ -518,6 +536,10 @@ class Iterator final : public BaseIterator {
               first_ = false;
             }
 
+            if (Status().IsTimedOut()) {
+              break;
+            }
+
             ROCKS_STATUS_RETURN(Status());
 
             if (!Valid() || !Increment()) {
@@ -614,6 +636,10 @@ class Iterator final : public BaseIterator {
         first_ = false;
       }
 
+      if (Status().IsTimedOut()) {
+        break;
+      }
+
       ROCKS_STATUS_THROWS_NAPI(Status());
 
       if (!Valid() || !Increment()) {
@@ -1327,7 +1353,7 @@ NAPI_METHOD(db_clear) {
     // TODO (fix): Error handling.
     // TODO (fix): This should be async...
 
-    BaseIterator it(database, column, reverse, lt, lte, gt, gte, limit, false);
+    BaseIterator it(database, column, reverse, lt, lte, gt, gte, limit);
 
     rocksdb::WriteBatch batch;
     rocksdb::WriteOptions writeOptions;

package/deps/rocksdb/rocksdb.gyp

@@ -70,7 +70,8 @@
             "ccflags": [
               "-fno-omit-frame-pointer",
               "-momit-leaf-frame-pointer",
-              "-fno-builtin-memcmp"
+              "-fno-builtin-memcmp",
+              "-fcoroutines",
             ],
             "cflags": ["-std=c++20", "-march=znver1"],
             "cflags!": ["-fno-rtti"],
@@ -90,6 +91,7 @@
               "ROCKSDB_SCHED_GETCPU_PRESENT=1",
               "ROCKSDB_IOURING_PRESENT=1",
               "USE_FOLLY=1",
+              "USE_COROUTINES=1",
               "HAVE_UINT128_EXTENSION=1",
               "HAVE_ALIGNED_NEW=1",
               # "HAVE_FULLFSYNC=1",

package/package.json

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

package/util.h

@@ -202,22 +202,45 @@ static napi_status GetValue(napi_env env, napi_value value, bool& result) {
   return napi_get_value_bool(env, value, &result);
 }
 
-static napi_status GetValue(napi_env env, napi_value value, uint32_t& result) {
-  return napi_get_value_uint32(env, value, &result);
+static napi_status GetValue(napi_env env, napi_value value, int& result) {
+  int64_t result2;
+  NAPI_STATUS_RETURN(napi_get_value_int64(env, value, &result2));
+  result = static_cast<int>(result2);
+  return napi_ok;
 }
 
-static napi_status GetValue(napi_env env, napi_value value, int32_t& result) {
-  return napi_get_value_int32(env, value, &result);
+static napi_status GetValue(napi_env env, napi_value value, long& result) {
+  int64_t result2;
+  NAPI_STATUS_RETURN(napi_get_value_int64(env, value, &result2));
+  result = static_cast<long>(result2);
+  return napi_ok;
 }
 
-static napi_status GetValue(napi_env env, napi_value value, int64_t& result) {
-  return napi_get_value_int64(env, value, &result);
+static napi_status GetValue(napi_env env, napi_value value, long long& result) {
+  int64_t result2;
+  NAPI_STATUS_RETURN(napi_get_value_int64(env, value, &result2));
+  result = static_cast<long long>(result2);
+  return napi_ok;
+}
+
+static napi_status GetValue(napi_env env, napi_value value, unsigned int& result) {
+  int64_t result2;
+  NAPI_STATUS_RETURN(napi_get_value_int64(env, value, &result2));
+  result = static_cast<unsigned int>(result2);
+  return napi_ok;
+}
+
+static napi_status GetValue(napi_env env, napi_value value, unsigned long& result) {
+  int64_t result2;
+  NAPI_STATUS_RETURN(napi_get_value_int64(env, value, &result2));
+  result = static_cast<unsigned long>(result2);
+  return napi_ok;
 }
 
-static napi_status GetValue(napi_env env, napi_value value, uint64_t& result) {
+static napi_status GetValue(napi_env env, napi_value value, unsigned long long& result) {
   int64_t result2;
   NAPI_STATUS_RETURN(napi_get_value_int64(env, value, &result2));
-  result = static_cast<uint64_t>(result2);
+  result = static_cast<unsigned long long>(result2);
   return napi_ok;
 }