diff options
| author | Per Larsson <[email protected]> | 2021-12-14 12:34:47 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-12-14 12:34:47 +0100 |
| commit | b6c6568e1618f10d2160d836b65e35586e3c740f (patch) | |
| tree | f6a929cf918850bbba87d0ee67cd3482b2d50e24 /zenserver/cache/cachetracking.cpp | |
| parent | Fixed bug in z$ service returning partial cache records and enable small obje... (diff) | |
| parent | Partial revert b363c5b (diff) | |
| download | zen-b6c6568e1618f10d2160d836b65e35586e3c740f.tar.xz zen-b6c6568e1618f10d2160d836b65e35586e3c740f.zip | |
Merged main.
Diffstat (limited to 'zenserver/cache/cachetracking.cpp')
| -rw-r--r-- | zenserver/cache/cachetracking.cpp | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/zenserver/cache/cachetracking.cpp b/zenserver/cache/cachetracking.cpp index d1c99a597..ae132f37f 100644 --- a/zenserver/cache/cachetracking.cpp +++ b/zenserver/cache/cachetracking.cpp @@ -2,24 +2,26 @@ #include "cachetracking.h" -#include <zencore/compactbinarybuilder.h> -#include <zencore/compactbinaryvalue.h> -#include <zencore/endian.h> -#include <zencore/filesystem.h> -#include <zencore/logging.h> -#include <zencore/scopeguard.h> -#include <zencore/string.h> +#if ZEN_USE_CACHE_TRACKER -#include <zencore/testing.h> -#include <zencore/testutils.h> +# include <zencore/compactbinarybuilder.h> +# include <zencore/compactbinaryvalue.h> +# include <zencore/endian.h> +# include <zencore/filesystem.h> +# include <zencore/logging.h> +# include <zencore/scopeguard.h> +# include <zencore/string.h> + +# include <zencore/testing.h> +# include <zencore/testutils.h> ZEN_THIRD_PARTY_INCLUDES_START -#pragma comment(lib, "Rpcrt4.lib") // RocksDB made me do this -#include <fmt/format.h> -#include <rocksdb/db.h> -#include <tsl/robin_map.h> -#include <tsl/robin_set.h> -#include <gsl/gsl-lite.hpp> +# pragma comment(lib, "Rpcrt4.lib") // RocksDB made me do this +# include <fmt/format.h> +# include <rocksdb/db.h> +# include <tsl/robin_map.h> +# include <tsl/robin_set.h> +# include <gsl/gsl-lite.hpp> ZEN_THIRD_PARTY_INCLUDES_END namespace zen { @@ -150,7 +152,7 @@ struct ZenCacheTracker::Impl { std::filesystem::path StatsDbPath{StateDirectory / ".zdb"}; - std::string RocksdbPath = ToUtf8(StatsDbPath); + std::string RocksdbPath = StatsDbPath.string(); ZEN_DEBUG("opening tracker db at '{}'", RocksdbPath); @@ -291,7 +293,7 @@ ZenCacheTracker::IterateSnapshots(std::function<void(uint64_t TimeStamp, CbObjec m_Impl->IterateSnapshots(std::move(Callback)); } -#if ZEN_WITH_TESTS +# if ZEN_WITH_TESTS TEST_CASE("z$.tracker") { @@ -365,7 +367,7 @@ TEST_CASE("z$.tracker") CHECK_EQ(SnapshotCount, 11); } -#endif +# endif void cachetracker_forcelink() @@ -373,3 +375,5 @@ cachetracker_forcelink() } } // namespace zen + +#endif // ZEN_USE_CACHE_TRACKER |