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

Update rocksdb version up to 5.17.2
master
Jordan Terrell 6 years ago committed by GitHub
commit 47cd7ffe6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      Cargo.toml
  2. 9
      librocksdb-sys/Cargo.toml
  3. 2
      librocksdb-sys/README.md
  4. 4
      librocksdb-sys/build_version.cc
  5. 2
      librocksdb-sys/rocksdb
  6. 2
      librocksdb-sys/rocksdb_lib_sources.txt
  7. 2
      librocksdb-sys/src/lib.rs
  8. 14
      librocksdb-sys/src/test.rs

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

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

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

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

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

File diff suppressed because one or more lines are too long

@ -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"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.

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

Loading…
Cancel
Save