Keep Namespace out of CacheKey and store it on request level

RPC requests now has a Namespace field under Params instead of one Namespace per cache key
Fall back to legacy upstream HTTP URI format if default namespace is requested

1 files changed, 1 insertions, 9 deletions

diff --git a/zenutil/include/zenutil/cache/cachekey.h b/zenutil/include/zenutil/cache/cachekey.h
index 427c99435..9adde8fc7 100644
--- a/zenutil/include/zenutil/cache/cachekey.h
+++ b/zenutil/include/zenutil/cache/cachekey.h
@@ -12,21 +12,13 @@ namespace zen {
 
 struct CacheKey
 {
-	std::string Namespace;
 	std::string Bucket;
 	IoHash		Hash;
 
-	static CacheKey Create(std::string_view Namespace, std::string_view Bucket, const IoHash& Hash)
-	{
-		return {.Namespace = ToLower(Namespace), .Bucket = ToLower(Bucket), .Hash = Hash};
-	}
+	static CacheKey Create(std::string_view Bucket, const IoHash& Hash) { return {.Bucket = ToLower(Bucket), .Hash = Hash}; }
 
 	auto operator<=>(const CacheKey& that) const
 	{
-		if (auto n = caseSensitiveCompareStrings(Namespace, that.Namespace); n != std::strong_ordering::equal)
-		{
-			return n;
-		}
 		if (auto b = caseSensitiveCompareStrings(Bucket, that.Bucket); b != std::strong_ordering::equal)
 		{
 			return b;