From d6c779c179aa3e5f68e4d6a3dfef27a6f776d92c Mon Sep 17 00:00:00 2001 From: Oleksandr Anyshchenko Date: Fri, 10 Jul 2020 13:43:27 +0300 Subject: [PATCH] Bump rocksdb up to 6.10.2 (#444) --- Cargo.toml | 2 +- librocksdb-sys/Cargo.toml | 5 ++--- librocksdb-sys/build_version.cc | 4 ++-- librocksdb-sys/rocksdb | 2 +- librocksdb-sys/rocksdb_lib_sources.txt | 16 +++++++++++++++- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9b733ba..1a34ee8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ bzip2 = ["librocksdb-sys/bzip2"] [dependencies] libc = "0.2" -librocksdb-sys = { path = "librocksdb-sys", version = "6.8.1" } +librocksdb-sys = { path = "librocksdb-sys", version = "6.10.2" } [dev-dependencies] trybuild = "1.0.21" diff --git a/librocksdb-sys/Cargo.toml b/librocksdb-sys/Cargo.toml index 56ca30c..b175c7f 100644 --- a/librocksdb-sys/Cargo.toml +++ b/librocksdb-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librocksdb-sys" -version = "6.8.1" +version = "6.10.2" edition = "2018" authors = ["Karl Hobley ", "Arkadiy Paronyan "] license = "MIT/Apache-2.0/BSD-3-Clause" @@ -21,7 +21,6 @@ zstd = [] zlib = [] bzip2 = [] - [dependencies] libc = "0.2" @@ -31,5 +30,5 @@ uuid = { version = "0.8", features = ["v4"] } [build-dependencies] cc = { version = "^1.0", features = ["parallel"] } -bindgen = "0.53" +bindgen = "0.54" glob = "0.3" diff --git a/librocksdb-sys/build_version.cc b/librocksdb-sys/build_version.cc index cd67857..895607a 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:@27e593fbe10efa5a562ca79b1939ffb69d25163f@"; -const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2020/04/16 15:32:34@"; +const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:@1482c8697c260cc12f7fce9f15401a85330d2ff1@"; +const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2020/05/23 13:48:40@"; const char* rocksdb_build_compile_date = __DATE__; diff --git a/librocksdb-sys/rocksdb b/librocksdb-sys/rocksdb index 27e593f..1482c86 160000 --- a/librocksdb-sys/rocksdb +++ b/librocksdb-sys/rocksdb @@ -1 +1 @@ -Subproject commit 27e593fbe10efa5a562ca79b1939ffb69d25163f +Subproject commit 1482c8697c260cc12f7fce9f15401a85330d2ff1 diff --git a/librocksdb-sys/rocksdb_lib_sources.txt b/librocksdb-sys/rocksdb_lib_sources.txt index 86b5336..b136bcd 100644 --- a/librocksdb-sys/rocksdb_lib_sources.txt +++ b/librocksdb-sys/rocksdb_lib_sources.txt @@ -1,7 +1,11 @@ +cache/cache.cc cache/clock_cache.cc cache/lru_cache.cc cache/sharded_cache.cc db/arena_wrapped_db_iter.cc +db/blob/blob_file_addition.cc +db/blob/blob_file_garbage.cc +db/blob/blob_file_meta.cc db/builder.cc db/c.cc db/column_family.cc @@ -55,6 +59,7 @@ db/transaction_log_impl.cc db/trim_history_scheduler.cc db/version_builder.cc db/version_edit.cc +db/version_edit_handler.cc db/version_set.cc db/wal_manager.cc db/write_batch.cc @@ -86,6 +91,7 @@ logging/log_buffer.cc memory/arena.cc memory/concurrent_arena.cc memory/jemalloc_nodump_allocator.cc +memory/memkind_kmem_allocator.cc memtable/alloc_tracker.cc memtable/hash_linklist_rep.cc memtable/hash_skiplist_rep.cc @@ -111,16 +117,18 @@ options/db_options.cc options/options.cc options/options_helper.cc options/options_parser.cc -options/options_sanity_check.cc port/port_posix.cc port/stack_trace.cc table/adaptive/adaptive_table_factory.cc +table/block_based/binary_search_index_reader.cc table/block_based/block.cc table/block_based/block_based_filter_block.cc table/block_based/block_based_table_builder.cc table/block_based/block_based_table_factory.cc +table/block_based/block_based_table_iterator.cc table/block_based/block_based_table_reader.cc table/block_based/block_builder.cc +table/block_based/block_prefetcher.cc table/block_based/block_prefix_index.cc table/block_based/data_block_hash_index.cc table/block_based/data_block_footer.cc @@ -128,9 +136,14 @@ table/block_based/filter_block_reader_common.cc table/block_based/filter_policy.cc table/block_based/flush_block_policy.cc table/block_based/full_filter_block.cc +table/block_based/hash_index_reader.cc table/block_based/index_builder.cc +table/block_based/index_reader_common.cc table/block_based/parsed_full_filter_block.cc table/block_based/partitioned_filter_block.cc +table/block_based/partitioned_index_iterator.cc +table/block_based/partitioned_index_reader.cc +table/block_based/reader_common.cc table/block_based/uncompression_dict_reader.cc table/block_fetcher.cc table/cuckoo/cuckoo_table_builder.cc @@ -171,6 +184,7 @@ util/murmurhash.cc util/random.cc util/rate_limiter.cc util/slice.cc +util/file_checksum_helper.cc util/status.cc util/string_util.cc util/thread_local.cc