From eab2a7edc2e11e0886fd511538b3ad14a3e159b4 Mon Sep 17 00:00:00 2001 From: Florentin DUBOIS Date: Mon, 9 Dec 2019 16:32:41 +0100 Subject: [PATCH] Upgrade rocksdb to v6.4.6 (#360) * Update Cargo.toml to match rocksdb version --- Cargo.toml | 2 +- librocksdb-sys/Cargo.toml | 2 +- librocksdb-sys/build_version.cc | 4 +- librocksdb-sys/rocksdb | 2 +- librocksdb-sys/rocksdb_lib_sources.txt | 113 +++++++++++++------------ 5 files changed, 66 insertions(+), 57 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ff727c9..b59b2ef 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.2.4" } +librocksdb-sys = { path = "librocksdb-sys", version = "6.4.6" } diff --git a/librocksdb-sys/Cargo.toml b/librocksdb-sys/Cargo.toml index 96757ba..160d1a7 100644 --- a/librocksdb-sys/Cargo.toml +++ b/librocksdb-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librocksdb-sys" -version = "6.2.4" +version = "6.4.6" authors = ["Karl Hobley ", "Arkadiy Paronyan "] license = "MIT/Apache-2.0/BSD-3-Clause" description = "Native bindings to librocksdb" diff --git a/librocksdb-sys/build_version.cc b/librocksdb-sys/build_version.cc index e8c0a0b..3630a9f 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:@76a56d89a7740f8dbb01edabf1ea5abc95a67657@"; -const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2019/10/16 09:47:38@"; +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_compile_date = __DATE__; diff --git a/librocksdb-sys/rocksdb b/librocksdb-sys/rocksdb index 76a56d8..e3169e3 160000 --- a/librocksdb-sys/rocksdb +++ b/librocksdb-sys/rocksdb @@ -1 +1 @@ -Subproject commit 76a56d89a7740f8dbb01edabf1ea5abc95a67657 +Subproject commit e3169e3ea8762d2f34880742106858a23c8dc8b7 diff --git a/librocksdb-sys/rocksdb_lib_sources.txt b/librocksdb-sys/rocksdb_lib_sources.txt index f21e488..3e1edf5 100644 --- a/librocksdb-sys/rocksdb_lib_sources.txt +++ b/librocksdb-sys/rocksdb_lib_sources.txt @@ -5,23 +5,24 @@ db/builder.cc db/c.cc db/column_family.cc db/compacted_db_impl.cc -db/compaction.cc -db/compaction_iterator.cc -db/compaction_job.cc -db/compaction_picker.cc -db/compaction_picker_fifo.cc -db/compaction_picker_universal.cc +db/compaction/compaction.cc +db/compaction/compaction_iterator.cc +db/compaction/compaction_job.cc +db/compaction/compaction_picker.cc +db/compaction/compaction_picker_fifo.cc +db/compaction/compaction_picker_level.cc +db/compaction/compaction_picker_universal.cc db/convenience.cc db/db_filesnapshot.cc -db/db_impl.cc -db/db_impl_compaction_flush.cc -db/db_impl_debug.cc -db/db_impl_experimental.cc -db/db_impl_files.cc -db/db_impl_open.cc -db/db_impl_readonly.cc -db/db_impl_secondary.cc -db/db_impl_write.cc +db/db_impl/db_impl.cc +db/db_impl/db_impl_compaction_flush.cc +db/db_impl/db_impl_debug.cc +db/db_impl/db_impl_experimental.cc +db/db_impl/db_impl_files.cc +db/db_impl/db_impl_open.cc +db/db_impl/db_impl_readonly.cc +db/db_impl/db_impl_secondary.cc +db/db_impl/db_impl_write.cc db/db_info_dumper.cc db/db_iter.cc db/dbformat.cc @@ -33,7 +34,7 @@ db/file_indexer.cc db/flush_job.cc db/flush_scheduler.cc db/forward_iterator.cc -db/in_memory_stats_history.cc +db/import_column_family_job.cc db/internal_stats.cc db/logs_with_prep_tracker.cc db/log_reader.cc @@ -65,6 +66,16 @@ env/env_hdfs.cc env/env_posix.cc env/io_posix.cc env/mock_env.cc +file/delete_scheduler.cc +file/file_util.cc +file/filename.cc +file/sst_file_manager_impl.cc +logging/auto_roll_logger.cc +logging/event_logger.cc +logging/log_buffer.cc +memory/arena.cc +memory/concurrent_arena.cc +memory/jemalloc_nodump_allocator.cc memtable/alloc_tracker.cc memtable/hash_linklist_rep.cc memtable/hash_skiplist_rep.cc @@ -73,10 +84,12 @@ memtable/vectorrep.cc memtable/write_buffer_manager.cc monitoring/histogram.cc monitoring/histogram_windowing.cc +monitoring/in_memory_stats_history.cc monitoring/instrumented_mutex.cc monitoring/iostats_context.cc monitoring/perf_context.cc monitoring/perf_level.cc +monitoring/persistent_stats_history.cc monitoring/statistics.cc monitoring/thread_status_impl.cc monitoring/thread_status_updater.cc @@ -91,75 +104,68 @@ options/options_parser.cc options/options_sanity_check.cc port/port_posix.cc port/stack_trace.cc -table/adaptive_table_factory.cc -table/block.cc -table/block_based_filter_block.cc -table/block_based_table_builder.cc -table/block_based_table_factory.cc -table/block_based_table_reader.cc -table/block_builder.cc +table/adaptive/adaptive_table_factory.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_reader.cc +table/block_based/block_builder.cc +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/flush_block_policy.cc +table/block_based/full_filter_block.cc +table/block_based/index_builder.cc +table/block_based/partitioned_filter_block.cc +table/block_based/uncompression_dict_reader.cc table/block_fetcher.cc -table/block_prefix_index.cc table/bloom_block.cc -table/cuckoo_table_builder.cc -table/cuckoo_table_factory.cc -table/cuckoo_table_reader.cc -table/data_block_hash_index.cc -table/data_block_footer.cc -table/flush_block_policy.cc +table/cuckoo/cuckoo_table_builder.cc +table/cuckoo/cuckoo_table_factory.cc +table/cuckoo/cuckoo_table_reader.cc table/format.cc -table/full_filter_block.cc table/get_context.cc -table/index_builder.cc table/iterator.cc table/merging_iterator.cc table/meta_blocks.cc -table/partitioned_filter_block.cc table/persistent_cache_helper.cc -table/plain_table_builder.cc -table/plain_table_factory.cc -table/plain_table_index.cc -table/plain_table_key_coding.cc -table/plain_table_reader.cc +table/plain/plain_table_builder.cc +table/plain/plain_table_factory.cc +table/plain/plain_table_index.cc +table/plain/plain_table_key_coding.cc +table/plain/plain_table_reader.cc table/sst_file_reader.cc table/sst_file_writer.cc table/table_properties.cc table/two_level_iterator.cc +test_util/sync_point.cc +test_util/sync_point_impl.cc +test_util/transaction_test_util.cc tools/dump/db_dump_tool.cc -util/arena.cc -util/auto_roll_logger.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 util/comparator.cc util/compression_context_cache.cc -util/concurrent_arena.cc util/concurrent_task_limiter_impl.cc util/crc32c.cc -util/delete_scheduler.cc util/dynamic_bloom.cc -util/event_logger.cc util/file_reader_writer.cc -util/file_util.cc -util/filename.cc util/filter_policy.cc util/hash.cc -util/jemalloc_nodump_allocator.cc -util/log_buffer.cc util/murmurhash.cc util/random.cc util/rate_limiter.cc util/slice.cc -util/sst_file_manager_impl.cc util/status.cc util/string_util.cc -util/sync_point.cc -util/sync_point_impl.cc util/thread_local.cc util/threadpool_imp.cc -util/trace_replay.cc -util/transaction_test_util.cc util/xxhash.cc utilities/backupable/backupable_db.cc utilities/blob_db/blob_compaction_filter.cc @@ -187,6 +193,7 @@ utilities/merge_operators/string_append/stringappend.cc utilities/merge_operators/string_append/stringappend2.cc utilities/merge_operators/uint64add.cc utilities/merge_operators/bytesxor.cc +utilities/object_registry.cc utilities/option_change_migration/option_change_migration.cc utilities/options/options_util.cc utilities/persistent_cache/block_cache_tier.cc @@ -194,6 +201,7 @@ utilities/persistent_cache/block_cache_tier_file.cc utilities/persistent_cache/block_cache_tier_metadata.cc utilities/persistent_cache/persistent_cache_tier.cc utilities/persistent_cache/volatile_tier_impl.cc +utilities/simulator_cache/cache_simulator.cc utilities/simulator_cache/sim_cache.cc utilities/table_properties_collectors/compact_on_deletion_collector.cc utilities/trace/file_trace_reader_writer.cc @@ -213,3 +221,4 @@ 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 +