upgrade rocksdb 5.4.5 (#60)

circle.yml

@@ -46,9 +46,9 @@ dependencies:
       if [[ ! -e $HOME/.local/lib/librocksdb.so ]]; then
         export CPLUS_INCLUDE_PATH="${LOCAL_PREFIX}/include" && \
         cd /tmp && \
-        curl -L https://github.com/facebook/rocksdb/archive/v5.2.1.tar.gz -o rocksdb.tar.gz && \
+        curl -L https://github.com/facebook/rocksdb/archive/v5.4.5.tar.gz -o rocksdb.tar.gz && \
         tar xf rocksdb.tar.gz && \
-        cd rocksdb-5.2.1 && \
+        cd rocksdb-5.4.5 && \
         INSTALL_PATH=${LOCAL_PREFIX} make -j install-shared;
       fi
   post:

librocksdb_sys/build.sh

@@ -124,11 +124,11 @@ function compile_rocksdb() {
         return
     fi
 
-    version=v5.2.1
-    vernum=5.2.1
+    version=v5.4.5
+    vernum=5.4.5
     echo building rocksdb-$version
     rm -rf rocksdb-$vernum
-    download https://github.com/facebook/rocksdb/archive/$version.tar.gz rocksdb-$version.tar.gz c4a436bc769a0c836bc2e3567e83a8aa
+    download https://github.com/facebook/rocksdb/archive/$version.tar.gz rocksdb-$version.tar.gz 5f07eca94039900c0c23b95a8fb91e59
     tar xf rocksdb-$version.tar.gz
     wd=`pwd`
     cd rocksdb-$vernum

librocksdb_sys/crocksdb/c.cc

@@ -1145,8 +1145,9 @@ crocksdb_writebatch_t* crocksdb_writebatch_create() {
   return new crocksdb_writebatch_t;
 }
 
-crocksdb_writebatch_t* crocksdb_writebatch_create_with_capacity(size_t reserved_bytes) {
-  crocksdb_writebatch_t* b = new crocksdb_writebatch_t;
+crocksdb_writebatch_t *
+crocksdb_writebatch_create_with_capacity(size_t reserved_bytes) {
+  crocksdb_writebatch_t *b = new crocksdb_writebatch_t;
   b->rep = WriteBatch(reserved_bytes);
   return b;
 }
@@ -1505,7 +1506,8 @@ void crocksdb_options_set_block_based_table_factory(
   }
 }
 
-void crocksdb_options_set_max_subcompactions(crocksdb_options_t *opt, size_t v) {
+void crocksdb_options_set_max_subcompactions(crocksdb_options_t *opt,
+                                             uint32_t v) {
   opt->rep.max_subcompactions = v;
 }
 
@@ -1773,8 +1775,9 @@ void crocksdb_options_set_use_direct_reads(crocksdb_options_t* opt, unsigned cha
   opt->rep.use_direct_reads = v;
 }
 
-void crocksdb_options_set_use_direct_writes(crocksdb_options_t* opt, unsigned char v) {
-  opt->rep.use_direct_writes = v;
+void crocksdb_options_set_use_direct_io_for_flush_and_compaction(
+    crocksdb_options_t *opt, unsigned char v) {
+  opt->rep.use_direct_io_for_flush_and_compaction = v;
 }
 
 void crocksdb_options_set_prefix_extractor(

librocksdb_sys/crocksdb/rocksdb/c.h

@@ -404,8 +404,8 @@ extern C_ROCKSDB_LIBRARY_API void crocksdb_iter_get_error(
 /* Write batch */
 
 extern C_ROCKSDB_LIBRARY_API crocksdb_writebatch_t* crocksdb_writebatch_create();
-extern C_ROCKSDB_LIBRARY_API crocksdb_writebatch_t*
-    crocksdb_writebatch_create_with_capacity(size_t reserved_bytes);
+extern C_ROCKSDB_LIBRARY_API crocksdb_writebatch_t *
+crocksdb_writebatch_create_with_capacity(size_t reserved_bytes);
 extern C_ROCKSDB_LIBRARY_API crocksdb_writebatch_t* crocksdb_writebatch_create_from(
     const char* rep, size_t size);
 extern C_ROCKSDB_LIBRARY_API void crocksdb_writebatch_destroy(
@@ -614,8 +614,9 @@ extern C_ROCKSDB_LIBRARY_API void crocksdb_options_set_compression_options(
     crocksdb_options_t*, int, int, int, int);
 extern C_ROCKSDB_LIBRARY_API void crocksdb_options_set_use_direct_reads(crocksdb_options_t* opt,
     unsigned char v);
-extern C_ROCKSDB_LIBRARY_API void crocksdb_options_set_use_direct_writes(crocksdb_options_t* opt,
-    unsigned char v);
+extern C_ROCKSDB_LIBRARY_API void
+crocksdb_options_set_use_direct_io_for_flush_and_compaction(
+    crocksdb_options_t *opt, unsigned char v);
 extern C_ROCKSDB_LIBRARY_API void crocksdb_options_set_prefix_extractor(
     crocksdb_options_t*, crocksdb_slicetransform_t*);
 extern C_ROCKSDB_LIBRARY_API void
@@ -792,8 +793,8 @@ extern C_ROCKSDB_LIBRARY_API void crocksdb_options_set_report_bg_io_stats(
     crocksdb_options_t*, int);
 extern C_ROCKSDB_LIBRARY_API void crocksdb_options_set_compaction_readahead_size(
     crocksdb_options_t*, size_t);
-extern C_ROCKSDB_LIBRARY_API void crocksdb_options_set_max_subcompactions(
-    crocksdb_options_t*, size_t);
+extern C_ROCKSDB_LIBRARY_API void
+crocksdb_options_set_max_subcompactions(crocksdb_options_t *, uint32_t);
 extern C_ROCKSDB_LIBRARY_API void crocksdb_options_set_wal_bytes_per_sync(
     crocksdb_options_t*, uint64_t);
 

librocksdb_sys/src/lib.rs

@@ -263,7 +263,7 @@ extern "C" {
     pub fn crocksdb_options_set_report_bg_io_stats(options: *mut DBOptions, v: c_int);
     pub fn crocksdb_options_set_compaction_readahead_size(options: *mut DBOptions, v: size_t);
     pub fn crocksdb_options_set_wal_recovery_mode(options: *mut DBOptions, mode: DBRecoveryMode);
-    pub fn crocksdb_options_set_max_subcompactions(options: *mut DBOptions, v: size_t);
+    pub fn crocksdb_options_set_max_subcompactions(options: *mut DBOptions, v: u32);
     pub fn crocksdb_options_set_wal_bytes_per_sync(options: *mut DBOptions, v: u64);
     pub fn crocksdb_options_enable_statistics(options: *mut DBOptions);
     pub fn crocksdb_options_statistics_get_string(options: *mut DBOptions) -> *const c_char;
@@ -291,7 +291,8 @@ extern "C" {
     pub fn crocksdb_options_set_wal_ttl_seconds(options: *mut DBOptions, ttl: u64);
     pub fn crocksdb_options_set_wal_size_limit_mb(options: *mut DBOptions, limit: u64);
     pub fn crocksdb_options_set_use_direct_reads(options: *mut DBOptions, v: bool);
-    pub fn crocksdb_options_set_use_direct_writes(options: *mut DBOptions, v: bool);
+    pub fn crocksdb_options_set_use_direct_io_for_flush_and_compaction(options: *mut DBOptions,
+                                                                       v: bool);
     pub fn crocksdb_options_set_prefix_extractor(options: *mut DBOptions,
                                                  prefix_extractor: *mut DBSliceTransform);
     pub fn crocksdb_options_set_optimize_filters_for_hits(options: *mut DBOptions, v: bool);

src/rocksdb_options.rs

@@ -515,9 +515,10 @@ impl Options {
         }
     }
 
-    pub fn set_use_direct_writes(&mut self, v: bool) {
+    pub fn set_use_direct_io_for_flush_and_compaction(&mut self, v: bool) {
         unsafe {
-            crocksdb_ffi::crocksdb_options_set_use_direct_writes(self.inner, v);
+            crocksdb_ffi::crocksdb_options_set_use_direct_io_for_flush_and_compaction(self.inner,
+                                                                                      v);
         }
     }
 
@@ -596,7 +597,7 @@ impl Options {
         }
     }
 
-    pub fn set_max_subcompactions(&mut self, n: usize) {
+    pub fn set_max_subcompactions(&mut self, n: u32) {
         unsafe {
             crocksdb_ffi::crocksdb_options_set_max_subcompactions(self.inner, n);
         }

tests/test_rocksdb_options.rs

@@ -299,7 +299,7 @@ fn test_direct_read_write() {
     let mut opts = Options::new();
     opts.create_if_missing(true);
     opts.set_use_direct_reads(true);
-    opts.set_use_direct_writes(true);
+    opts.set_use_direct_io_for_flush_and_compaction(true);
     DB::open(opts, path.path().to_str().unwrap()).unwrap();
 }