Skip to content

chore(deps): bump rocksdb to v11.1.1 #3468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PragmaTwice merged 3 commits into from
May 2, 2026
Merged

chore(deps): bump rocksdb to v11.1.1 #3468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec76171
Update rocksdb.cmake
aleksraiden Apr 30, 2026
9c14275
fix(storage): support RocksDB 11 DB open APIs
PragmaTwice May 2, 2026
bf9e87f
Merge branch 'unstable' into aleksraiden-patch-2
PragmaTwice May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/rocksdb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ endif()
include(cmake/utils.cmake)

FetchContent_DeclareGitHubWithMirror(rocksdb
facebook/rocksdb v10.10.1
MD5=dcef50080a4a6c0c0b4b77fd04c60502
facebook/rocksdb v11.1.1
MD5=c82fc5e9e0ecd6649a25c8a44f7e18a5
)

FetchContent_GetProperties(jemalloc)
Expand Down
79 changes: 21 additions & 58 deletions src/common/db_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#pragma once

#include <memory>
#include <utility>

#include "fmt/ostream.h"
#include "rocksdb/db.h"
Expand All @@ -42,87 +43,49 @@ struct UniqueIterator : std::unique_ptr<rocksdb::Iterator> {
: BaseType(ctx.storage->NewIterator(ctx, options)) {}
};

namespace details {

template <typename T, auto* F, Status::Code C = Status::NotOK, typename... Args>
StatusOr<std::unique_ptr<T>> WrapOutPtrToUnique(Args&&... args) {
T* ptr = nullptr;
auto s = (*F)(std::forward<Args>(args)..., &ptr);

if (!s.ok()) {
return {C, s.ToString()};
}

return ptr;
}

[[nodiscard]] inline rocksdb::Status DBOpenForReadOnly(
const rocksdb::DBOptions& db_options, const std::string& dbname,
const std::vector<rocksdb::ColumnFamilyDescriptor>& column_families,
std::vector<rocksdb::ColumnFamilyHandle*>* handles, rocksdb::DB** dbptr) {
return rocksdb::DB::OpenForReadOnly(db_options, dbname, column_families, handles, dbptr);
}

[[nodiscard]] inline rocksdb::Status DBOpenForSecondaryInstance(
const rocksdb::DBOptions& db_options, const std::string& dbname, const std::string& secondary_path,
const std::vector<rocksdb::ColumnFamilyDescriptor>& column_families,
std::vector<rocksdb::ColumnFamilyHandle*>* handles, rocksdb::DB** dbptr) {
return rocksdb::DB::OpenAsSecondary(db_options, dbname, secondary_path, column_families, handles, dbptr);
}

} // namespace details

inline StatusOr<std::unique_ptr<rocksdb::DB>> DBOpen(const rocksdb::Options& options, const std::string& dbname) {
return details::WrapOutPtrToUnique<
rocksdb::DB,
static_cast<rocksdb::Status (*)(const rocksdb::Options&, const std::string&, rocksdb::DB**)>(rocksdb::DB::Open),
Status::DBOpenErr>(options, dbname);
std::unique_ptr<rocksdb::DB> db;
auto s = rocksdb::DB::Open(options, dbname, &db);
if (!s.ok()) return {Status::DBOpenErr, s.ToString()};
return std::move(db);
}

inline StatusOr<std::unique_ptr<rocksdb::DB>> DBOpen(
const rocksdb::DBOptions& db_options, const std::string& dbname,
const std::vector<rocksdb::ColumnFamilyDescriptor>& column_families,
std::vector<rocksdb::ColumnFamilyHandle*>* handles) {
return details::WrapOutPtrToUnique<
rocksdb::DB,
static_cast<rocksdb::Status (*)(const rocksdb::DBOptions&, const std::string&,
const std::vector<rocksdb::ColumnFamilyDescriptor>&,
std::vector<rocksdb::ColumnFamilyHandle*>*, rocksdb::DB**)>(rocksdb::DB::Open),
Status::DBOpenErr>(db_options, dbname, column_families, handles);
std::unique_ptr<rocksdb::DB> db;
auto s = rocksdb::DB::Open(db_options, dbname, column_families, handles, &db);
if (!s.ok()) return {Status::DBOpenErr, s.ToString()};
return std::move(db);
}

inline StatusOr<std::unique_ptr<rocksdb::DB>> DBOpenForReadOnly(
const rocksdb::DBOptions& db_options, const std::string& dbname,
const std::vector<rocksdb::ColumnFamilyDescriptor>& column_families,
std::vector<rocksdb::ColumnFamilyHandle*>* handles) {
return details::WrapOutPtrToUnique<
rocksdb::DB,
static_cast<rocksdb::Status (*)(
const rocksdb::DBOptions&, const std::string&, const std::vector<rocksdb::ColumnFamilyDescriptor>&,
std::vector<rocksdb::ColumnFamilyHandle*>*, rocksdb::DB**)>(details::DBOpenForReadOnly),
Status::DBOpenErr>(db_options, dbname, column_families, handles);
std::unique_ptr<rocksdb::DB> db;
auto s = rocksdb::DB::OpenForReadOnly(db_options, dbname, column_families, handles, &db);
if (!s.ok()) return {Status::DBOpenErr, s.ToString()};
return std::move(db);
}

inline StatusOr<std::unique_ptr<rocksdb::DB>> DBOpenAsSecondaryInstance(
const rocksdb::DBOptions& db_options, const std::string& dbname, const std::string& secondary_path,
const std::vector<rocksdb::ColumnFamilyDescriptor>& column_families,
std::vector<rocksdb::ColumnFamilyHandle*>* handles) {
return details::WrapOutPtrToUnique<
rocksdb::DB,
static_cast<rocksdb::Status (*)(const rocksdb::DBOptions&, const std::string&, const std::string&,
const std::vector<rocksdb::ColumnFamilyDescriptor>&,
std::vector<rocksdb::ColumnFamilyHandle*>*, rocksdb::DB**)>(
details::DBOpenForSecondaryInstance),
Status::DBOpenErr>(db_options, dbname, secondary_path, column_families, handles);
std::unique_ptr<rocksdb::DB> db;
auto s = rocksdb::DB::OpenAsSecondary(db_options, dbname, secondary_path, column_families, handles, &db);
if (!s.ok()) return {Status::DBOpenErr, s.ToString()};
return std::move(db);
}

inline StatusOr<std::unique_ptr<rocksdb::BackupEngine>> BackupEngineOpen(rocksdb::Env* db_env,
const rocksdb::BackupEngineOptions& options) {
return details::WrapOutPtrToUnique<
rocksdb::BackupEngine,
static_cast<rocksdb::IOStatus (*)(rocksdb::Env*, const rocksdb::BackupEngineOptions&, rocksdb::BackupEngine**)>(
rocksdb::BackupEngine::Open),
Status::DBBackupErr>(db_env, options);
rocksdb::BackupEngine* backup_engine = nullptr;
auto s = rocksdb::BackupEngine::Open(options, db_env, &backup_engine);
if (!s.ok()) return {Status::DBBackupErr, s.ToString()};
return std::unique_ptr<rocksdb::BackupEngine>(backup_engine);
}

} // namespace util
Expand Down
Loading