From 2a221239013d6d286dedba2f404b4d7ec3f63718 Mon Sep 17 00:00:00 2001 From: Oleksandr Anyshchenko Date: Wed, 16 Oct 2019 16:54:53 +0300 Subject: [PATCH] Bump rocksdb up to 6.2.4 --- Cargo.toml | 2 +- librocksdb-sys/Cargo.toml | 2 +- librocksdb-sys/build.rs | 1 + librocksdb-sys/build_version.cc | 4 ++-- librocksdb-sys/rocksdb | 2 +- librocksdb-sys/rocksdb_lib_sources.txt | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4b0f81f..1431968 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,4 +25,4 @@ bzip2 = ["librocksdb-sys/bzip2"] [dependencies] libc = "0.2" -librocksdb-sys = { path = "librocksdb-sys", version = "6.1.2" } +librocksdb-sys = { path = "librocksdb-sys", version = "6.2.4" } diff --git a/librocksdb-sys/Cargo.toml b/librocksdb-sys/Cargo.toml index 6b9574c..6ae78e4 100644 --- a/librocksdb-sys/Cargo.toml +++ b/librocksdb-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librocksdb-sys" -version = "6.1.2" +version = "6.2.4" authors = ["Karl Hobley ", "Arkadiy Paronyan "] license = "MIT/Apache-2.0/BSD-3-Clause" description = "Native bindings to librocksdb" diff --git a/librocksdb-sys/build.rs b/librocksdb-sys/build.rs index 516ac4d..8de847e 100644 --- a/librocksdb-sys/build.rs +++ b/librocksdb-sys/build.rs @@ -82,6 +82,7 @@ fn build_rocksdb() { config.define("NDEBUG", Some("1")); let mut lib_sources = include_str!("rocksdb_lib_sources.txt") + .trim() .split("\n") .map(str::trim) .collect::>(); diff --git a/librocksdb-sys/build_version.cc b/librocksdb-sys/build_version.cc index a340258..e8c0a0b 100644 --- a/librocksdb-sys/build_version.cc +++ b/librocksdb-sys/build_version.cc @@ -1,4 +1,4 @@ #include "build_version.h" -const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:2b38e2dd6602a17a2010308580fd5d8c91dea650"; -const char* rocksdb_build_git_date = "rocksdb_build_git_date:2019-06-04"; +const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:@76a56d89a7740f8dbb01edabf1ea5abc95a67657@"; +const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2019/10/16 09:47:38@"; const char* rocksdb_build_compile_date = __DATE__; diff --git a/librocksdb-sys/rocksdb b/librocksdb-sys/rocksdb index 2b38e2d..76a56d8 160000 --- a/librocksdb-sys/rocksdb +++ b/librocksdb-sys/rocksdb @@ -1 +1 @@ -Subproject commit 2b38e2dd6602a17a2010308580fd5d8c91dea650 +Subproject commit 76a56d89a7740f8dbb01edabf1ea5abc95a67657 diff --git a/librocksdb-sys/rocksdb_lib_sources.txt b/librocksdb-sys/rocksdb_lib_sources.txt index 6fe6aff..f21e488 100644 --- a/librocksdb-sys/rocksdb_lib_sources.txt +++ b/librocksdb-sys/rocksdb_lib_sources.txt @@ -212,4 +212,4 @@ utilities/transactions/write_unprepared_txn.cc utilities/transactions/write_unprepared_txn_db.cc utilities/ttl/db_ttl_impl.cc utilities/write_batch_with_index/write_batch_with_index.cc -utilities/write_batch_with_index/write_batch_with_index_internal.cc \ No newline at end of file +utilities/write_batch_with_index/write_batch_with_index_internal.cc