diff options
| author | Dan Engelbrecht <[email protected]> | 2022-06-17 07:06:21 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-17 07:06:21 -0700 |
| commit | c7e22a4ef1cce7103b9afbeec487461cb32f8dbe (patch) | |
| tree | 8b99d51bf496c96f82161c18fbdcfd5c6f8f31fd /zenserver/cache/structuredcachestore.h | |
| parent | fixed merge mistake which caused a build error (diff) | |
| download | zen-0.1.4-pre6.tar.xz zen-0.1.4-pre6.zip | |
Make cas storage an hidden implementation detail of CidStore (#130)v0.1.4-pre6v0.1.4-pre5
- Bumped ZEN_SCHEMA_VERSION
- CasStore no longer a public API, it is hidden behind CidStore
- Moved cas.h from public header folder
- CidStore no longer maps from Cid -> Cas, we store entries in Cas under RawHash
- CasStore now decompresses data to validate content (matching against RawHash)
- CasChunkSet renames to HashKeySet and put in separate header/cpp file
- Disabled "Chunk" command for now as it relied on CAS being exposed as a service
- Changed CAS http service to Cid http server
- Moved "Run" command completely inside ZEN_WITH_EXEC_SERVICES define
- Removed "cas.basic" test
- Uncommented ".exec.basic" test and added return-skip at start of test
- Moved ScrubContext to separate header file
- Renamed CasGC to GcManager
- Cleaned up configuration passing in cas store classes
- Removed CAS stuff from GcContext and clarified naming in class
- Remove migration code
Diffstat (limited to 'zenserver/cache/structuredcachestore.h')
| -rw-r--r-- | zenserver/cache/structuredcachestore.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h index ea33a3c00..b81e44835 100644 --- a/zenserver/cache/structuredcachestore.h +++ b/zenserver/cache/structuredcachestore.h @@ -9,7 +9,6 @@ #include <zencore/uid.h> #include <zenstore/basicfile.h> #include <zenstore/blockstore.h> -#include <zenstore/cas.h> #include <zenstore/caslog.h> #include <zenstore/gc.h> @@ -27,8 +26,9 @@ ZEN_THIRD_PARTY_INCLUDES_END namespace zen { class PathBuilderBase; -class CasGc; +class GcManager; class ZenCacheTracker; +class ScrubContext; /****************************************************************************** @@ -327,7 +327,7 @@ private: class ZenCacheNamespace final : public RefCounted, public GcStorage, public GcContributor { public: - ZenCacheNamespace(CasGc& Gc, const std::filesystem::path& RootDir); + ZenCacheNamespace(GcManager& Gc, const std::filesystem::path& RootDir); ~ZenCacheNamespace(); bool Get(std::string_view Bucket, const IoHash& HashKey, ZenCacheValue& OutValue); @@ -369,7 +369,7 @@ public: bool AllowAutomaticCreationOfNamespaces = true; }; - ZenCacheStore(CasGc& Gc, const Configuration& Configuration); + ZenCacheStore(GcManager& Gc, const Configuration& Configuration); ~ZenCacheStore(); bool Get(std::string_view Namespace, std::string_view Bucket, const IoHash& HashKey, ZenCacheValue& OutValue); @@ -393,7 +393,7 @@ private: NamespaceMap m_Namespaces; std::vector<std::unique_ptr<ZenCacheNamespace>> m_DroppedNamespaces; - CasGc& m_Gc; + GcManager& m_Gc; Configuration m_Configuration; }; |