rocksdb-native 3.6.4 → 3.7.0

package/CMakeLists.txt

@@ -9,14 +9,15 @@ project(rocksdb_native C CXX)
 
 bare_target(target)
 
-fetch_package("github:holepunchto/librocksdb#2abcccb")
+fetch_package("github:holepunchto/librocksdb#46df5ef")
+fetch_package("github:holepunchto/libjstl#34a7894")
 
 add_bare_module(rocksdb_native_bare)
 
 target_sources(
   ${rocksdb_native_bare}
   PRIVATE
-    binding.c
+    binding.cc
 )
 
 target_link_libraries(
@@ -24,6 +25,7 @@ target_link_libraries(
   PRIVATE
     $<TARGET_OBJECTS:rocksdb>
     $<TARGET_OBJECTS:path>
+    jstl
   PUBLIC
     rocksdb
     rocksdb_facebook
@@ -35,7 +37,7 @@ add_napi_module(rocksdb_native_napi)
 target_sources(
   ${rocksdb_native_napi}
   PRIVATE
-    binding.c
+    binding.cc
 )
 
 target_compile_definitions(
@@ -49,6 +51,7 @@ target_link_libraries(
   PRIVATE
     $<TARGET_OBJECTS:rocksdb>
     $<TARGET_OBJECTS:path>
+    jstl
   PUBLIC
     rocksdb
     rocksdb_facebook

package/index.js

@@ -3,6 +3,7 @@ const Iterator = require('./lib/iterator')
 const Snapshot = require('./lib/snapshot')
 const State = require('./lib/state')
 const { BloomFilterPolicy, RibbonFilterPolicy } = require('./lib/filter-policy')
+const constants = require('./lib/constants')
 
 class RocksDB {
   constructor(path, opts = {}) {
@@ -188,6 +189,8 @@ class RocksDB {
 
 module.exports = exports = RocksDB
 
+exports.constants = constants
+
 exports.ColumnFamily = ColumnFamily
 exports.BloomFilterPolicy = BloomFilterPolicy
 exports.RibbonFilterPolicy = RibbonFilterPolicy

package/lib/batch.js

@@ -189,7 +189,7 @@ exports.ReadBatch = class RocksDBReadBatch extends RocksDBBatch {
         this._db._state._handle,
         this._handle,
         this._operations,
-        this._db._snapshot ? this._db._snapshot._handle : null,
+        this._db._snapshot ? this._db._snapshot._handle : undefined,
         this,
         this._onread
       )

package/lib/column-family.js

@@ -1,4 +1,5 @@
 const binding = require('../binding')
+const constants = require('./constants')
 const { BloomFilterPolicy } = require('./filter-policy')
 
 class RocksDBColumnFamily {
@@ -15,7 +16,10 @@ class RocksDBColumnFamily {
       tableFormatVersion = 6,
       optimizeFiltersForMemory = false,
       blockCache = true,
-      filterPolicy = new BloomFilterPolicy(10)
+      filterPolicy = new BloomFilterPolicy(10),
+      topLevelIndexPinningTier = constants.pinningTier.ALL,
+      partitionPinningTier = constants.pinningTier.ALL,
+      unpartitionedPinningTier = constants.pinningTier.ALL
     } = opts
 
     this._name = name
@@ -30,24 +34,25 @@ class RocksDBColumnFamily {
       tableFormatVersion,
       optimizeFiltersForMemory,
       blockCache,
-      filterPolicy
+      filterPolicy,
+      topLevelIndexPinningTier,
+      partitionPinningTier,
+      unpartitionedPinningTier
     }
 
-    const filterPolicyArguments = []
+    const filterPolicyArguments = [0, 0, 0]
 
-    if (filterPolicy === null) filterPolicyArguments.push(0)
-    else {
-      filterPolicyArguments.push(filterPolicy.type)
+    if (filterPolicy !== null) {
+      filterPolicyArguments[0] = filterPolicy.type
 
       switch (filterPolicy.type) {
         case 1: // Bloom filter policy
-          filterPolicyArguments.push(filterPolicy.bitsPerKey)
+          filterPolicyArguments[1] = filterPolicy.bitsPerKey
           break
         case 2: // Ribbon filter policy
-          filterPolicyArguments.push(
-            filterPolicy.bloomEquivalentBitsPerKey,
-            filterPolicy.bloomBeforeLevel
-          )
+          filterPolicyArguments[1] = filterPolicy.bloomEquivalentBitsPerKey
+          filterPolicyArguments[2] = filterPolicy.bloomBeforeLevel
+
           break
       }
     }
@@ -63,7 +68,10 @@ class RocksDBColumnFamily {
       tableFormatVersion,
       optimizeFiltersForMemory,
       blockCache === false,
-      ...filterPolicyArguments
+      ...filterPolicyArguments,
+      topLevelIndexPinningTier,
+      partitionPinningTier,
+      unpartitionedPinningTier
     )
   }
 

package/lib/constants.js

@@ -0,0 +1,7 @@
+module.exports = {
+  pinningTier: {
+    NONE: 0,
+    FLUSHED_AND_SIMILAR: 1,
+    ALL: 2
+  }
+}

package/lib/iterator.js

@@ -129,7 +129,7 @@ module.exports = class RocksDBIterator extends Readable {
         this._lte,
         this._reverse,
         !this._values, // Keys only
-        this._db._snapshot ? this._db._snapshot._handle : null,
+        this._db._snapshot ? this._db._snapshot._handle : undefined,
         this,
         this._onopen,
         this._onclose,

package/package.json

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