From 46e0c08af57f4ef9c897c49dcebc46f61263f91a Mon Sep 17 00:00:00 2001 From: Oleksandr Anyshchenko Date: Wed, 19 Feb 2020 09:05:41 +0200 Subject: [PATCH] Bump librocksdb-sys up to 6.6.4 (#389) --- librocksdb-sys/Cargo.toml | 3 +-- librocksdb-sys/build.rs | 2 +- librocksdb-sys/build_version.cc | 4 ++-- librocksdb-sys/lz4 | 2 +- librocksdb-sys/rocksdb | 2 +- librocksdb-sys/rocksdb_lib_sources.txt | 17 ++++++++++++----- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/librocksdb-sys/Cargo.toml b/librocksdb-sys/Cargo.toml index 4c86c79..49b33cf 100644 --- a/librocksdb-sys/Cargo.toml +++ b/librocksdb-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librocksdb-sys" -version = "6.4.6" +version = "6.6.4" edition = "2018" authors = ["Karl Hobley ", "Arkadiy Paronyan "] license = "MIT/Apache-2.0/BSD-3-Clause" @@ -9,7 +9,6 @@ readme = "README.md" repository = "https://github.com/rust-rocksdb/rust-rocksdb" keywords = [ "bindings", "ffi", "rocksdb" ] -build = "build.rs" links = "rocksdb" [features] diff --git a/librocksdb-sys/build.rs b/librocksdb-sys/build.rs index c36b7b4..33127aa 100644 --- a/librocksdb-sys/build.rs +++ b/librocksdb-sys/build.rs @@ -48,7 +48,7 @@ fn build_rocksdb() { let mut config = cc::Build::new(); config.include("rocksdb/include/"); config.include("rocksdb/"); - config.include("rocksdb/third-party/gtest-1.7.0/fused-src/"); + config.include("rocksdb/third-party/gtest-1.8.1/fused-src/"); if cfg!(feature = "snappy") { config.define("SNAPPY", Some("1")); diff --git a/librocksdb-sys/build_version.cc b/librocksdb-sys/build_version.cc index 3630a9f..22a6eab 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:@e3169e3ea8762d2f34880742106858a23c8dc8b7@"; -const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2019/10/21 12:07:58@"; +const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:@551a110918493a19d11243f53408b97485de1411@"; +const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2020/02/01 12:07:58@"; const char* rocksdb_build_compile_date = __DATE__; diff --git a/librocksdb-sys/lz4 b/librocksdb-sys/lz4 index fdf2ef5..c10863b 160000 --- a/librocksdb-sys/lz4 +++ b/librocksdb-sys/lz4 @@ -1 +1 @@ -Subproject commit fdf2ef5809ca875c454510610764d9125ef2ebbd +Subproject commit c10863b98e1503af90616ae99725ecd120265dfb diff --git a/librocksdb-sys/rocksdb b/librocksdb-sys/rocksdb index e3169e3..551a110 160000 --- a/librocksdb-sys/rocksdb +++ b/librocksdb-sys/rocksdb @@ -1 +1 @@ -Subproject commit e3169e3ea8762d2f34880742106858a23c8dc8b7 +Subproject commit 551a110918493a19d11243f53408b97485de1411 diff --git a/librocksdb-sys/rocksdb_lib_sources.txt b/librocksdb-sys/rocksdb_lib_sources.txt index 3e1edf5..2486375 100644 --- a/librocksdb-sys/rocksdb_lib_sources.txt +++ b/librocksdb-sys/rocksdb_lib_sources.txt @@ -1,6 +1,7 @@ cache/clock_cache.cc cache/lru_cache.cc cache/sharded_cache.cc +db/arena_wrapped_db_iter.cc db/builder.cc db/c.cc db/column_family.cc @@ -51,6 +52,7 @@ db/snapshot_impl.cc db/table_cache.cc db/table_properties_collector.cc db/transaction_log_impl.cc +db/trim_history_scheduler.cc db/version_builder.cc db/version_edit.cc db/version_set.cc @@ -67,9 +69,15 @@ env/env_posix.cc env/io_posix.cc env/mock_env.cc file/delete_scheduler.cc +file/file_prefetch_buffer.cc file/file_util.cc file/filename.cc +file/random_access_file_reader.cc +file/read_write_util.cc +file/readahead_raf.cc +file/sequence_file_reader.cc file/sst_file_manager_impl.cc +file/writable_file_writer.cc logging/auto_roll_logger.cc logging/event_logger.cc logging/log_buffer.cc @@ -115,13 +123,14 @@ table/block_based/block_prefix_index.cc table/block_based/data_block_hash_index.cc table/block_based/data_block_footer.cc 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/index_builder.cc +table/block_based/parsed_full_filter_block.cc table/block_based/partitioned_filter_block.cc table/block_based/uncompression_dict_reader.cc table/block_fetcher.cc -table/bloom_block.cc table/cuckoo/cuckoo_table_builder.cc table/cuckoo/cuckoo_table_factory.cc table/cuckoo/cuckoo_table_reader.cc @@ -131,6 +140,7 @@ table/iterator.cc table/merging_iterator.cc table/meta_blocks.cc table/persistent_cache_helper.cc +table/plain/plain_table_bloom.cc table/plain/plain_table_builder.cc table/plain/plain_table_factory.cc table/plain/plain_table_index.cc @@ -146,7 +156,6 @@ test_util/transaction_test_util.cc tools/dump/db_dump_tool.cc trace_replay/trace_replay.cc trace_replay/block_cache_tracer.cc -util/bloom.cc util/build_version.cc util/coding.cc util/compaction_job_stats_impl.cc @@ -155,8 +164,6 @@ util/compression_context_cache.cc util/concurrent_task_limiter_impl.cc util/crc32c.cc util/dynamic_bloom.cc -util/file_reader_writer.cc -util/filter_policy.cc util/hash.cc util/murmurhash.cc util/random.cc @@ -189,6 +196,7 @@ utilities/leveldb_options/leveldb_options.cc utilities/memory/memory_util.cc utilities/merge_operators/max.cc utilities/merge_operators/put.cc +utilities/merge_operators/sortlist.cc utilities/merge_operators/string_append/stringappend.cc utilities/merge_operators/string_append/stringappend2.cc utilities/merge_operators/uint64add.cc @@ -221,4 +229,3 @@ 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 -