diff options
| author | Dan Engelbrecht <[email protected]> | 2022-08-31 09:57:43 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-08-31 00:57:43 -0700 |
| commit | 1ea0f4d70f9097fd6d8a541274815d3797bd8ad6 (patch) | |
| tree | 46ce5cba07471f0d7923850d4e736a4c0db58036 /zenserver/upstream/jupiter.cpp | |
| parent | update changelog with changes since 0.1.3 (#151) (diff) | |
| download | zen-1ea0f4d70f9097fd6d8a541274815d3797bd8ad6.tar.xz zen-1ea0f4d70f9097fd6d8a541274815d3797bd8ad6.zip | |
remove legacy derived data interface for Jupiter (#152)
* remove legacy derived data interface for Jupiter
Diffstat (limited to 'zenserver/upstream/jupiter.cpp')
| -rw-r--r-- | zenserver/upstream/jupiter.cpp | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp index ddc6c49d2..65fa1da92 100644 --- a/zenserver/upstream/jupiter.cpp +++ b/zenserver/upstream/jupiter.cpp @@ -83,44 +83,6 @@ CloudCacheSession::Authenticate() } CloudCacheResult -CloudCacheSession::GetDerivedData(std::string_view Namespace, std::string_view BucketId, std::string_view Key) -{ - ZEN_TRACE_CPU("HordeClient::GetDerivedData"); - - ExtendableStringBuilder<256> Uri; - Uri << m_CacheClient->ServiceUrl() << "/api/v1/c/ddc/" << Namespace << "/" << BucketId << "/" << Key; - - cpr::Session& Session = GetSession(); - const CloudCacheAccessToken& AccessToken = GetAccessToken(); - - Session.SetOption(cpr::Url{Uri.c_str()}); - Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, {"Accept", "application/octet-stream"}}); - - cpr::Response Response = Session.Get(); - ZEN_DEBUG("GET {}", 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")}; - } - - const bool Success = Response.status_code == 200; - const IoBuffer Buffer = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer(); - - return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success}; -} - -CloudCacheResult -CloudCacheSession::GetDerivedData(std::string_view Namespace, std::string_view BucketId, const IoHash& Key) -{ - return GetDerivedData(Namespace, BucketId, Key.ToHexString()); -} - -CloudCacheResult CloudCacheSession::GetRef(std::string_view Namespace, std::string_view BucketId, const IoHash& Key, ZenContentType RefType) { const std::string ContentType = RefType == ZenContentType::kCbObject ? "application/x-ue-cb" : "application/octet-stream"; @@ -251,48 +213,6 @@ CloudCacheSession::GetObject(std::string_view Namespace, const IoHash& Key) return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success}; } -CloudCacheResult -CloudCacheSession::PutDerivedData(std::string_view Namespace, std::string_view BucketId, std::string_view Key, IoBuffer DerivedData) -{ - ZEN_TRACE_CPU("HordeClient::PutDerivedData"); - - IoHash Hash = IoHash::HashBuffer(DerivedData.Data(), DerivedData.Size()); - - ExtendableStringBuilder<256> Uri; - Uri << m_CacheClient->ServiceUrl() << "/api/v1/c/ddc/" << Namespace << "/" << BucketId << "/" << Key; - - cpr::Session& Session = GetSession(); - const CloudCacheAccessToken& AccessToken = GetAccessToken(); - - Session.SetOption(cpr::Url{Uri.c_str()}); - Session.SetOption(cpr::Header{{"Authorization", AccessToken.Value}, - {"X-Jupiter-IoHash", Hash.ToHexString()}, - {"Content-Type", "application/octet-stream"}}); - Session.SetBody(cpr::Body{(const char*)DerivedData.Data(), DerivedData.Size()}); - - cpr::Response Response = Session.Put(); - ZEN_DEBUG("PUT {}", 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 {.Bytes = Response.uploaded_bytes, - .ElapsedSeconds = Response.elapsed, - .Success = (Response.status_code == 200 || Response.status_code == 201)}; -} - -CloudCacheResult -CloudCacheSession::PutDerivedData(std::string_view Namespace, std::string_view BucketId, const IoHash& Key, IoBuffer DerivedData) -{ - return PutDerivedData(Namespace, BucketId, Key.ToHexString(), DerivedData); -} - PutRefResult CloudCacheSession::PutRef(std::string_view Namespace, std::string_view BucketId, const IoHash& Key, IoBuffer Ref, ZenContentType RefType) { |