Remove DerivedDataExists & Exists prop

1 files changed, 4 insertions, 52 deletions

diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index e15dd53bc..b93635e76 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -446,46 +446,6 @@ CloudCacheSession::PutObject(const IoHash& Key, IoBuffer Object)
 }
 
 CloudCacheResult
-CloudCacheSession::DerivedDataExists(std::string_view BucketId, std::string_view Key)
-{
-	const CloudCacheAccessToken& AccessToken = GetAccessToken();
-	if (!AccessToken.IsValid())
-	{
-		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
-	}
-
-	ExtendableStringBuilder<256> Uri;
-	Uri << m_CacheClient->ServiceUrl() << "/api/v1/c/ddc/" << m_CacheClient->DdcNamespace() << "/" << BucketId << "/" << Key;
-
-	cpr::Session& Session = m_SessionState->Session;
-
-	Session.SetOption(cpr::Url{Uri.c_str()});
-	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}});
-
-	cpr::Response Response = Session.Get();
-	ZEN_DEBUG("HEAD {}", Response);
-
-	if (Response.error)
-	{
-		return {.ErrorCode = static_cast<int32_t>(Response.error.code), .Reason = Response.error.message};
-	}
-	else if (!VerifyAccessToken(Response.status_code))
-	{
-		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
-	}
-
-	return {.ElapsedSeconds = Response.elapsed,
-			.Success		= (Response.status_code == 200 || Response.status_code == 404),
-			.Exists			= Response.status_code == 200};
-}
-
-CloudCacheResult
-CloudCacheSession::DerivedDataExists(std::string_view BucketId, const IoHash& Key)
-{
-	return DerivedDataExists(BucketId, Key.ToHexString());
-}
-
-CloudCacheResult
 CloudCacheSession::RefExists(std::string_view BucketId, const IoHash& Key)
 {
 	const CloudCacheAccessToken& AccessToken = GetAccessToken();
@@ -515,9 +475,7 @@ CloudCacheSession::RefExists(std::string_view BucketId, const IoHash& Key)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	return {.ElapsedSeconds = Response.elapsed,
-			.Success		= (Response.status_code == 200 || Response.status_code == 404),
-			.Exists			= Response.status_code == 200};
+	return {.ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
 }
 
 CloudCacheResult
@@ -548,9 +506,7 @@ CloudCacheSession::BlobExists(const IoHash& Key)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	return {.ElapsedSeconds = Response.elapsed,
-			.Success		= (Response.status_code == 200 || Response.status_code == 404),
-			.Exists			= Response.status_code == 200};
+	return {.ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
 }
 
 CloudCacheResult
@@ -581,9 +537,7 @@ CloudCacheSession::CompressedBlobExists(const IoHash& Key)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	return {.ElapsedSeconds = Response.elapsed,
-			.Success		= (Response.status_code == 200 || Response.status_code == 404),
-			.Exists			= Response.status_code == 200};
+	return {.ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
 }
 
 CloudCacheResult
@@ -614,9 +568,7 @@ CloudCacheSession::ObjectExists(const IoHash& Key)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	return {.ElapsedSeconds = Response.elapsed,
-			.Success		= (Response.status_code == 200 || Response.status_code == 404),
-			.Exists			= Response.status_code == 200};
+	return {.ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
 }
 
 std::vector<IoHash>