Merge pull request #261 from aleksuss/rocksdb-5-17-2

Update rocksdb version up to 5.17.2

Cargo.toml

@@ -25,4 +25,4 @@ bzip2 = ["librocksdb-sys/bzip2"]
 
 [dependencies]
 libc = "0.2"
-librocksdb-sys = { path = "librocksdb-sys", version = "5.14.3" }
+librocksdb-sys = { path = "librocksdb-sys", version = "5.17.2" }

librocksdb-sys/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "librocksdb-sys"
-version = "5.14.3"
+version = "5.17.2"
 authors = ["Karl Hobley <karlhobley10@gmail.com>", "Arkadiy Paronyan <arkadiy@ethcore.io>"]
 license = "MIT/Apache-2.0/BSD-3-Clause"
 description = "Native bindings to librocksdb"
 readme = "README.md"
-repository = "https://github.com/spacejam/rust-rocksdb.git"
+repository = "https://github.com/rust-rocksdb/rust-rocksdb.git"
 keywords = [ "ffi", "rocksdb" ]
 
 build = "build.rs"
@@ -25,11 +25,10 @@ bzip2 = []
 libc = "0.2"
 
 [dev-dependencies]
-const-cstr = "0.2"
+const-cstr = "0.3"
 uuid = { version = "0.7", features = ["v4"] }
 
 [build-dependencies]
 cc = { version = "^1.0", features = ["parallel"] }
-make-cmd = "0.1"
-bindgen = "0.43"
+bindgen = "0.47"
 glob = "0.2.11"

librocksdb-sys/README.md

@@ -4,7 +4,7 @@ RocksDB bindings
 Low-level bindings to RocksDB's C API.
 
 Based on original work by Tyler Neely
-https://github.com/spacejam/rust-rocksdb
+https://github.com/rust-rocksdb/rust-rocksdb
 and Jeremy Fitzhardinge
 https://github.com/jsgf/rocksdb-sys
 

librocksdb-sys/build_version.cc

@@ -1,4 +1,4 @@
 #include "build_version.h"
-const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:f201a44b4102308b840b15d9b89122af787476f1";
-const char* rocksdb_build_git_date = "rocksdb_build_git_date:2016-10-27";
+const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:f438b98e552010613cff8684a7d84191ed785148";
+const char* rocksdb_build_git_date = "rocksdb_build_git_date:2018-11-18";
 const char* rocksdb_build_compile_date = __DATE__;

librocksdb-sys/rocksdb

@@ -1 +1 @@
-Subproject commit 5089e121166c46956a8a21c8ef967f1896c239de
+Subproject commit f438b98e552010613cff8684a7d84191ed785148

librocksdb-sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2014 Tyler Neely, 2016 Alex Regueiro
+// Copyright 2019 Tyler Neely, Alex Regueiro
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

librocksdb-sys/src/test.rs

@@ -1,4 +1,4 @@
-// Copyright 2014 Tyler Neely
+// Copyright 2019 Tyler Neely
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -55,13 +55,15 @@ fn internal() {
 
         let key = b"name\x00";
         let val = b"spacejam\x00";
-        rocksdb_put(db,
-                    writeopts.clone(),
-                    key.as_ptr() as *const c_char,
-                    4,
-                    val.as_ptr() as *const c_char,
-                    8,
-                    err_ptr);
+        rocksdb_put(
+            db,
+            writeopts.clone(),
+            key.as_ptr() as *const c_char,
+            4,
+            val.as_ptr() as *const c_char,
+            8,
+            err_ptr,
+        );
         rocksdb_writeoptions_destroy(writeopts);
         assert!(err.is_null());
 
@@ -70,12 +72,14 @@ fn internal() {
 
         let mut val_len: size_t = 0;
         let val_len_ptr = &mut val_len as *mut size_t;
-        rocksdb_get(db,
-                    readopts.clone(),
-                    key.as_ptr() as *const c_char,
-                    4,
-                    val_len_ptr,
-                    err_ptr);
+        rocksdb_get(
+            db,
+            readopts.clone(),
+            key.as_ptr() as *const c_char,
+            4,
+            val_len_ptr,
+            err_ptr,
+        );
         rocksdb_readoptions_destroy(readopts);
         assert!(err.is_null());
         rocksdb_close(db);