git: 7bb088560db2 - main - databases/rocksdb: Update to 10.7.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Oct 2025 16:11:27 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7bb088560db270832791202e6117a58460c579f5
commit 7bb088560db270832791202e6117a58460c579f5
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-10-27 15:27:25 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-10-27 15:27:25 +0000
databases/rocksdb: Update to 10.7.5
Changes: https://github.com/facebook/rocksdb/releases
---
databases/rocksdb/Makefile | 6 ++--
databases/rocksdb/distinfo | 6 ++--
databases/rocksdb/files/patch-db-db_test_util.cc | 35 +++++++++++-------------
databases/rocksdb/pkg-plist | 1 +
4 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 06230db225c4..77e6338defe0 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rocksdb
-PORTVERSION= 10.5.1
+PORTVERSION= 10.7.5
DISTVERSIONPREFIX= v
CATEGORIES= databases
@@ -21,7 +21,7 @@ BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libgflags.so:devel/gflags \
libsnappy.so:archivers/snappy
-USES= compiler:c++17-lang gmake localbase:ldflags perl5
+USES= compiler:c++20-lang gmake localbase:ldflags perl5
USE_PERL5= build
ALL_TARGET= shared_lib static_lib all
@@ -31,7 +31,7 @@ CONFIGURE_ENV= PORTABLE=0 ROCKSDB_ROOT=${WRKSRC}
CONFIGURE_SCRIPT= build_tools/build_detect_platform
HAS_CONFIGURE= yes
MAKE_ENV= CXX=${CXX} INSTALL_PATH=${STAGEDIR}${PREFIX} USE_RTTI=1 V=1
-USE_CXXSTD= c++17
+USE_CXXSTD= c++20
USE_LDCONFIG= yes
TEST_TARGET= check
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 9b72fb0228a8..aded81fe9d3f 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755062446
-SHA256 (facebook-rocksdb-v10.5.1_GH0.tar.gz) = 7ec942baab802b2845188d02bc5d4e42c29236e61bcbc08f5b3a6bdd92290c22
-SIZE (facebook-rocksdb-v10.5.1_GH0.tar.gz) = 13864326
+TIMESTAMP = 1761446474
+SHA256 (facebook-rocksdb-v10.7.5_GH0.tar.gz) = a9948bf5f00dd1e656fc40c4b0bf39001c3773ad22c56959bdb1c940d10e3d8d
+SIZE (facebook-rocksdb-v10.7.5_GH0.tar.gz) = 13967127
diff --git a/databases/rocksdb/files/patch-db-db_test_util.cc b/databases/rocksdb/files/patch-db-db_test_util.cc
index 3ab185f0c560..2cdbb074261f 100644
--- a/databases/rocksdb/files/patch-db-db_test_util.cc
+++ b/databases/rocksdb/files/patch-db-db_test_util.cc
@@ -1,6 +1,6 @@
---- db/db_test_util.cc.orig 2023-02-19 21:44:55 UTC
+--- db/db_test_util.cc.orig 2025-10-20 18:17:17 UTC
+++ db/db_test_util.cc
-@@ -102,9 +102,11 @@ DBTestBase::DBTestBase(const std::string path, bool en
+@@ -103,9 +103,11 @@ DBTestBase::~DBTestBase() {
}
DBTestBase::~DBTestBase() {
@@ -12,7 +12,7 @@
Close();
Options options;
options.db_paths.emplace_back(dbname_, 0);
-@@ -338,6 +340,7 @@ Options DBTestBase::GetOptions(
+@@ -347,6 +349,7 @@ Options DBTestBase::GetOptions(
Options options = default_options;
BlockBasedTableOptions table_options;
bool set_block_based_table_factory = true;
@@ -20,7 +20,7 @@
#if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(OS_SOLARIS) && \
!defined(OS_AIX)
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack(
-@@ -345,6 +348,7 @@ Options DBTestBase::GetOptions(
+@@ -354,6 +357,7 @@ Options DBTestBase::GetOptions(
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack(
"NewWritableFile:O_DIRECT");
#endif
@@ -28,7 +28,7 @@
// kMustFreeHeapAllocations -> indicates ASAN build
if (kMustFreeHeapAllocations && !options_override.full_block_cache) {
// Detecting block cache use-after-free is normally difficult in unit
-@@ -409,7 +413,9 @@ Options DBTestBase::GetOptions(
+@@ -418,7 +422,9 @@ Options DBTestBase::GetOptions(
options.use_direct_reads = true;
options.use_direct_io_for_flush_and_compaction = true;
options.compaction_readahead_size = 2 * 1024 * 1024;
@@ -38,15 +38,15 @@
break;
}
case kMergePut:
-@@ -1141,6 +1147,7 @@ std::string DBTestBase::FilesPerLevel(int cf) {
+@@ -1225,6 +1231,7 @@ std::string DBTestBase::FilesPerLevel(ColumnFamilyHand
+ return result;
}
-
+#ifndef NDEBUG
std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() {
VersionSet* const versions = dbfull()->GetVersionSet();
assert(versions);
-@@ -1166,6 +1173,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers()
+@@ -1250,6 +1257,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers()
return result;
}
@@ -54,17 +54,14 @@
size_t DBTestBase::CountFiles() {
size_t count = 0;
-@@ -1248,6 +1256,7 @@ void DBTestBase::FillLevels(const std::string& smalles
- }
+@@ -1351,16 +1359,20 @@ void DBTestBase::MoveFilesToLevel(int level, ColumnFam
- void DBTestBase::MoveFilesToLevel(int level, int cf) {
+ void DBTestBase::MoveFilesToLevel(int level, ColumnFamilyHandle* column_family,
+ DB* db) {
+#ifndef NDEBUG
+ DBImpl* db_impl = db ? static_cast<DBImpl*>(db) : dbfull();
for (int l = 0; l < level; ++l) {
- if (cf > 0) {
- EXPECT_OK(dbfull()->TEST_CompactRange(l, nullptr, nullptr, handles_[cf]));
-@@ -1255,12 +1264,15 @@ void DBTestBase::MoveFilesToLevel(int level, int cf) {
- EXPECT_OK(dbfull()->TEST_CompactRange(l, nullptr, nullptr));
- }
+ EXPECT_OK(db_impl->TEST_CompactRange(l, nullptr, nullptr, column_family));
}
+#endif
}
@@ -78,7 +75,7 @@
for (int level = 0; level < db_->NumberLevels(); level++) {
int num = NumTableFilesAtLevel(level);
if (num > 0) {
-@@ -1302,10 +1314,12 @@ void DBTestBase::GenerateNewFile(int cf, Random* rnd,
+@@ -1402,10 +1414,12 @@ void DBTestBase::GenerateNewFile(int cf, Random* rnd,
ASSERT_OK(Put(cf, Key(*key_idx), rnd->RandomString((i == 99) ? 1 : 990)));
(*key_idx)++;
}
@@ -91,7 +88,7 @@
}
// this will generate non-overlapping files since it keeps increasing key_idx
-@@ -1314,10 +1328,12 @@ void DBTestBase::GenerateNewFile(Random* rnd, int* key
+@@ -1414,10 +1428,12 @@ void DBTestBase::GenerateNewFile(Random* rnd, int* key
ASSERT_OK(Put(Key(*key_idx), rnd->RandomString((i == 99) ? 1 : 990)));
(*key_idx)++;
}
@@ -104,7 +101,7 @@
}
const int DBTestBase::kNumKeysByGenerateNewRandomFile = 51;
-@@ -1327,10 +1343,12 @@ void DBTestBase::GenerateNewRandomFile(Random* rnd, bo
+@@ -1427,10 +1443,12 @@ void DBTestBase::GenerateNewRandomFile(Random* rnd, bo
ASSERT_OK(Put("key" + rnd->RandomString(7), rnd->RandomString(2000)));
}
ASSERT_OK(Put("key" + rnd->RandomString(7), rnd->RandomString(200)));
diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist
index 66d606155b88..f77457551648 100644
--- a/databases/rocksdb/pkg-plist
+++ b/databases/rocksdb/pkg-plist
@@ -61,6 +61,7 @@ include/rocksdb/options.h
include/rocksdb/perf_context.h
include/rocksdb/perf_level.h
include/rocksdb/persistent_cache.h
+include/rocksdb/point_lock_bench_tool.h
include/rocksdb/port_defs.h
include/rocksdb/rate_limiter.h
include/rocksdb/rocksdb_namespace.h