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

1 files changed, 3 insertions, 6 deletions

diff --git a/zenserver/upstream/upstreamapply.cpp b/zenserver/upstream/upstreamapply.cpp
index c397bb141..c719b225d 100644
--- a/zenserver/upstream/upstreamapply.cpp
+++ b/zenserver/upstream/upstreamapply.cpp
@@ -11,7 +11,6 @@
 #	include <zencore/timer.h>
 #	include <zencore/workthreadpool.h>
 
-#	include <zenstore/cas.h>
 #	include <zenstore/cidstore.h>
 
 #	include "diag/logging.h"
@@ -77,10 +76,9 @@ struct UpstreamApplyStats
 class UpstreamApplyImpl final : public UpstreamApply
 {
 public:
-	UpstreamApplyImpl(const UpstreamApplyOptions& Options, CasStore& CasStore, CidStore& CidStore)
+	UpstreamApplyImpl(const UpstreamApplyOptions& Options, CidStore& CidStore)
 	: m_Log(logging::Get("upstream-apply"))
 	, m_Options(Options)
-	, m_CasStore(CasStore)
 	, m_CidStore(CidStore)
 	, m_Stats(Options.StatsEnabled)
 	, m_UpstreamAsyncWorkPool(Options.UpstreamThreadCount)
@@ -429,7 +427,6 @@ private:
 
 	spdlog::logger&										m_Log;
 	UpstreamApplyOptions								m_Options;
-	CasStore&											m_CasStore;
 	CidStore&											m_CidStore;
 	UpstreamApplyStats									m_Stats;
 	UpstreamApplyTasks									m_ApplyTasks;
@@ -452,9 +449,9 @@ UpstreamApply::IsHealthy() const
 }
 
 std::unique_ptr<UpstreamApply>
-UpstreamApply::Create(const UpstreamApplyOptions& Options, CasStore& CasStore, CidStore& CidStore)
+UpstreamApply::Create(const UpstreamApplyOptions& Options, CidStore& CidStore)
 {
-	return std::make_unique<UpstreamApplyImpl>(Options, CasStore, CidStore);
+	return std::make_unique<UpstreamApplyImpl>(Options, CidStore);
 }
 
 }  // namespace zen