<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7908897db27fa174d70a4527cf4442d842d1975e">https://github.com/macports/macports-ports/commit/7908897db27fa174d70a4527cf4442d842d1975e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7908897db27 rocksdb: update to 6.13.3
</span>7908897db27 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7908897db27fa174d70a4527cf4442d842d1975e
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Sat Oct 17 19:00:39 2020 +0300
<span style='display:block; white-space:pre;color:#404040;'> rocksdb: update to 6.13.3
</span>---
databases/rocksdb/Portfile | 12 +-
databases/rocksdb/files/patch-9cc25190e.diff | 214 ---------------------
.../patch-build_tools_build_detect_platform.diff | 15 ++
3 files changed, 22 insertions(+), 219 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/rocksdb/Portfile b/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a426c9c74fb..25a19b6abc8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup facebook rocksdb 6.11.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup facebook rocksdb 6.13.3 v
</span>
revision 0
categories databases devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,9 @@ long_description {*}${description}
</span>
homepage http://rocksdb.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 839746d82c8222b3fdc11002595463805744705a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 491ade5445faace9368f3690568b43ca6c7f26f0687aa53b09d1eb38a193fa62 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6211022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9ccf6ebf3807c32d05b5e875d312f49bdd04f7ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fd5589bac63966cb5e83283a24c8e06375d09321aaa6c48c53d5dc55c1ae63e1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6333252
</span>
depends_lib-append port:gflags \
port:snappy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ depends_lib-append port:gflags \
</span> port:zstd
patchfiles-append patch-Makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-9cc25190e.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-build_tools_build_detect_platform.diff
</span>
compiler.cxx_standard 2011
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +44,7 @@ build.env CC=${configure.cc} \
</span> CXXFLAGS=[get_canonical_archflags cxx] \
PORTABLE=1 \
DEBUG_LEVEL=0 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix} \
</span> OPT=${configure.optflags}
destroot.env-append CC=${configure.cc} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +54,7 @@ destroot.env-append CC=${configure.cc} \
</span> PORTABLE=1 \
DEBUG_LEVEL=0 \
OPT=${configure.optflags} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix} \
</span> INSTALL_PATH=${destroot}${prefix}
# Disable silent rules
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/rocksdb/files/patch-9cc25190e.diff b/databases/rocksdb/files/patch-9cc25190e.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 13e3c65ae23..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/rocksdb/files/patch-9cc25190e.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,214 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9cc25190e1ba6fc66bbd0d47caaf043d75839b6f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: sdong <siying.d@fb.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 24 Jun 2020 16:20:55 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Test CircleCI with CLANG-10 (#7025)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Summary:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It's useful to build RocksDB using a more recent clang version in CI. Add a CircleCI build and fix some issues with it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Pull Request resolved: https://github.com/facebook/rocksdb/pull/7025
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Test Plan: See all tests pass.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed By: pdillinger
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Differential Revision: D22215700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fbshipit-source-id: 914a729c2cd3f3ac4a627cc0ac58d4691dca2168
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .circleci/config.yml | 15 +++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db/db_iter_stress_test.cc | 11 +++++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db/db_options_test.cc | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env/env_test.cc | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- options/options_helper.cc | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- table/table_test.cc | 10 +++++-----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/ldb_cmd_test.cc | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7 files changed, 33 insertions(+), 15 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/.circleci/config.yml b/.circleci/config.yml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a6a7f879d3..a2408facd2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .circleci/config.yml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .circleci/config.yml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,6 +57,18 @@ jobs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - run: sudo apt-get install -y clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - run: CC=clang CXX=clang++ USE_CLANG=1 PORTABLE=1 make all -j32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ build-linux-clang10-no-test:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ machine:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ image: ubuntu-1604:201903-01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ resource_class: 2xlarge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ steps:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - checkout # check out the code in the project directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - run: sudo sh -c 'echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main" >> /etc/apt/sources.list'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - run: sudo sh -c 'echo "deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main" >> /etc/apt/sources.list'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - run: sudo apt-get update -y
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - run: sudo apt-get install -y clang-10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - run: CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make all -j32 # aligned new doesn't work for reason we haven't figured out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build-linux-cmake:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- machine:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- image: ubuntu-1604:201903-01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,6 +137,9 @@ workflows:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build-linux-clang-no-test:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jobs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - build-linux-clang-no-test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ build-linux-clang10-no-test:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ jobs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - build-linux-clang10-no-test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build-linux-cmake:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jobs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - build-linux-cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/db/db_iter_stress_test.cc b/db/db_iter_stress_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 57cd9866e4..484bb0b45a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- db/db_iter_stress_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ db/db_iter_stress_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +97,8 @@ struct StressTestIterator : public InternalIterator {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool MaybeFail() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rnd->Next() >=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::numeric_limits<uint64_t>::max() * error_probability) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static_cast<double>(std::numeric_limits<uint64_t>::max()) *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error_probability) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rnd->Next() % 2) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,7 +115,8 @@ struct StressTestIterator : public InternalIterator {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void MaybeMutate() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rnd->Next() >=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::numeric_limits<uint64_t>::max() * mutation_probability) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static_cast<double>(std::numeric_limits<uint64_t>::max()) *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mutation_probability) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,8 +128,9 @@ struct StressTestIterator : public InternalIterator {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (data->hidden.empty()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hide_probability = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool do_hide =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rnd->Next() < std::numeric_limits<uint64_t>::max() * hide_probability;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool do_hide = rnd->Next() <
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static_cast<double>(std::numeric_limits<uint64_t>::max()) *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hide_probability;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (do_hide) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Hide a random entry.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t idx = rnd->Next() % data->entries.size();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/db/db_options_test.cc b/db/db_options_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cc91824611..8cc09ec546 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- db/db_options_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ db/db_options_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@ class DBOptionsTest : public DBTestBase {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unordered_map<std::string, std::string> options_map;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StringToMap(options_str, &options_map);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unordered_map<std::string, std::string> mutable_map;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const auto opt : db_options_type_info) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& opt : db_options_type_info) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (opt.second.IsMutable() && opt.second.ShouldSerialize()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mutable_map[opt.first] = options_map[opt.first];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,7 +57,7 @@ class DBOptionsTest : public DBTestBase {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unordered_map<std::string, std::string> options_map;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StringToMap(options_str, &options_map);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unordered_map<std::string, std::string> mutable_map;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const auto opt : cf_options_type_info) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& opt : cf_options_type_info) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (opt.second.IsMutable() && opt.second.ShouldSerialize()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mutable_map[opt.first] = options_map[opt.first];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/env/env_test.cc b/env/env_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d62f69192e..e3bc7141b6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- env/env_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ env/env_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1120,7 +1120,7 @@ TEST_P(EnvPosixTestWithParam, RandomAccessUniqueIDConcurrent) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Collect and check whether the IDs are unique.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unordered_set<std::string> ids;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const std::string fname : fnames) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const std::string& fname : fnames) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::unique_ptr<RandomAccessFile> file;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string unique_id;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ASSERT_OK(env_->NewRandomAccessFile(fname, &file, soptions));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1134,7 +1134,7 @@ TEST_P(EnvPosixTestWithParam, RandomAccessUniqueIDConcurrent) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Delete the files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const std::string fname : fnames) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const std::string& fname : fnames) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ASSERT_OK(env_->DeleteFile(fname));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/options/options_helper.cc b/options/options_helper.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b01d389a40..396a829789 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- options/options_helper.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ options/options_helper.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -656,7 +656,7 @@ Status GetStringFromStruct(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string* opt_string) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(opt_string);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opt_string->clear();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const auto iter : type_info) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& iter : type_info) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const auto& opt_info = iter.second;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // If the option is no longer used in rocksdb and marked as deprecated,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // we skip it in the serialization.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/table/table_test.cc b/table/table_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 589b48788f..5899ae945c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- table/table_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ table/table_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -228,7 +228,7 @@ class BlockConstructor: public Constructor {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- block_ = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BlockBuilder builder(table_options.block_restart_interval);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const auto kv : kv_map) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& kv : kv_map) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builder.Add(kv.first, kv.second);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Open the block
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -352,7 +352,7 @@ class TableConstructor: public Constructor {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TablePropertiesCollectorFactory::Context::kUnknownColumnFamily,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file_writer_.get()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const auto kv : kv_map) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& kv : kv_map) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (convert_to_internal_key_) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ParsedInternalKey ikey(kv.first, kMaxSequenceNumber, kTypeValue);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string encoded;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -487,7 +487,7 @@ class MemTableConstructor: public Constructor {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kMaxSequenceNumber, 0 /* column_family_id */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memtable_->Ref();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int seq = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const auto kv : kv_map) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& kv : kv_map) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memtable_->Add(seq, kTypeValue, kv.first, kv.second);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- seq++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -548,7 +548,7 @@ class DBConstructor: public Constructor {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete db_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db_ = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NewDB();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const auto kv : kv_map) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& kv : kv_map) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WriteBatch batch;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- batch.Put(kv.first, kv.second);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(db_->Write(WriteOptions(), &batch).ok());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1226,7 +1226,7 @@ class FileChecksumTestHelper {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Status WriteKVAndFlushTable() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const auto kv : kv_map_) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& kv : kv_map_) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (convert_to_internal_key_) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ParsedInternalKey ikey(kv.first, kMaxSequenceNumber, kTypeValue);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string encoded;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/ldb_cmd_test.cc b/tools/ldb_cmd_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e485ab551c..69f7f82739 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/ldb_cmd_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/ldb_cmd_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,7 +76,7 @@ TEST_F(LdbCmdTest, HexToStringBadInputs) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const vector<string> badInputs = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "0xZZ", "123", "0xx5", "0x111G", "0x123", "Ox12", "0xT", "0x1Q1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (const auto badInput : badInputs) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (const auto& badInput : badInputs) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ROCKSDB_NAMESPACE::LDBCommand::HexToString(badInput);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::cerr << "Should fail on bad hex value: " << badInput << "\n";
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/rocksdb/files/patch-build_tools_build_detect_platform.diff b/databases/rocksdb/files/patch-build_tools_build_detect_platform.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..46a3c14283f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/rocksdb/files/patch-build_tools_build_detect_platform.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build_tools/build_detect_platform.orig 2020-10-17 18:33:19.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build_tools/build_detect_platform 2020-10-17 18:34:58.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -652,9 +652,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [[ "${PLATFORM}" == "OS_MACOSX" ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For portability compile for macOS 10.12 (2016) or newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMON_FLAGS="$COMMON_FLAGS -mmacosx-version-min=10.12"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -mmacosx-version-min=10.12"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PLATFORM_SHARED_LDFLAGS="$PLATFORM_SHARED_LDFLAGS -mmacosx-version-min=10.12"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMON_FLAGS="-mmacosx-version-min=10.12 $COMMON_FLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PLATFORM_LDFLAGS="-mmacosx-version-min=10.12 $PLATFORM_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PLATFORM_SHARED_LDFLAGS="-mmacosx-version-min=10.12 $PLATFORM_SHARED_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>