<pre style='margin:0'>
Andrey Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ae32c7ff96854863a048ebf1e3312636ef9a098b">https://github.com/macports/macports-ports/commit/ae32c7ff96854863a048ebf1e3312636ef9a098b</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 ae32c7ff968 rocksdb: update to 8.6.7
</span>ae32c7ff968 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ae32c7ff96854863a048ebf1e3312636ef9a098b
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Oct 23 13:11:26 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> rocksdb: update to 8.6.7
</span>---
databases/rocksdb/Portfile | 18 ++-
.../files/0003-remove-redundant-move-11418.patch | 141 ---------------------
2 files changed, 11 insertions(+), 148 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 a09840425f8..08a042e5367 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,8 +3,12 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup facebook rocksdb 8.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup facebook rocksdb 8.6.7 v
</span> revision 0
categories databases devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +21,10 @@ long_description {*}${description}
</span>
homepage https://rocksdb.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c6cd420eb8a23c745c91a1ee8ac511a2ddb98da5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c5e33f010ea320ddcf227266f6d9c73252997b013b2be8ac42696628de3707b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12663407
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 74f79cd4d36e48a8af0fbe622e9c9fed18b000e0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cdb2fc3c6a556f20591f564cb8e023e56828469aa3f76e1d9535c443ba1f0c1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12806059
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
depends_lib-append port:gflags \
port:snappy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,10 +35,9 @@ depends_lib-append port:gflags \
</span>
patch.pre_args -p1
patchfiles 0001-rocksdb-fixes-for-macOS-PPC.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-MAP_ANON.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-remove-redundant-move-11418.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-MAP_ANON.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span> compiler.thread_local_storage yes
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/rocksdb/files/0003-remove-redundant-move-11418.patch b/databases/rocksdb/files/0003-remove-redundant-move-11418.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7eb6314fab8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/rocksdb/files/0003-remove-redundant-move-11418.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,141 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 50b33ebb1bc35ea4e1687b59b800553ffe6d65c8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: clundro <859287553@qq.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 3 May 2023 09:37:21 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] remove redundant move (#11418)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</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;'>-when I use g++-13 to exec the `make all` command, the output throws the warnings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-```
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-db/compaction/compaction_job_test.cc: In member function ‘void rocksdb::CompactionJobTestBase::AddMockFile(const rocksdb::mock::KVVector&, int)’:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-db/compaction/compaction_job_test.cc:376:57: error: redundant move in initialization [-Werror=redundant-move]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 376 | env_, GenerateFileName(file_number), std::move(contents)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | ~~~~~~~~~^~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-db/compaction/compaction_job_test.cc:375:7: note: in expansion of macro ‘EXPECT_OK’
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 375 | EXPECT_OK(mock_table_factory_->CreateMockTable(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | ^~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-db/compaction/compaction_job_test.cc:376:57: note: remove ‘std::move’ call
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 376 | env_, GenerateFileName(file_number), std::move(contents)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | ~~~~~~~~~^~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-db/compaction/compaction_job_test.cc:375:7: note: in expansion of macro ‘EXPECT_OK’
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 375 | EXPECT_OK(mock_table_factory_->CreateMockTable(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | ^~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cc1plus: all warnings being treated as errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-make: *** [Makefile:2507: db/compaction/compaction_job_test.o] Error 1
</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;'>-and I also add some `(void)unused_variable` statements because of the cmake argument `-Wunused-but-set-variable -Wunused-but-set-variable`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Pull Request resolved: https://github.com/facebook/rocksdb/pull/11418
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed By: akankshamahajan15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Differential Revision: D45528223
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Pulled By: ajkr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fbshipit-source-id: fee1a77c30039a56b481de953f0a834cc788abbc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .gitignore | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db/compaction/compaction_job_test.cc | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db/db_test.cc | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file/prefetch_test.cc | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memtable/inlineskiplist_test.cc | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memtable/skiplist_test.cc | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/db_bench_tool.cc | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7 files changed, 9 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/.gitignore b/.gitignore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1ff5b7437e4..9b4ac1591a3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/.gitignore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/.gitignore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,3 +95,4 @@ fuzz/crash-*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake-build-*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- third-party/folly/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.cache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/db/compaction/compaction_job_test.cc b/db/compaction/compaction_job_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 79f8e5fd52e..3f7966404f7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/db/compaction/compaction_job_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/db/compaction/compaction_job_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -373,7 +373,7 @@ class CompactionJobTestBase : public testing::Test {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (table_type_ == TableTypeForTest::kMockTable) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file_size = 10;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_OK(mock_table_factory_->CreateMockTable(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- env_, GenerateFileName(file_number), std::move(contents)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ env_, GenerateFileName(file_number), contents));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/db/db_test.cc b/db/db_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7720cbbe4cc..1b01422a9ba 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/db/db_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/db/db_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3460,6 +3460,7 @@ static bool CompareIterators(int step, DB* model, DB* db,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ok = false;
</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;'>-+ (void)count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete miter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete dbiter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ok;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/file/prefetch_test.cc b/file/prefetch_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 488e037ff99..fb31144498c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/file/prefetch_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/file/prefetch_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,6 +220,7 @@ TEST_P(PrefetchTest, Basic) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- num_keys++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (void)num_keys;
</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;'>- // Make sure prefetch is called only if file system support prefetch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1803,6 +1804,7 @@ TEST_P(PrefetchTest, MultipleSeekWithPosixFS) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MoveFilesToLevel(2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (void)total_keys;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int num_keys_first_batch = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int num_keys_second_batch = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/memtable/inlineskiplist_test.cc b/memtable/inlineskiplist_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f856440649b..930574ec726 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/memtable/inlineskiplist_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/memtable/inlineskiplist_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -576,6 +576,7 @@ static void ConcurrentReader(void* arg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state->t_.ReadStep(&rnd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ++reads;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (void)reads;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state->Change(TestState::DONE);
</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/memtable/skiplist_test.cc b/memtable/skiplist_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a070885110f..868c51876e9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/memtable/skiplist_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/memtable/skiplist_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,6 +348,7 @@ static void ConcurrentReader(void* arg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state->t_.ReadStep(&rnd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ++reads;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (void)reads;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state->Change(TestState::DONE);
</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/tools/db_bench_tool.cc b/tools/db_bench_tool.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ea40f5fa096..19ca1b4c01f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/db_bench_tool.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/db_bench_tool.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6984,6 +6984,8 @@ class Benchmark {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thread->stats.FinishedOps(&db_, db_.db, 1, kSeek);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (void)num_seek_to_first;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (void)num_next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete iter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>