MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

ircd::db::fixes: Fix missing condition for older interposed definition.

Browse source
This commit is contained in:
Jason Volk 2020-05-07 15:56:21 -07:00
parent ba87567d80
commit efdd49ed3a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ircd/db_fixes.cc
View file

@ -50,6 +50,8 @@
#include "file/sst_file_manager_impl.h" #include "file/sst_file_manager_impl.h"
#endif #endif
#include "db_env.h"
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //
// https://github.com/facebook/rocksdb/issues/4654. In summary, some RocksDB // https://github.com/facebook/rocksdb/issues/4654. In summary, some RocksDB
@ -111,7 +113,8 @@ rocksdb::WriteThread::BlockingAwaitState(Writer *const w,
// simply not start that thread. // simply not start that thread.
// //
#if __has_include("util/delete_scheduler.h") #if !defined(IRCD_DB_HAS_ENV_FILESYSTEM) \
&& (__has_include("util/delete_scheduler.h") || __has_include("file/delete_scheduler.h"))
rocksdb::DeleteScheduler::DeleteScheduler(Env* env, rocksdb::DeleteScheduler::DeleteScheduler(Env* env,
int64_t rate_bytes_per_sec, int64_t rate_bytes_per_sec,
Logger* info_log, Logger* info_log,
@ -136,7 +139,8 @@ max_trash_db_ratio_(max_trash_db_ratio)
} }
#endif #endif
#if __has_include("file/delete_scheduler.h") && defined(IRCD_DB_HAVE_ENV_FILESYSTEM) #if defined(IRCD_DB_HAS_ENV_FILESYSTEM) \
&& __has_include("file/delete_scheduler.h")
rocksdb::DeleteScheduler::DeleteScheduler(Env* env, rocksdb::DeleteScheduler::DeleteScheduler(Env* env,
FileSystem *fs, FileSystem *fs,
int64_t rate_bytes_per_sec, int64_t rate_bytes_per_sec,