remove legacy derived data interface for Jupiter (#152)

* remove legacy derived data interface for Jupiter

1 files changed, 6 insertions, 20 deletions

diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index 40d627862..a897c21fd 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -88,7 +88,6 @@ namespace detail {
 		JupiterUpstreamEndpoint(const CloudCacheClientOptions& Options, const UpstreamAuthConfig& AuthConfig, AuthMgr& Mgr)
 		: m_AuthMgr(Mgr)
 		, m_Log(zen::logging::Get("upstream"))
-		, m_UseLegacyDdc(Options.UseLegacyDdc)
 		{
 			ZEN_ASSERT(!Options.Name.empty());
 			m_Info.Name = Options.Name;
@@ -192,12 +191,7 @@ namespace detail {
 
 				std::string_view BlobStoreNamespace = GetActualBlobStoreNamespace(Session, Namespace);
 
-				if (m_UseLegacyDdc && Type == ZenContentType::kBinary)
-				{
-					std::string_view DdcNamespace = GetActualDdcNamespace(Session, Namespace);
-					Result						  = Session.GetDerivedData(DdcNamespace, CacheKey.Bucket, CacheKey.Hash);
-				}
-				else if (Type == ZenContentType::kCompressedBinary)
+				if (Type == ZenContentType::kCompressedBinary)
 				{
 					Result = Session.GetRef(BlobStoreNamespace, CacheKey.Bucket, CacheKey.Hash, ZenContentType::kCbObject);
 
@@ -449,18 +443,11 @@ namespace detail {
 					for (uint32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
 					{
 						std::string_view BlobStoreNamespace = GetActualBlobStoreNamespace(Session, CacheRecord.Namespace);
-						if (m_UseLegacyDdc)
-						{
-							Result = Session.PutDerivedData(BlobStoreNamespace, CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RecordValue);
-						}
-						else
-						{
-							Result = Session.PutRef(BlobStoreNamespace,
-													CacheRecord.Key.Bucket,
-													CacheRecord.Key.Hash,
-													RecordValue,
-													ZenContentType::kBinary);
-						}
+						Result								= Session.PutRef(BlobStoreNamespace,
+												 CacheRecord.Key.Bucket,
+												 CacheRecord.Key.Hash,
+												 RecordValue,
+												 ZenContentType::kBinary);
 					}
 
 					m_Status.SetFromErrorCode(Result.ErrorCode, Result.Reason);
@@ -671,7 +658,6 @@ namespace detail {
 		UpstreamEndpointInfo	 m_Info;
 		UpstreamStatus			 m_Status;
 		UpstreamEndpointStats	 m_Stats;
-		bool					 m_UseLegacyDdc;
 		RefPtr<CloudCacheClient> m_Client;
 	};