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/projectstore.cpp | |
| 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/projectstore.cpp')
| -rw-r--r-- | zenserver/projectstore.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index 1853941ed..e42704ccf 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -16,8 +16,8 @@ #include <zencore/timer.h> #include <zencore/trace.h> #include <zenstore/basicfile.h> -#include <zenstore/cas.h> #include <zenstore/caslog.h> +#include <zenstore/scrubcontext.h> #include "config.h" @@ -350,7 +350,7 @@ ProjectStore::Oplog::GatherReferences(GcContext& GcCtx) Hashes.push_back(Kv.second); } - GcCtx.ContributeCids(Hashes); + GcCtx.AddRetainedCids(Hashes); Hashes.clear(); @@ -359,7 +359,7 @@ ProjectStore::Oplog::GatherReferences(GcContext& GcCtx) Hashes.push_back(Kv.second); } - GcCtx.ContributeCids(Hashes); + GcCtx.AddRetainedCids(Hashes); } bool @@ -872,7 +872,7 @@ ProjectStore::Project::GatherReferences(GcContext& GcCtx) ////////////////////////////////////////////////////////////////////////// -ProjectStore::ProjectStore(CidStore& Store, std::filesystem::path BasePath, CasGc& Gc) +ProjectStore::ProjectStore(CidStore& Store, std::filesystem::path BasePath, GcManager& Gc) : GcContributor(Gc) , m_Log(zen::logging::Get("project")) , m_CidStore(Store) @@ -1482,7 +1482,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) { const IoHash FileHash = Entry.AsHash(); - if (!m_CidStore.FindChunkByCid(FileHash)) + if (!m_CidStore.ContainsChunk(FileHash)) { ZEN_DEBUG("prep - NEED: {}", FileHash); |