remove legacy compute interfaces (#461)

* removed legacy compute code, which will be replaced with a new implementation in the future
* also updated references to Jupiter storage

1 files changed, 14 insertions, 115 deletions

diff --git a/src/zenserver/upstream/jupiter.cpp b/src/zenserver/upstream/jupiter.cpp
index 61d8a85cc..a67c497ad 100644
--- a/src/zenserver/upstream/jupiter.cpp
+++ b/src/zenserver/upstream/jupiter.cpp
@@ -281,7 +281,7 @@ CloudCacheSession::GetBlob(std::string_view Namespace, const IoHash& Key)
 CloudCacheResult
 CloudCacheSession::GetCompressedBlob(std::string_view Namespace, const IoHash& Key, std::filesystem::path TempFolderPath)
 {
-	ZEN_TRACE_CPU("HordeClient::GetCompressedBlob");
+	ZEN_TRACE_CPU("JupiterClient::GetCompressedBlob");
 
 	ExtendableStringBuilder<256> Uri;
 	std::string					 KeyString = Key.ToHexString();
@@ -338,7 +338,7 @@ CloudCacheSession::GetInlineBlob(std::string_view	   Namespace,
 								 IoHash&			   OutPayloadHash,
 								 std::filesystem::path TempFolderPath)
 {
-	ZEN_TRACE_CPU("HordeClient::GetInlineBlob");
+	ZEN_TRACE_CPU("JupiterClient::GetInlineBlob");
 
 	ExtendableStringBuilder<256> Uri;
 	std::string					 KeyString = Key.ToHexString();
@@ -401,7 +401,7 @@ CloudCacheSession::GetInlineBlob(std::string_view	   Namespace,
 CloudCacheResult
 CloudCacheSession::GetObject(std::string_view Namespace, const IoHash& Key)
 {
-	ZEN_TRACE_CPU("HordeClient::GetObject");
+	ZEN_TRACE_CPU("JupiterClient::GetObject");
 
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/objects/" << Namespace << "/" << Key.ToHexString();
@@ -453,7 +453,7 @@ CloudCacheSession::GetObject(std::string_view Namespace, const IoHash& Key)
 PutRefResult
 CloudCacheSession::PutRef(std::string_view Namespace, std::string_view BucketId, const IoHash& Key, IoBuffer Ref, ZenContentType RefType)
 {
-	ZEN_TRACE_CPU("HordeClient::PutRef");
+	ZEN_TRACE_CPU("JupiterClient::PutRef");
 
 	IoHash Hash = IoHash::HashBuffer(Ref.Data(), Ref.Size());
 
@@ -524,7 +524,7 @@ CloudCacheSession::PutRef(std::string_view Namespace, std::string_view BucketId,
 FinalizeRefResult
 CloudCacheSession::FinalizeRef(std::string_view Namespace, std::string_view BucketId, const IoHash& Key, const IoHash& RefHash)
 {
-	ZEN_TRACE_CPU("HordeClient::FinalizeRef");
+	ZEN_TRACE_CPU("JupiterClient::FinalizeRef");
 
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/refs/" << Namespace << "/" << BucketId << "/" << Key.ToHexString() << "/finalize/"
@@ -593,7 +593,7 @@ CloudCacheSession::FinalizeRef(std::string_view Namespace, std::string_view Buck
 CloudCacheResult
 CloudCacheSession::PutBlob(std::string_view Namespace, const IoHash& Key, IoBuffer Blob)
 {
-	ZEN_TRACE_CPU("HordeClient::PutBlob");
+	ZEN_TRACE_CPU("JupiterClient::PutBlob");
 
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/blobs/" << Namespace << "/" << Key.ToHexString();
@@ -642,7 +642,7 @@ CloudCacheSession::PutBlob(std::string_view Namespace, const IoHash& Key, IoBuff
 CloudCacheResult
 CloudCacheSession::PutCompressedBlob(std::string_view Namespace, const IoHash& Key, IoBuffer Blob)
 {
-	ZEN_TRACE_CPU("HordeClient::PutCompressedBlob");
+	ZEN_TRACE_CPU("JupiterClient::PutCompressedBlob");
 
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/compressed-blobs/" << Namespace << "/" << Key.ToHexString();
@@ -708,7 +708,7 @@ CloudCacheSession::PutCompressedBlob(std::string_view Namespace, const IoHash& K
 CloudCacheResult
 CloudCacheSession::PutCompressedBlob(std::string_view Namespace, const IoHash& Key, const CompositeBuffer& Payload)
 {
-	ZEN_TRACE_CPU("HordeClient::PutCompressedBlob");
+	ZEN_TRACE_CPU("JupiterClient::PutCompressedBlob");
 
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/compressed-blobs/" << Namespace << "/" << Key.ToHexString();
@@ -766,7 +766,7 @@ CloudCacheSession::PutCompressedBlob(std::string_view Namespace, const IoHash& K
 CloudCacheResult
 CloudCacheSession::PutObject(std::string_view Namespace, const IoHash& Key, IoBuffer Object)
 {
-	ZEN_TRACE_CPU("HordeClient::PutObject");
+	ZEN_TRACE_CPU("JupiterClient::PutObject");
 
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/objects/" << Namespace << "/" << Key.ToHexString();
@@ -815,7 +815,7 @@ CloudCacheSession::PutObject(std::string_view Namespace, const IoHash& Key, IoBu
 CloudCacheResult
 CloudCacheSession::RefExists(std::string_view Namespace, std::string_view BucketId, const IoHash& Key)
 {
-	ZEN_TRACE_CPU("HordeClient::RefExists");
+	ZEN_TRACE_CPU("JupiterClient::RefExists");
 
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/refs/" << Namespace << "/" << BucketId << "/" << Key.ToHexString();
@@ -860,7 +860,7 @@ CloudCacheSession::RefExists(std::string_view Namespace, std::string_view Bucket
 GetObjectReferencesResult
 CloudCacheSession::GetObjectReferences(std::string_view Namespace, const IoHash& Key)
 {
-	ZEN_TRACE_CPU("HordeClient::GetObjectReferences");
+	ZEN_TRACE_CPU("JupiterClient::GetObjectReferences");
 
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/objects/" << Namespace << "/" << Key.ToHexString() << "/references";
@@ -951,107 +951,6 @@ CloudCacheSession::ObjectExists(std::string_view Namespace, const std::set<IoHas
 	return CacheTypeExists(Namespace, "objects"sv, Keys);
 }
 
-CloudCacheResult
-CloudCacheSession::PostComputeTasks(IoBuffer TasksData)
-{
-	ZEN_TRACE_CPU("HordeClient::PostComputeTasks");
-
-	ExtendableStringBuilder<256> Uri;
-	Uri << m_CacheClient->ServiceUrl() << "/api/v1/compute/" << m_CacheClient->ComputeCluster();
-
-	cpr::Session&				 Session	 = GetSession();
-	const CloudCacheAccessToken& AccessToken = GetAccessToken();
-
-	Session.SetOption(cpr::Url{Uri.c_str()});
-	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Content-Type", "application/x-ue-cb"}});
-	Session.SetBody(cpr::Body{(const char*)TasksData.Data(), TasksData.Size()});
-
-	cpr::Response Response = Session.Post();
-	ZEN_DEBUG("POST {}", Response);
-
-	CloudCacheResult Result = detail::ConvertResponse(Response);
-	if (!Result.Success)
-	{
-		ZEN_WARN(
-			"CloudCacheSession::PostComputeTasks failed GET. "
-			"Elapsed: {} s, "
-			"Uri: '{}', "
-			"Header-Authorization: '{} <redacted>', "
-			"Header-Accept: '{}', "
-			"Response.status_code: {}, "
-			"Response.reason: '{}', "
-			"Response.error.code: {}, "
-			"Response.error.message: '{}', "
-			"Response.raw_header: '{}'"
-			"Response.text: '{}'",
-			Response.elapsed,
-			Uri,
-			AccessToken.Value.substr(0, 6),
-			"application/x-ue-cb",
-			Response.status_code,
-			Response.reason,
-			gsl::narrow<int>(Response.error.code),
-			Response.error.message,
-			Response.raw_header,
-			Response.text);
-	}
-	return Result;
-}
-
-CloudCacheResult
-CloudCacheSession::GetComputeUpdates(std::string_view ChannelId, const uint32_t WaitSeconds)
-{
-	ZEN_TRACE_CPU("HordeClient::GetComputeUpdates");
-
-	ExtendableStringBuilder<256> Uri;
-	Uri << m_CacheClient->ServiceUrl() << "/api/v1/compute/" << m_CacheClient->ComputeCluster() << "/updates/" << ChannelId
-		<< "?wait=" << WaitSeconds;
-
-	cpr::Session&				 Session	 = GetSession();
-	const CloudCacheAccessToken& AccessToken = GetAccessToken();
-
-	Session.SetOption(cpr::Url{Uri.c_str()});
-	Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/x-ue-cb"}});
-	Session.SetOption(cpr::Body{});
-
-	cpr::Response Response = Session.Post();
-	ZEN_DEBUG("POST {}", Response);
-
-	CloudCacheResult Result = detail::ConvertResponse(Response);
-
-	if (Result.Success)
-	{
-		Result.Response = IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size());
-	}
-	else
-	{
-		ZEN_WARN(
-			"CloudCacheSession::GetComputeUpdates failed GET. "
-			"Elapsed: {} s, "
-			"Uri: '{}', "
-			"Header-Authorization: '{} <redacted>', "
-			"Header-Accept: '{}', "
-			"Response.status_code: {}, "
-			"Response.reason: '{}', "
-			"Response.error.code: {}, "
-			"Response.error.message: '{}', "
-			"Response.raw_header: '{}'"
-			"Response.text: '{}'",
-			Response.elapsed,
-			Uri,
-			AccessToken.Value.substr(0, 6),
-			"application/x-ue-cb",
-			Response.status_code,
-			Response.reason,
-			gsl::narrow<int>(Response.error.code),
-			Response.error.message,
-			Response.raw_header,
-			Response.text);
-	}
-
-	return Result;
-}
-
 std::vector<IoHash>
 CloudCacheSession::Filter(std::string_view Namespace, std::string_view BucketId, const std::vector<IoHash>& ChunkHashes)
 {
@@ -1079,7 +978,7 @@ CloudCacheSession::GetAccessToken(bool RefreshToken)
 CloudCacheResult
 CloudCacheSession::CacheTypeExists(std::string_view Namespace, std::string_view TypeId, const IoHash& Key)
 {
-	ZEN_TRACE_CPU("HordeClient::CacheTypeExists");
+	ZEN_TRACE_CPU("JupiterClient::CacheTypeExists");
 
 	ExtendableStringBuilder<256> Uri;
 	Uri << m_CacheClient->ServiceUrl() << "/api/v1/" << TypeId << "/" << Namespace << "/" << Key.ToHexString();
@@ -1126,7 +1025,7 @@ CloudCacheSession::CacheTypeExists(std::string_view Namespace, std::string_view
 CloudCacheExistsResult
 CloudCacheSession::CacheTypeExists(std::string_view Namespace, std::string_view TypeId, const std::set<IoHash>& Keys)
 {
-	ZEN_TRACE_CPU("HordeClient::CacheTypeExists");
+	ZEN_TRACE_CPU("JupiterClient::CacheTypeExists");
 
 	ExtendableStringBuilder<256> Body;
 	Body << "[";
@@ -1311,7 +1210,7 @@ CloudCacheClient::~CloudCacheClient()
 CloudCacheAccessToken
 CloudCacheClient::AcquireAccessToken()
 {
-	ZEN_TRACE_CPU("HordeClient::AcquireAccessToken");
+	ZEN_TRACE_CPU("JupiterClient::AcquireAccessToken");
 
 	return m_TokenProvider->AcquireAccessToken();
 }