diff options
| author | Stefan Boberg <[email protected]> | 2021-09-02 13:06:18 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-02 13:06:18 +0200 |
| commit | a57d4a96f8b9323da96d264e9e4cbbab988e1cf3 (patch) | |
| tree | 02da88ceb7b5f42a6ec9b478ed4e61d9f790157d /zenserver | |
| parent | Initial implementation of CbPackage HTTP response writing (diff) | |
| download | zen-a57d4a96f8b9323da96d264e9e4cbbab988e1cf3.tar.xz zen-a57d4a96f8b9323da96d264e9e4cbbab988e1cf3.zip | |
IoHash::HashMemory -> IoHash::HashBuffer for consistency with UE5 code
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/cache/structuredcache.cpp | 4 | ||||
| -rw-r--r-- | zenserver/casstore.cpp | 4 | ||||
| -rw-r--r-- | zenserver/projectstore.cpp | 4 | ||||
| -rw-r--r-- | zenserver/upstream/jupiter.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 1e3eb5dcd..94ca52164 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -391,7 +391,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re if (zen::CompressedBuffer Compressed = zen::CompressedBuffer::FromCompressed(SharedBuffer(UpstreamResult.Payload))) { Payload = UpstreamResult.Payload; - zen::IoHash ChunkHash = zen::IoHash::HashMemory(Payload); + zen::IoHash ChunkHash = zen::IoHash::HashBuffer(Payload); zen::CasStore::InsertResult Result = m_CasStore.InsertChunk(Payload, ChunkHash); m_CidStore.AddCompressedCid(Ref.PayloadId, ChunkHash); @@ -440,7 +440,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re return Request.WriteResponse(zen::HttpResponse::BadRequest, HttpContentType::kText, "Empty payload not permitted"); } - zen::IoHash ChunkHash = zen::IoHash::HashMemory(Body); + zen::IoHash ChunkHash = zen::IoHash::HashBuffer(Body); zen::CompressedBuffer Compressed = zen::CompressedBuffer::FromCompressed(SharedBuffer(Body)); diff --git a/zenserver/casstore.cpp b/zenserver/casstore.cpp index 2560659ec..1d147024a 100644 --- a/zenserver/casstore.cpp +++ b/zenserver/casstore.cpp @@ -84,7 +84,7 @@ HttpCasService::HttpCasService(CasStore& Store) : m_CasStore(Store) case HttpVerb::kPut: { IoBuffer Payload = ServerRequest.ReadPayload(); - IoHash PayloadHash = IoHash::HashMemory(Payload.Data(), Payload.Size()); + IoHash PayloadHash = IoHash::HashBuffer(Payload.Data(), Payload.Size()); // URI hash must match content hash if (PayloadHash != Hash) @@ -121,7 +121,7 @@ HttpCasService::HandleRequest(zen::HttpServerRequest& Request) case HttpVerb::kPost: { IoBuffer Payload = Request.ReadPayload(); - IoHash PayloadHash = IoHash::HashMemory(Payload.Data(), Payload.Size()); + IoHash PayloadHash = IoHash::HashBuffer(Payload.Data(), Payload.Size()); spdlog::debug("CAS POST request for {} ({} bytes)", PayloadHash, Payload.Size()); diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index 1785aad9e..33d008f3e 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -1336,7 +1336,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects) if (std::string_view SaltParam = Params.GetValue("salt"); SaltParam.empty() == false) { const uint32_t Salt = std::stoi(std::string(SaltParam)); - SaltHash = IoHash::HashMemory(&Salt, sizeof Salt); + SaltHash = IoHash::HashBuffer(&Salt, sizeof Salt); IsUsingSalt = true; } @@ -1364,7 +1364,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects) if (IsUsingSalt) { IoHash AttachmentSpec[]{SaltHash, Hash}; - AttachmentId = IoHash::HashMemory(MakeMemoryView(AttachmentSpec)); + AttachmentId = IoHash::HashBuffer(MakeMemoryView(AttachmentSpec)); } else { diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp index 4a879b233..a59b9d317 100644 --- a/zenserver/upstream/jupiter.cpp +++ b/zenserver/upstream/jupiter.cpp @@ -187,7 +187,7 @@ CloudCacheSession::GetCompressedBlob(const IoHash& Key) CloudCacheResult CloudCacheSession::PutDerivedData(std::string_view BucketId, std::string_view Key, IoBuffer DerivedData) { - IoHash Hash = IoHash::HashMemory(DerivedData.Data(), DerivedData.Size()); + IoHash Hash = IoHash::HashBuffer(DerivedData.Data(), DerivedData.Size()); std::string Auth; m_CacheClient->AcquireAccessToken(Auth); @@ -217,7 +217,7 @@ CloudCacheSession::PutDerivedData(std::string_view BucketId, const IoHash& Key, CloudCacheResult CloudCacheSession::PutRef(std::string_view BucketId, const IoHash& Key, IoBuffer Ref) { - IoHash Hash = IoHash::HashMemory(Ref.Data(), Ref.Size()); + IoHash Hash = IoHash::HashBuffer(Ref.Data(), Ref.Size()); std::string Auth; m_CacheClient->AcquireAccessToken(Auth); |