diff options
Diffstat (limited to 'databases/rocksdb')
| -rw-r--r-- | databases/rocksdb/Makefile | 14 | ||||
| -rw-r--r-- | databases/rocksdb/distinfo | 6 | ||||
| -rw-r--r-- | databases/rocksdb/files/patch-db-db_test_util.cc | 35 | ||||
| -rw-r--r-- | databases/rocksdb/pkg-plist | 3 |
4 files changed, 27 insertions, 31 deletions
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index 18fc1de57deb..9697890e31d2 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -1,6 +1,7 @@ PORTNAME= rocksdb -PORTVERSION= 10.1.3 +PORTVERSION= 10.7.5 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org @@ -21,7 +22,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 +32,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 @@ -41,8 +42,6 @@ PORTDATA= make_config.mk GH_ACCOUNT= facebook USE_GITHUB= yes -CONFLICTS_INSTALL= rocksdb-lite - BENCHMARKS= cache_bench db_bench memtablerep_bench persistent_cache_bench range_del_aggregator_bench table_reader_bench TOOLS= blob_dump db_repl_stress db_sanity_test db_stress ldb rocksdb_dump rocksdb_undump sst_dump trace_analyzer write_stress @@ -59,10 +58,7 @@ ZSTD_MAKE_ENV_OFF= ROCKSDB_DISABLE_ZSTD=yes .include <bsd.port.pre.mk> .if ${CHOSEN_COMPILER_TYPE} == clang -CXXFLAGS+= -Wno-unused-parameter -Wno-unused-variable -.if ${COMPILER_VERSION} >= 170 -CXXFLAGS+= -Wno-sync-alignment -.endif +CXXFLAGS+= -Wno-sync-alignment -Wno-unused-but-set-variable -Wno-unused-parameter -Wno-unused-variable .endif post-patch: diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo index 7651257a7046..aded81fe9d3f 100644 --- a/databases/rocksdb/distinfo +++ b/databases/rocksdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745177896 -SHA256 (facebook-rocksdb-v10.1.3_GH0.tar.gz) = df44cbca43d2002726ebbdd5caeae1701dcdf0500d4c2065d6fca261b4706a37 -SIZE (facebook-rocksdb-v10.1.3_GH0.tar.gz) = 13766405 +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 52ddc261829c..f77457551648 100644 --- a/databases/rocksdb/pkg-plist +++ b/databases/rocksdb/pkg-plist @@ -15,6 +15,7 @@ bin/table_reader_bench bin/trace_analyzer bin/write_stress include/rocksdb/advanced_cache.h +include/rocksdb/advanced_compression.h include/rocksdb/advanced_iterator.h include/rocksdb/advanced_options.h include/rocksdb/attribute_groups.h @@ -60,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 @@ -89,6 +91,7 @@ include/rocksdb/transaction_log.h include/rocksdb/types.h include/rocksdb/unique_id.h include/rocksdb/universal_compaction.h +include/rocksdb/user_defined_index.h include/rocksdb/user_write_callback.h include/rocksdb/utilities/agg_merge.h include/rocksdb/utilities/backup_engine.h |