From f00ae8c4ab858c4ba5416b995664ad09b368ed22 Mon Sep 17 00:00:00 2001 From: Artem Krylysov Date: Mon, 5 Jul 2021 10:46:12 -0400 Subject: [PATCH] Upgrade librocksdb-sys to 6.20.3 (#531) --- CHANGELOG.md | 2 +- librocksdb-sys/Cargo.toml | 2 +- librocksdb-sys/build.rs | 2 ++ librocksdb-sys/build_version.cc | 6 +++--- librocksdb-sys/rocksdb | 2 +- librocksdb-sys/rocksdb_lib_sources.txt | 19 +++---------------- 6 files changed, 11 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3c0652..63388e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [Unreleased] -* Bump `librocksdb-sys` up to 6.19.3 (olegnn) +* Bump `librocksdb-sys` up to 6.20.3 (olegnn, akrylysov) * Add `DB::key_may_exist_cf_opt` method (stanislav-tkach) * Add `Options::set_zstd_max_train_bytes` method (stanislav-tkach) diff --git a/librocksdb-sys/Cargo.toml b/librocksdb-sys/Cargo.toml index f1d22b6..672c060 100644 --- a/librocksdb-sys/Cargo.toml +++ b/librocksdb-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librocksdb-sys" -version = "6.19.3" +version = "6.20.3" edition = "2018" authors = ["Karl Hobley ", "Arkadiy Paronyan "] license = "MIT/Apache-2.0/BSD-3-Clause" diff --git a/librocksdb-sys/build.rs b/librocksdb-sys/build.rs index 28433a5..03cc9b8 100644 --- a/librocksdb-sys/build.rs +++ b/librocksdb-sys/build.rs @@ -175,6 +175,8 @@ fn build_rocksdb() { lib_sources.push("port/win/win_thread.cc"); } + config.define("ROCKSDB_SUPPORT_THREAD_LOCAL", None); + if target.contains("msvc") { config.flag("-EHsc"); } else { diff --git a/librocksdb-sys/build_version.cc b/librocksdb-sys/build_version.cc index c9774f9..973f776 100644 --- a/librocksdb-sys/build_version.cc +++ b/librocksdb-sys/build_version.cc @@ -7,9 +7,9 @@ // The build script may replace these values with real values based // on whether or not GIT is available and the platform settings -static const std::string rocksdb_build_git_sha = "rocksdb_build_git_sha:645c445978bb22c8c7791f90a0d9931928a58045"; -static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:master"; -static const std::string rocksdb_build_date = "rocksdb_build_date:2021-04-19 19:57:42"; +static const std::string rocksdb_build_git_sha = "rocksdb_build_git_sha:8608d75d85f8e1b3b64b73a4fb6d19baec61ba5c"; +static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:v6.20.3"; +static const std::string rocksdb_build_date = "rocksdb_build_date:2021-05-05 20:35:30"; namespace ROCKSDB_NAMESPACE { static void AddProperty(std::unordered_map *props, const std::string& name) { diff --git a/librocksdb-sys/rocksdb b/librocksdb-sys/rocksdb index 645c445..8608d75 160000 --- a/librocksdb-sys/rocksdb +++ b/librocksdb-sys/rocksdb @@ -1 +1 @@ -Subproject commit 645c445978bb22c8c7791f90a0d9931928a58045 +Subproject commit 8608d75d85f8e1b3b64b73a4fb6d19baec61ba5c diff --git a/librocksdb-sys/rocksdb_lib_sources.txt b/librocksdb-sys/rocksdb_lib_sources.txt index 2270bad..ab03275 100644 --- a/librocksdb-sys/rocksdb_lib_sources.txt +++ b/librocksdb-sys/rocksdb_lib_sources.txt @@ -15,7 +15,6 @@ db/blob/blob_log_writer.cc db/builder.cc db/c.cc db/column_family.cc -db/compacted_db_impl.cc db/compaction/compaction.cc db/compaction/compaction_iterator.cc db/compaction/compaction_job.cc @@ -26,6 +25,7 @@ db/compaction/compaction_picker_universal.cc db/compaction/sst_partitioner.cc db/convenience.cc db/db_filesnapshot.cc +db/db_impl/compacted_db_impl.cc db/db_impl/db_impl.cc db/db_impl/db_impl_compaction_flush.cc db/db_impl/db_impl_debug.cc @@ -84,6 +84,7 @@ env/env_hdfs.cc env/env_posix.cc env/file_system.cc env/fs_posix.cc +env/fs_remap.cc env/file_system_tracer.cc env/io_posix.cc env/mock_env.cc @@ -202,6 +203,7 @@ util/comparator.cc util/compression_context_cache.cc util/concurrent_task_limiter_impl.cc util/crc32c.cc +util/crc32c_arm64.cc util/dynamic_bloom.cc util/hash.cc util/murmurhash.cc @@ -271,18 +273,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 -util/crc32c_arm64.cc -utilities/transactions/lock/range/range_tree/lib/locktree/concurrent_tree.cc -utilities/transactions/lock/range/range_tree/lib/locktree/keyrange.cc -utilities/transactions/lock/range/range_tree/lib/locktree/lock_request.cc -utilities/transactions/lock/range/range_tree/lib/locktree/locktree.cc -utilities/transactions/lock/range/range_tree/lib/locktree/manager.cc -utilities/transactions/lock/range/range_tree/lib/locktree/range_buffer.cc -utilities/transactions/lock/range/range_tree/lib/locktree/treenode.cc -utilities/transactions/lock/range/range_tree/lib/locktree/txnid_set.cc -utilities/transactions/lock/range/range_tree/lib/locktree/wfg.cc -utilities/transactions/lock/range/range_tree/lib/standalone_port.cc -utilities/transactions/lock/range/range_tree/lib/util/dbt.cc -utilities/transactions/lock/range/range_tree/lib/util/memarena.cc -utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc -utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.cc \ No newline at end of file