Update RocksDB to v10.2.1 (#89)

Author: bhartnett

rocksdb.nimble

@@ -1,5 +1,5 @@
 packageName = "rocksdb"
-version = "9.10.0.0"
+version = "10.2.1.0"
 author = "Status Research & Development GmbH"
 description =
   "A wrapper for Facebook's RocksDB, an embeddable, persistent key-value store for fast storage"

rocksdb/lib/rocksdb.h

@@ -449,7 +449,7 @@ extern ROCKSDB_LIBRARY_API void rocksdb_drop_column_family(
     rocksdb_t* db, rocksdb_column_family_handle_t* handle, char** errptr);
 
 extern ROCKSDB_LIBRARY_API rocksdb_column_family_handle_t*
-    rocksdb_get_default_column_family_handle(rocksdb_t* db);
+rocksdb_get_default_column_family_handle(rocksdb_t* db);
 
 extern ROCKSDB_LIBRARY_API void rocksdb_column_family_handle_destroy(
     rocksdb_column_family_handle_t*);
@@ -706,9 +706,6 @@ extern ROCKSDB_LIBRARY_API void rocksdb_compact_range_cf_opt(
     rocksdb_compactoptions_t* opt, const char* start_key, size_t start_key_len,
     const char* limit_key, size_t limit_key_len);
 
-extern ROCKSDB_LIBRARY_API void rocksdb_delete_file(rocksdb_t* db,
-                                                    const char* name);
-
 extern ROCKSDB_LIBRARY_API const rocksdb_livefiles_t* rocksdb_livefiles(
     rocksdb_t* db);
 
@@ -1358,6 +1355,11 @@ extern ROCKSDB_LIBRARY_API void rocksdb_options_set_periodic_compaction_seconds(
     rocksdb_options_t*, uint64_t);
 extern ROCKSDB_LIBRARY_API uint64_t
 rocksdb_options_get_periodic_compaction_seconds(rocksdb_options_t*);
+extern ROCKSDB_LIBRARY_API void
+rocksdb_options_set_memtable_op_scan_flush_trigger(rocksdb_options_t*,
+                                                   uint32_t);
+extern ROCKSDB_LIBRARY_API uint32_t
+rocksdb_options_get_memtable_op_scan_flush_trigger(rocksdb_options_t*);
 
 enum {
   rocksdb_statistics_level_disable_all = 0,
@@ -1465,11 +1467,6 @@ rocksdb_options_set_min_write_buffer_number_to_merge(rocksdb_options_t*, int);
 extern ROCKSDB_LIBRARY_API int
 rocksdb_options_get_min_write_buffer_number_to_merge(rocksdb_options_t*);
 extern ROCKSDB_LIBRARY_API void
-rocksdb_options_set_max_write_buffer_number_to_maintain(rocksdb_options_t*,
-                                                        int);
-extern ROCKSDB_LIBRARY_API int
-rocksdb_options_get_max_write_buffer_number_to_maintain(rocksdb_options_t*);
-extern ROCKSDB_LIBRARY_API void
 rocksdb_options_set_max_write_buffer_size_to_maintain(rocksdb_options_t*,
                                                       int64_t);
 extern ROCKSDB_LIBRARY_API int64_t
@@ -2143,6 +2140,18 @@ extern ROCKSDB_LIBRARY_API void rocksdb_compactoptions_set_target_level(
     rocksdb_compactoptions_t*, int);
 extern ROCKSDB_LIBRARY_API int rocksdb_compactoptions_get_target_level(
     rocksdb_compactoptions_t*);
+extern ROCKSDB_LIBRARY_API void rocksdb_compactoptions_set_target_path_id(
+    rocksdb_compactoptions_t*, int);
+extern ROCKSDB_LIBRARY_API int rocksdb_compactoptions_get_target_path_id(
+    rocksdb_compactoptions_t*);
+extern ROCKSDB_LIBRARY_API void rocksdb_compactoptions_set_allow_write_stall(
+    rocksdb_compactoptions_t*, unsigned char);
+extern ROCKSDB_LIBRARY_API unsigned char
+rocksdb_compactoptions_get_allow_write_stall(rocksdb_compactoptions_t*);
+extern ROCKSDB_LIBRARY_API void rocksdb_compactoptions_set_max_subcompactions(
+    rocksdb_compactoptions_t*, int);
+extern ROCKSDB_LIBRARY_API int rocksdb_compactoptions_get_max_subcompactions(
+    rocksdb_compactoptions_t*);
 extern ROCKSDB_LIBRARY_API void rocksdb_compactoptions_set_full_history_ts_low(
     rocksdb_compactoptions_t*, char* ts, size_t tslen);
 

rocksdb/lib/rocksdb_gen.nim

@@ -887,7 +887,6 @@ proc rocksdb_compact_range_cf_opt*(
   limit_key_len: csize_t,
 ) {.cdecl.}
 
-proc rocksdb_delete_file*(db: ptr rocksdb_t, name: cstring) {.cdecl.}
 proc rocksdb_livefiles*(db: ptr rocksdb_t): ptr rocksdb_livefiles_t {.cdecl.}
 proc rocksdb_flush*(
   db: ptr rocksdb_t, options: ptr rocksdb_flushoptions_t, errptr: cstringArray
@@ -1962,6 +1961,14 @@ proc rocksdb_options_get_periodic_compaction_seconds*(
   a1: ptr rocksdb_options_t
 ): uint64 {.cdecl.}
 
+proc rocksdb_options_set_memtable_op_scan_flush_trigger*(
+  a1: ptr rocksdb_options_t, a2: uint32
+) {.cdecl.}
+
+proc rocksdb_options_get_memtable_op_scan_flush_trigger*(
+  a1: ptr rocksdb_options_t
+): uint32 {.cdecl.}
+
 const
   rocksdb_statistics_level_disable_all* = 0
   rocksdb_statistics_level_except_tickers* = rocksdb_statistics_level_disable_all
@@ -2102,14 +2109,6 @@ proc rocksdb_options_get_min_write_buffer_number_to_merge*(
   a1: ptr rocksdb_options_t
 ): cint {.cdecl.}
 
-proc rocksdb_options_set_max_write_buffer_number_to_maintain*(
-  a1: ptr rocksdb_options_t, a2: cint
-) {.cdecl.}
-
-proc rocksdb_options_get_max_write_buffer_number_to_maintain*(
-  a1: ptr rocksdb_options_t
-): cint {.cdecl.}
-
 proc rocksdb_options_set_max_write_buffer_size_to_maintain*(
   a1: ptr rocksdb_options_t, a2: int64
 ) {.cdecl.}
@@ -3055,6 +3054,30 @@ proc rocksdb_compactoptions_get_target_level*(
   a1: ptr rocksdb_compactoptions_t
 ): cint {.cdecl.}
 
+proc rocksdb_compactoptions_set_target_path_id*(
+  a1: ptr rocksdb_compactoptions_t, a2: cint
+) {.cdecl.}
+
+proc rocksdb_compactoptions_get_target_path_id*(
+  a1: ptr rocksdb_compactoptions_t
+): cint {.cdecl.}
+
+proc rocksdb_compactoptions_set_allow_write_stall*(
+  a1: ptr rocksdb_compactoptions_t, a2: uint8
+) {.cdecl.}
+
+proc rocksdb_compactoptions_get_allow_write_stall*(
+  a1: ptr rocksdb_compactoptions_t
+): uint8 {.cdecl.}
+
+proc rocksdb_compactoptions_set_max_subcompactions*(
+  a1: ptr rocksdb_compactoptions_t, a2: cint
+) {.cdecl.}
+
+proc rocksdb_compactoptions_get_max_subcompactions*(
+  a1: ptr rocksdb_compactoptions_t
+): cint {.cdecl.}
+
 proc rocksdb_compactoptions_set_full_history_ts_low*(
   a1: ptr rocksdb_compactoptions_t, ts: cstring, tslen: csize_t
 ) {.cdecl.}

scripts/generate_wrapper.sh

@@ -11,7 +11,7 @@
 
 set -e
 
-nimble install c2nim
+#nimble install c2nim
 
 cd "$(dirname "${BASH_SOURCE[0]}")"/..
 
@@ -66,4 +66,4 @@ sed -i ':a;N;$!ba;s/#ifdef _WIN32\
 # generate nim wrapper
 c2nim ${OUTPUT_HEADER_FILE} --out:"${C2NIM_GENERATED_WRAPPER}"
 
-nimble format
+#nimble format