aboutsummaryrefslogtreecommitdiff
path: root/zenserver/upstream/upstreamcache.cpp
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-10-04 10:04:07 +0200
committerDan Engelbrecht <[email protected]>2022-10-04 10:04:07 +0200
commit6045e990c74d1e6f6fc926c1452d7a4da0a47e90 (patch)
treed9a72e90a0a033ff0966854150d1bf4c85cc7deb /zenserver/upstream/upstreamcache.cpp
parentMerge branch 'main' of https://github.com/EpicGames/zen (diff)
downloadzen-6045e990c74d1e6f6fc926c1452d7a4da0a47e90.tar.xz
zen-6045e990c74d1e6f6fc926c1452d7a4da0a47e90.zip
Use bucket/key to get inline value in upstream for chunks without a chunkid
Diffstat (limited to 'zenserver/upstream/upstreamcache.cpp')
-rw-r--r--zenserver/upstream/upstreamcache.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index e8f7450fd..baed1b3b6 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -396,8 +396,11 @@ namespace detail {
if (!Result.Error)
{
std::string_view BlobStoreNamespace = GetActualBlobStoreNamespace(Session, Namespace);
- const CloudCacheResult BlobResult = Session.GetCompressedBlob(BlobStoreNamespace, Request.ChunkId);
- Payload = BlobResult.Response;
+ const CloudCacheResult BlobResult =
+ Request.ChunkId == IoHash::Zero
+ ? Session.GetInlineBlob(BlobStoreNamespace, Request.Key.Bucket, Request.Key.Hash, Request.ChunkId)
+ : Session.GetCompressedBlob(BlobStoreNamespace, Request.ChunkId);
+ Payload = BlobResult.Response;
AppendResult(BlobResult, Result);