MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-25 23:14:13 +01:00
Code Issues Releases Wiki Activity

ircd::db: ABI fixes for RocksDB v6.19+.

Browse source
This commit is contained in:
Jason Volk 2021-09-15 01:42:21 -07:00
parent 7cd34cba0a
commit 6ea6a003dc
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ircd/db.cc
View file

@ -33,11 +33,11 @@ ircd::db::version_api
}
};
#ifndef IRCD_DB_HAS_VERSION_ABI
extern "C" const char *
rocksdb_build_git_sha;
extern "C" const char *
rocksdb_build_git_sha,
rocksdb_build_compile_date;
#endif
decltype(ircd::db::version_abi)
ircd::db::version_abi
@ -47,9 +47,14 @@ ircd::db::version_abi
{
fmt::sprintf
{
#ifdef IRCD_DB_HAS_VERSION_ABI
buf, "%s",
rocksdb::GetRocksVersionAsString(true),
#else
buf, "%s (%s)",
lstrip(rocksdb_build_git_sha, "rocksdb_build_git_sha:"),
rocksdb_build_compile_date,
#endif
};
}
};

6
ircd/db_has.h
View file

@ -73,6 +73,12 @@
#define IRCD_DB_HAS_MULTIGET_DIRECT
#endif
#if ROCKSDB_MAJOR > 6 \
|| (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR > 19) \
|| (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR == 19 && ROCKSDB_PATCH >= 3)
#define IRCD_DB_HAS_VERSION_ABI
#endif
#if ROCKSDB_MAJOR > 6 \
|| (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR > 22) \
|| (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR == 22 && ROCKSDB_PATCH >= 1)