per namespace/project cas prep refactor (#470)

- Refactor so we can have more than one cas store for project store and cache.
- Refactor `UpstreamCacheClient` so it is not tied to a specific CidStore
- Refactor scrub to keep the GC interface ScrubStorage function separate from scrub accessor functions (renamed to Scrub).
- Refactor storage size to keep GC interface StorageSize function separate from size accessor functions (renamed to TotalSize)
- Refactor cache storage so  `ZenCacheDiskLayer::CacheBucket` implements GcStorage interface rather than `ZenCacheNamespace`

1 files changed, 16 insertions, 12 deletions

diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp
index 219caca01..cacbbd966 100644
--- a/src/zenstore/cache/cachedisklayer.cpp
+++ b/src/zenstore/cache/cachedisklayer.cpp
@@ -798,6 +798,7 @@ ZenCacheDiskLayer::CacheBucket::CacheBucket(GcManager&				   Gc,
 		m_Configuration.LargeObjectThreshold = Max(m_Configuration.LargeObjectThreshold, IoStoreDDCOverrideSize);
 	}
 	m_Gc.AddGcReferencer(*this);
+	m_Gc.AddGcStorage(this);
 }
 
 ZenCacheDiskLayer::CacheBucket::~CacheBucket()
@@ -812,6 +813,7 @@ ZenCacheDiskLayer::CacheBucket::~CacheBucket()
 	{
 		ZEN_ERROR("~CacheBucket() failed with: ", Ex.what());
 	}
+	m_Gc.RemoveGcStorage(this);
 	m_Gc.RemoveGcReferencer(*this);
 }
 
@@ -2587,7 +2589,7 @@ ZenCacheDiskLayer::CacheBucket::ScrubStorage(ScrubContext& Ctx)
 ZenCacheDiskLayer::BucketStats
 ZenCacheDiskLayer::CacheBucket::Stats()
 {
-	GcStorageSize Size = StorageSize();
+	CacheStoreSize Size = TotalSize();
 	return ZenCacheDiskLayer::BucketStats{.DiskSize			= Size.DiskSize,
 										  .MemorySize		= Size.MemorySize,
 										  .DiskHitCount		= m_DiskHitCount,
@@ -4417,8 +4419,9 @@ ZenCacheDiskLayer::Flush()
 	}
 }
 
+#if ZEN_WITH_TESTS
 void
-ZenCacheDiskLayer::ScrubStorage(ScrubContext& Ctx)
+ZenCacheDiskLayer::Scrub(ScrubContext& Ctx)
 {
 	ZEN_TRACE_CPU("Z$::ScrubStorage");
 
@@ -4429,13 +4432,13 @@ ZenCacheDiskLayer::ScrubStorage(ScrubContext& Ctx)
 
 		for (auto& Kv : m_Buckets)
 		{
-#if 1
+#	if 1
 			Results.push_back(Ctx.ThreadPool().EnqueueTask(
 				std::packaged_task<void()>{[this, Bucket = Kv.second.get(), &Ctx] { Bucket->ScrubStorage(Ctx); }}));
-#else
+#	else
 			CacheBucket& Bucket = *Kv.second;
 			Bucket.ScrubStorage(Ctx);
-#endif
+#	endif
 		}
 
 		for (auto& Result : Results)
@@ -4451,16 +4454,17 @@ ZenCacheDiskLayer::ScrubStorage(ScrubContext& Ctx)
 		}
 	}
 }
+#endif	// ZEN_WITH_TESTS
 
-GcStorageSize
-ZenCacheDiskLayer::StorageSize() const
+CacheStoreSize
+ZenCacheDiskLayer::TotalSize() const
 {
-	GcStorageSize StorageSize{};
+	CacheStoreSize StorageSize{};
 
 	RwLock::SharedLockScope _(m_Lock);
 	for (auto& Kv : m_Buckets)
 	{
-		GcStorageSize BucketSize = Kv.second->StorageSize();
+		CacheStoreSize BucketSize = Kv.second->TotalSize();
 		StorageSize.DiskSize += BucketSize.DiskSize;
 		StorageSize.MemorySize += BucketSize.MemorySize;
 	}
@@ -4471,7 +4475,7 @@ ZenCacheDiskLayer::StorageSize() const
 ZenCacheDiskLayer::DiskStats
 ZenCacheDiskLayer::Stats() const
 {
-	GcStorageSize				 Size  = StorageSize();
+	CacheStoreSize				 Size  = TotalSize();
 	ZenCacheDiskLayer::DiskStats Stats = {.DiskSize = Size.DiskSize, .MemorySize = Size.MemorySize};
 	{
 		RwLock::SharedLockScope _(m_Lock);
@@ -4495,7 +4499,7 @@ ZenCacheDiskLayer::GetInfo() const
 		{
 			Info.BucketNames.push_back(Kv.first);
 			Info.EntryCount += Kv.second->EntryCount();
-			GcStorageSize BucketSize = Kv.second->StorageSize();
+			CacheStoreSize BucketSize = Kv.second->TotalSize();
 			Info.StorageSize.DiskSize += BucketSize.DiskSize;
 			Info.StorageSize.MemorySize += BucketSize.MemorySize;
 		}
@@ -4510,7 +4514,7 @@ ZenCacheDiskLayer::GetBucketInfo(std::string_view Bucket) const
 
 	if (auto It = m_Buckets.find(std::string(Bucket)); It != m_Buckets.end())
 	{
-		return ZenCacheDiskLayer::BucketInfo{.EntryCount = It->second->EntryCount(), .StorageSize = It->second->StorageSize()};
+		return ZenCacheDiskLayer::BucketInfo{.EntryCount = It->second->EntryCount(), .StorageSize = It->second->TotalSize()};
 	}
 	return {};
 }