rocksdb-native 0.0.0 → 0.0.2

package/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.25)
 
-project(rocksdb_native C)
+project(rocksdb_native C CXX)
 
 include(bare)
 

package/binding.c

@@ -24,7 +24,6 @@ typedef struct {
   uint32_t create_if_missing;
   uint32_t max_background_jobs;
   uint32_t bytes_per_sync;
-  uint32_t compaction_style;
   uint32_t table_block_size;
   uint32_t table_cache_index_and_filter_blocks;
   uint32_t table_pin_l0_filter_and_index_blocks_in_cache;
@@ -154,6 +153,10 @@ on_worker_status_cb (uv_work_t *req, int st) {
   rocksdb_native_t *self = (rocksdb_native_t *) req;
 
   js_env_t *env = self->env;
+
+  js_handle_scope_t *scope;
+  js_open_handle_scope(env, &scope);
+
   js_value_t *ctx;
   js_value_t *on_status;
 
@@ -170,6 +173,7 @@ on_worker_status_cb (uv_work_t *req, int st) {
   }
 
   js_call_function(env, ctx, on_status, 1, &value, NULL);
+  js_close_handle_scope(env, scope);
 }
 
 static uint64_t
@@ -195,15 +199,20 @@ on_worker_open (uv_work_t *req) {
 
   rocksdb_options_set_max_background_jobs(opts, o->options.max_background_jobs);
   rocksdb_options_set_bytes_per_sync(opts, o->options.bytes_per_sync);
-  rocksdb_options_set_compaction_style(opts, o->options.compaction_style);
 
   rocksdb_block_based_options_set_block_size(topts, o->options.table_block_size);
   rocksdb_block_based_options_set_cache_index_and_filter_blocks(topts, o->options.table_cache_index_and_filter_blocks);
   rocksdb_block_based_options_set_pin_l0_filter_and_index_blocks_in_cache(topts, o->options.table_pin_l0_filter_and_index_blocks_in_cache);
   rocksdb_block_based_options_set_format_version(topts, o->options.table_format_version);
 
+  rocksdb_filterpolicy_t *filter = rocksdb_filterpolicy_create_bloom(10);
+  rocksdb_block_based_options_set_filter_policy(topts, filter);
+
   rocksdb_options_set_block_based_table_factory(opts, topts);
 
+  rocksdb_options_set_hash_link_list_rep(opts, 200000);
+  rocksdb_options_set_allow_concurrent_memtable_write(opts, 0);
+
   if (o->options.enable_blob_files) {
     rocksdb_options_set_enable_blob_files(opts, 1);
     if (o->options.min_blob_size) rocksdb_options_set_min_blob_size(opts, o->options.min_blob_size);
@@ -261,6 +270,7 @@ on_worker_close (uv_work_t *req) {
   rocksdb_native_t *self = (rocksdb_native_t *) req;
   uv_handle_t *handle = (uv_handle_t *) self;
 
+  rocksdb_cancel_all_background_work(self->db, 1);
   rocksdb_close(self->db);
 
   handle->data = NULL;
@@ -310,7 +320,7 @@ on_worker_batch (uv_work_t *req) {
 
 static void
 free_db_read (js_env_t *env, void *data, void *hint) {
-  free(data);
+  rocksdb_free(data);
 }
 
 static void
@@ -319,6 +329,10 @@ on_worker_batch_cb (uv_work_t *req, int st) {
   rocksdb_native_batch_t *r = &(self->read_batch);
 
   js_env_t *env = self->env;
+
+  js_handle_scope_t *scope;
+  js_open_handle_scope(env, &scope);
+
   js_value_t *gets;
   js_create_array_with_length(env, r->size, &gets);
 
@@ -347,6 +361,7 @@ on_worker_batch_cb (uv_work_t *req, int st) {
   };
 
   js_call_function(env, ctx, on_batch, 1, values, NULL);
+  js_close_handle_scope(env, scope);
 }
 
 static js_value_t *

package/binding.gyp

@@ -0,0 +1,23 @@
+{
+  'targets': [{
+    'target_name': 'rocksdb',
+    'include_dirs': [
+      '<!(bare-dev paths compat/napi)',
+      './vendor/rocksdb/include',
+    ],
+    'dependencies': [
+      './vendor/rocksdb.gyp:librocksdb',
+    ],
+    'sources': [
+      './binding.c',
+    ],
+    'configurations': {
+      'Debug': {
+        'defines': ['DEBUG'],
+      },
+      'Release': {
+        'defines': ['NDEBUG'],
+      },
+    },
+  }],
+}

package/binding.js

@@ -1 +1 @@
-module.exports = process.addon(__dirname)
+module.exports = require('node-gyp-build')(__dirname)

package/index.js

@@ -54,7 +54,6 @@ module.exports = class RocksDB extends ReadyResource {
     createIfMissing = true,
     maxBackgroundJobs = 6,
     bytesPerSync = 1048576,
-    compactionStyle = 3, // https://github.com/facebook/rocksdb/blob/main/include/rocksdb/advanced_options.h#L41
     // (block) table options
     tableBlockSize = 16384,
     tableCacheIndexAndFilterBlocks = true,
@@ -74,7 +73,6 @@ module.exports = class RocksDB extends ReadyResource {
     this.createIfMissing = createIfMissing
     this.maxBackgroundJobs = maxBackgroundJobs
     this.bytesPerSync = bytesPerSync
-    this.compactionStyle = compactionStyle
 
     this.tableBlockSize = tableBlockSize
     this.tableCacheIndexAndFilterBlocks = tableCacheIndexAndFilterBlocks
@@ -105,22 +103,21 @@ module.exports = class RocksDB extends ReadyResource {
 
     const opening = new Promise(resolve => { this._statusResolve = resolve })
 
-    const opts = new Uint32Array(14)
+    const opts = new Uint32Array(13)
 
     opts[0] = this.readOnly ? 1 : 0
     opts[1] = this.createIfMissing ? 1 : 0
     opts[2] = this.maxBackgroundJobs
     opts[3] = this.bytesPerSync
-    opts[4] = this.compactionStyle
-    opts[5] = this.tableBlockSize
-    opts[6] = this.tableCacheIndexAndFilterBlocks ? 1 : 0
-    opts[7] = this.tablePinL0FilterAndIndexBlocksInCache ? 1 : 0
-    opts[8] = this.tableFormatVersion
-    opts[9] = this.enableBlobFiles ? 1 : 0
-    opts[10] = this.minBlobSize
-    opts[11] = this.blobFileSize & 0xffffffff
-    opts[12] = Math.floor(this.blobFileSize / 0x100000000)
-    opts[13] = this.enableBlobGarbageCollection ? 1 : 0
+    opts[4] = this.tableBlockSize
+    opts[5] = this.tableCacheIndexAndFilterBlocks ? 1 : 0
+    opts[6] = this.tablePinL0FilterAndIndexBlocksInCache ? 1 : 0
+    opts[7] = this.tableFormatVersion
+    opts[8] = this.enableBlobFiles ? 1 : 0
+    opts[9] = this.minBlobSize
+    opts[10] = this.blobFileSize & 0xffffffff
+    opts[11] = Math.floor(this.blobFileSize / 0x100000000)
+    opts[12] = this.enableBlobGarbageCollection ? 1 : 0
 
     binding.rocksdb_native_open(this._handle, this.path, opts)
 
@@ -158,20 +155,28 @@ module.exports = class RocksDB extends ReadyResource {
   }
 
   _onbatch (getValues) {
-    for (let i = 0; i < this._writes.promises.length; i++) {
-      const { resolve } = this._writes.promises[i]
-      resolve()
+    if (this._writes !== null) {
+      for (let i = 0; i < this._writes.promises.length; i++) {
+        const { resolve } = this._writes.promises[i]
+        resolve()
+      }
+      this._writes = null
     }
 
-    for (let i = 0; i < this._reads.promises.length; i++) {
-      const { resolve } = this._reads.promises[i]
-      const buffer = getValues[i]
-      resolve(buffer === null ? null : Buffer.from(buffer, 0, buffer.byteLength))
+    if (this._reads !== null) {
+      for (let i = 0; i < this._reads.promises.length; i++) {
+        const { resolve } = this._reads.promises[i]
+        const buffer = getValues[i]
+        resolve(buffer === null ? null : Buffer.from(buffer, 0, buffer.byteLength))
+      }
+      this._reads = null
     }
 
-    this._reads = this._writes = null
-
     while (this._flushes.length > 0) this._flushes.shift()()
+
+    if (this._nextReads.keys.length || this._nextWrites.keys.length) {
+      this._flushMaybe()
+    }
   }
 
   _encodeKey (k) {
@@ -197,9 +202,14 @@ module.exports = class RocksDB extends ReadyResource {
 
     if (this._reads.keys.length) {
       this._nextReads = new ReadBatch()
+    } else {
+      this._reads = null
     }
+
     if (this._writes.keys.length) {
       this._nextWrites = new WriteBatch()
+    } else {
+      this._writes = null
     }
   }
 
@@ -219,6 +229,7 @@ module.exports = class RocksDB extends ReadyResource {
     if (this.opened === false) await this.ready()
     if (this.closing) throw new Error('DB is closed')
     if (this.readOnly === true) throw new Error('DB is readOnly')
+    if (ops.length === 0) return
 
     const all = new Array(ops.length)
 
@@ -254,6 +265,7 @@ module.exports = class RocksDB extends ReadyResource {
   async getBatch (keys) {
     if (this.opened === false) await this.ready()
     if (this.closing) throw new Error('DB is closed')
+    if (keys.length === 0) return
 
     const all = new Array(keys.length)
 

package/package.json

@@ -1,9 +1,27 @@
 {
   "name": "rocksdb-native",
-  "version": "0.0.0",
+  "version": "0.0.2",
   "description": "RocksDB native bindings",
   "main": "index.js",
+  "files": [
+    "index.js",
+    "binding.c",
+    "binding.gyp",
+    "binding.js",
+    "CMakeLists.txt",
+    "prebuilds",
+    "vendor/rocksdb.cc",
+    "vendor/rocksdb.gyp",
+    "vendor/rocksdb/**/CMakeLists.txt",
+    "vendor/rocksdb/**/*.cmake",
+    "vendor/rocksdb/**/*.cmake.in",
+    "vendor/rocksdb/**/*.cc",
+    "vendor/rocksdb/**/*.cc.in",
+    "vendor/rocksdb/**/*.h",
+    "vendor/rocksdb/**/*.pc.in"
+  ],
   "dependencies": {
+    "node-gyp-build": "^4.6.1",
     "ready-resource": "^1.0.0"
   },
   "repository": {

package/vendor/rocksdb.cc

@@ -0,0 +1,79 @@
+// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+
+#include <memory>
+
+#include "rocksdb/version.h"
+#include "rocksdb/utilities/object_registry.h"
+#include "util/string_util.h"
+
+// The build script may replace these values with real values based
+// on whether or not GIT is available and the platform settings
+static const std::string rocksdb_build_git_sha  = "rocksdb_build_git_sha:3f7c92b9753b697ce6a5ea737086d2751f17956c";
+static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:";
+#define HAS_GIT_CHANGES 0
+#if HAS_GIT_CHANGES == 0
+// If HAS_GIT_CHANGES is 0, the GIT date is used.
+// Use the time the branch/tag was last modified
+static const std::string rocksdb_build_date = "rocksdb_build_date:2023-06-14 22:32:14";
+#else
+// If HAS_GIT_CHANGES is > 0, the branch/tag has modifications.
+// Use the time the build was created.
+static const std::string rocksdb_build_date = "rocksdb_build_date:2023-09-07 11:54:32";
+#endif
+
+extern "C" {
+
+} // extern "C"
+
+std::unordered_map<std::string, ROCKSDB_NAMESPACE::RegistrarFunc> ROCKSDB_NAMESPACE::ObjectRegistry::builtins_ = {
+  
+};
+
+namespace ROCKSDB_NAMESPACE {
+static void AddProperty(std::unordered_map<std::string, std::string> *props, const std::string& name) {
+  size_t colon = name.find(":");
+  if (colon != std::string::npos && colon > 0 && colon < name.length() - 1) {
+    // If we found a "@:", then this property was a build-time substitution that failed.  Skip it
+    size_t at = name.find("@", colon);
+    if (at != colon + 1) {
+      // Everything before the colon is the name, after is the value
+      (*props)[name.substr(0, colon)] = name.substr(colon + 1);
+    }
+  }
+}
+
+static std::unordered_map<std::string, std::string>* LoadPropertiesSet() {
+  auto * properties = new std::unordered_map<std::string, std::string>();
+  AddProperty(properties, rocksdb_build_git_sha);
+  AddProperty(properties, rocksdb_build_git_tag);
+  AddProperty(properties, rocksdb_build_date);
+  return properties;
+}
+
+const std::unordered_map<std::string, std::string>& GetRocksBuildProperties() {
+  static std::unique_ptr<std::unordered_map<std::string, std::string>> props(LoadPropertiesSet());
+  return *props;
+}
+
+std::string GetRocksVersionAsString(bool with_patch) {
+  std::string version = std::to_string(ROCKSDB_MAJOR) + "." + std::to_string(ROCKSDB_MINOR);
+  if (with_patch) {
+    return version + "." + std::to_string(ROCKSDB_PATCH);
+  } else {
+    return version;
+ }
+}
+
+std::string GetRocksBuildInfoAsString(const std::string& program, bool verbose) {
+  std::string info = program + " (RocksDB) " + GetRocksVersionAsString(true);
+  if (verbose) {
+    for (const auto& it : GetRocksBuildProperties()) {
+      info.append("\n    ");
+      info.append(it.first);
+      info.append(": ");
+      info.append(it.second);
+    }
+  }
+  return info;
+}
+} // namespace ROCKSDB_NAMESPACE