rocksdb-native 3.5.9 → 3.6.0

package/CMakeLists.txt

@@ -9,14 +9,11 @@ project(rocksdb_native C CXX)
 
 bare_target(target)
 
-if(target MATCHES "win32")
-  add_compile_options(/MT$<$<CONFIG:Debug>:d>)
-endif()
-
-fetch_package("github:holepunchto/librocksdb#4a8e385")
+fetch_package("github:holepunchto/librocksdb#2abcccb")
 
 if(TARGET c++)
   target_link_libraries(rocksdb PUBLIC c++)
+  target_link_libraries(rocksdb_facebook PUBLIC c++)
 endif()
 
 add_bare_module(rocksdb_native_bare)

package/binding.c

@@ -1007,13 +1007,13 @@ static js_value_t *
 rocksdb_native_iterator_open(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 13;
-  js_value_t *argv[13];
+  size_t argc = 14;
+  js_value_t *argv[14];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 13);
+  assert(argc == 14);
 
   rocksdb_native_t *db;
   err = js_get_arraybuffer_info(env, argv[0], (void **) &db, NULL);
@@ -1041,36 +1041,38 @@ rocksdb_native_iterator_open(js_env_t *env, js_callback_info_t *info) {
   err = js_get_typedarray_info(env, argv[6], NULL, (void **) &range.lte.data, &range.lte.len, NULL, NULL);
   assert(err == 0);
 
-  bool reverse;
-  err = js_get_value_bool(env, argv[7], &reverse);
-  assert(err == 0);
-
-  rocksdb_read_options_t options = {
+  rocksdb_iterator_options_t options = {
     .version = 0,
   };
 
+  err = js_get_value_bool(env, argv[7], &options.reverse);
+  assert(err == 0);
+
+  err = js_get_value_bool(env, argv[8], &options.keys_only);
+  assert(err == 0);
+
   bool has_snapshot;
-  err = js_is_arraybuffer(env, argv[8], &has_snapshot);
+  err = js_is_arraybuffer(env, argv[9], &has_snapshot);
   assert(err == 0);
 
   if (has_snapshot) {
-    err = js_get_arraybuffer_info(env, argv[8], (void **) &options.snapshot, NULL);
+    err = js_get_arraybuffer_info(env, argv[9], (void **) &options.snapshot, NULL);
     assert(err == 0);
   }
 
-  err = js_create_reference(env, argv[9], 1, &req->ctx);
+  err = js_create_reference(env, argv[10], 1, &req->ctx);
   assert(err == 0);
 
-  err = js_create_reference(env, argv[10], 1, &req->on_open);
+  err = js_create_reference(env, argv[11], 1, &req->on_open);
   assert(err == 0);
 
-  err = js_create_reference(env, argv[11], 1, &req->on_close);
+  err = js_create_reference(env, argv[12], 1, &req->on_close);
   assert(err == 0);
 
-  err = js_create_reference(env, argv[12], 1, &req->on_read);
+  err = js_create_reference(env, argv[13], 1, &req->on_read);
   assert(err == 0);
 
-  err = rocksdb_iterator_open(&db->handle, &req->handle, column_family->handle, range, reverse, &options, rocksdb_native__on_iterator_open);
+  err = rocksdb_iterator_open(&db->handle, &req->handle, column_family->handle, range, &options, rocksdb_native__on_iterator_open);
   assert(err == 0);
 
   err = js_add_deferred_teardown_callback(env, rocksdb_native__on_iterator_teardown, (void *) req, &req->teardown);

package/index.js

@@ -115,6 +115,15 @@ class RocksDB {
     return new Iterator(this, { ...range, ...opts })
   }
 
+  async *keys(range, opts) {
+    for await (const { key } of this.iterator(range, {
+      ...opts,
+      values: false
+    })) {
+      yield key
+    }
+  }
+
   async peek(range, opts) {
     for await (const value of this.iterator({ ...range, ...opts, limit: 1 })) {
       return value

package/lib/iterator.js

@@ -12,6 +12,7 @@ module.exports = class RocksDBIterator extends Readable {
       lt = null,
       lte = null,
       reverse = false,
+      values = true,
       limit = Infinity,
       capacity = 8
     } = opts
@@ -28,6 +29,7 @@ module.exports = class RocksDBIterator extends Readable {
     this._lte = lte ? this._encodeKey(lte) : empty
 
     this._reverse = reverse
+    this._values = values
     this._limit = limit < 0 ? Infinity : limit
     this._capacity = capacity
     this._opened = false
@@ -63,7 +65,7 @@ module.exports = class RocksDBIterator extends Readable {
     for (let i = 0; i < n; i++) {
       this.push({
         key: this._decodeKey(Buffer.from(keys[i])),
-        value: this._decodeValue(Buffer.from(values[i]))
+        value: this._values ? this._decodeValue(Buffer.from(values[i])) : null
       })
     }
 
@@ -126,6 +128,7 @@ module.exports = class RocksDBIterator extends Readable {
         this._lt,
         this._lte,
         this._reverse,
+        !this._values, // Keys only
         this._db._snapshot ? this._db._snapshot._handle : null,
         this,
         this._onopen,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "3.5.9",
+  "version": "3.6.0",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",