@nxtedition/rocksdb 13.1.2 → 13.1.4

package/binding.cc

@@ -898,6 +898,7 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
   }
 
   NAPI_STATUS_RETURN(GetProperty(env, options, "optimizeFiltersForHits", columnOptions.optimize_filters_for_hits));
+  NAPI_STATUS_RETURN(GetProperty(env, options, "periodicCompactionSeconds", columnOptions.periodic_compaction_seconds));
 
   rocksdb::BlockBasedTableOptions tableOptions;
   tableOptions.decouple_partitioned_filters = true;
@@ -1066,42 +1067,37 @@ NAPI_METHOD(db_open) {
     dbOptions.avoid_unnecessary_blocking_io = true;
     NAPI_STATUS_THROWS(GetProperty(env, options, "avoidUnnecessaryBlockingIO", dbOptions.avoid_unnecessary_blocking_io));
 
-    dbOptions.write_dbid_to_manifest = true;
-    NAPI_STATUS_THROWS(GetProperty(env, options, "writeDbIdToManifest", dbOptions.write_dbid_to_manifest));
-
     dbOptions.create_missing_column_families = true;
     NAPI_STATUS_THROWS(GetProperty(env, options, "createMissingColumnFamilies", dbOptions.create_missing_column_families));
 
-    dbOptions.fail_if_options_file_error = true;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "writeDbIdToManifest", dbOptions.write_dbid_to_manifest));
+
     NAPI_STATUS_THROWS(GetProperty(env, options, "failIfOptionsFileError", dbOptions.fail_if_options_file_error));
 
-    dbOptions.advise_random_on_open = true;
     NAPI_STATUS_THROWS(GetProperty(env, options, "adviseRandomOnOpen", dbOptions.advise_random_on_open));
 
-    dbOptions.bytes_per_sync = 1024 * 1024;
     NAPI_STATUS_THROWS(GetProperty(env, options, "bytesPerSync", dbOptions.bytes_per_sync));
 
-    dbOptions.wal_bytes_per_sync = 1024 * 1024;
     NAPI_STATUS_THROWS(GetProperty(env, options, "walBytesPerSync", dbOptions.wal_bytes_per_sync));
 
-    dbOptions.strict_bytes_per_sync = true;
     NAPI_STATUS_THROWS(GetProperty(env, options, "strictBytesPerSync", dbOptions.strict_bytes_per_sync));
 
-    dbOptions.create_if_missing = false;
+    NAPI_STATUS_THROWS(GetProperty(env, options, "delayedWriteRate", dbOptions.delayed_write_rate));
+
     NAPI_STATUS_THROWS(GetProperty(env, options, "createIfMissing", dbOptions.create_if_missing));
 
-    dbOptions.error_if_exists = false;
     NAPI_STATUS_THROWS(GetProperty(env, options, "errorIfExists", dbOptions.error_if_exists));
 
-    dbOptions.enable_pipelined_write = true;
     NAPI_STATUS_THROWS(GetProperty(env, options, "pipelinedWrite", dbOptions.enable_pipelined_write));
 
-    dbOptions.daily_offpeak_time_utc = "";
     NAPI_STATUS_THROWS(GetProperty(env, options, "dailyOffpeakTime",  dbOptions.daily_offpeak_time_utc));
 
-    dbOptions.unordered_write = false;
     NAPI_STATUS_THROWS(GetProperty(env, options, "unorderedWrite",  dbOptions.unordered_write));
 
+    NAPI_STATUS_THROWS(GetProperty(env, options, "allowMmapReads",  dbOptions.allow_mmap_reads));
+
+    NAPI_STATUS_THROWS(GetProperty(env, options, "allowMmapWrites",  dbOptions.allow_mmap_writes));
+
     // TODO (feat): dbOptions.listeners
 
     std::string infoLogLevel;
@@ -1235,18 +1231,12 @@ NAPI_METHOD(db_get_many_sync) {
   uint32_t count;
   NAPI_STATUS_THROWS(napi_get_array_length(env, argv[1], &count));
 
-  bool fillCache = true;
-  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "fillCache", fillCache));
-
   rocksdb::ColumnFamilyHandle* column = database->db->DefaultColumnFamily();
   NAPI_STATUS_THROWS(GetProperty(env, argv[2], "column", column));
 
   Encoding valueEncoding = Encoding::Buffer;
   NAPI_STATUS_THROWS(GetProperty(env, argv[2], "valueEncoding", valueEncoding));
 
-  int32_t highWaterMarkBytes = std::numeric_limits<int32_t>::max();
-  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "highWaterMarkBytes", highWaterMarkBytes));
-
   uint32_t timeout = 0;
   NAPI_STATUS_THROWS(GetProperty(env, argv[2], "timeout", timeout));
 
@@ -1267,14 +1257,22 @@ NAPI_METHOD(db_get_many_sync) {
   }
 
   rocksdb::ReadOptions readOptions;
-  readOptions.fill_cache = fillCache;
-  readOptions.async_io = true;
-  readOptions.optimize_multiget_for_io = true;
-  readOptions.value_size_soft_limit = highWaterMarkBytes;
   readOptions.deadline = timeout
     ? std::chrono::microseconds(database->db->GetEnv()->NowMicros() + timeout * 1000)
     : std::chrono::microseconds::zero();
 
+  readOptions.fill_cache = false;
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "fillCache", readOptions.fill_cache));
+
+  readOptions.async_io = true;
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "asyncIO", readOptions.async_io));
+
+  readOptions.optimize_multiget_for_io = true;
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "optimizeMultigetForIO", readOptions.optimize_multiget_for_io));
+
+  readOptions.value_size_soft_limit = std::numeric_limits<int32_t>::max();
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "highWaterMarkBytes", readOptions.value_size_soft_limit));
+
   database->db->MultiGet(readOptions, column, count, keys.data(), values.data(), statuses.data());
 
   napi_value rows;
@@ -1309,24 +1307,19 @@ NAPI_METHOD(db_get_many) {
   uint32_t count;
   NAPI_STATUS_THROWS(napi_get_array_length(env, argv[1], &count));
 
-  bool fillCache = true;
-  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "fillCache", fillCache));
-
   rocksdb::ColumnFamilyHandle* column = database->db->DefaultColumnFamily();
   NAPI_STATUS_THROWS(GetProperty(env, argv[2], "column", column));
 
   Encoding valueEncoding = Encoding::Buffer;
   NAPI_STATUS_THROWS(GetProperty(env, argv[2], "valueEncoding", valueEncoding));
 
-  int32_t highWaterMarkBytes = std::numeric_limits<int32_t>::max();
-  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "highWaterMarkBytes", highWaterMarkBytes));
-
   bool unsafe = false;
   NAPI_STATUS_THROWS(GetProperty(env, argv[2], "unsafe", unsafe));
 
   auto callback = argv[3];
 
   struct State {
+    rocksdb::ReadOptions readOptions;
     std::vector<rocksdb::Status> statuses;
     std::vector<rocksdb::PinnableSlice> values;
     std::vector<rocksdb::PinnableSlice> keys;
@@ -1340,15 +1333,21 @@ NAPI_METHOD(db_get_many) {
     NAPI_STATUS_THROWS(GetValue(env, element, state.keys[n]));
   }
 
+  state.readOptions.fill_cache = false;
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "fillCache", state.readOptions.fill_cache));
+
+  state.readOptions.async_io = true;
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "asyncIO", state.readOptions.async_io));
+
+  state.readOptions.optimize_multiget_for_io = true;
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "optimizeMultigetForIO", state.readOptions.optimize_multiget_for_io));
+
+  state.readOptions.value_size_soft_limit = std::numeric_limits<int32_t>::max();
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "highWaterMarkBytes", state.readOptions.value_size_soft_limit));
+
   runAsync(std::move(state),
       "leveldown.get_many", env, callback,
       [=](auto& state) {
-        rocksdb::ReadOptions readOptions;
-        readOptions.fill_cache = fillCache;
-        readOptions.async_io = true;
-        readOptions.optimize_multiget_for_io = true;
-        readOptions.value_size_soft_limit = highWaterMarkBytes;
-
         std::vector<rocksdb::Slice> keys;
         keys.reserve(count);
         for (uint32_t n = 0; n < count; n++) {
@@ -1358,7 +1357,7 @@ NAPI_METHOD(db_get_many) {
         state.statuses.resize(count);
         state.values.resize(count);
 
-        database->db->MultiGet(readOptions, column, count, keys.data(), state.values.data(), state.statuses.data());
+        database->db->MultiGet(state.readOptions, column, count, keys.data(), state.values.data(), state.statuses.data());
 
         return rocksdb::Status::OK();
       },

package/package.json

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