1 files changed, 44 insertions, 16 deletions

diff --git a/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp b/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp
index f8179831c..514484f30 100644
--- a/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp
@@ -223,34 +223,62 @@ public:
 		return AttachmentExistsInCacheResult{Result{.ErrorCode = 0}, std::vector<bool>(RawHashes.size(), false)};
 	}
 
-	virtual LoadAttachmentResult LoadAttachment(const IoHash& RawHash, const AttachmentRange& Range) override
+	virtual LoadAttachmentResult LoadAttachment(const IoHash& RawHash, ESourceMode SourceMode) override
 	{
-		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
-		JupiterResult  GetResult = Session.GetCompressedBlob(m_Namespace, RawHash, m_TempFilePath);
-		AddStats(GetResult);
-
-		LoadAttachmentResult Result{ConvertResult(GetResult), std::move(GetResult.Response)};
-		if (GetResult.ErrorCode)
+		LoadAttachmentResult Result;
+		if (SourceMode != ESourceMode::kCacheOnly)
 		{
-			Result.Reason = fmt::format("Failed fetching oplog attachment from {}/{}/{}. Reason: '{}'",
-										m_JupiterClient->ServiceUrl(),
-										m_Namespace,
-										RawHash,
-										Result.Reason);
+			JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
+			JupiterResult  GetResult = Session.GetCompressedBlob(m_Namespace, RawHash, m_TempFilePath);
+			AddStats(GetResult);
+
+			Result = {ConvertResult(GetResult), std::move(GetResult.Response)};
+			if (GetResult.ErrorCode)
+			{
+				Result.Reason = fmt::format("Failed fetching oplog attachment from {}/{}/{}. Reason: '{}'",
+											m_JupiterClient->ServiceUrl(),
+											m_Namespace,
+											RawHash,
+											Result.Reason);
+			}
 		}
-		if (!Result.ErrorCode && Range)
+		return Result;
+	}
+
+	virtual LoadAttachmentRangesResult LoadAttachmentRanges(const IoHash&								   RawHash,
+															std::span<const std::pair<uint64_t, uint64_t>> Ranges,
+															ESourceMode									   SourceMode) override
+	{
+		LoadAttachmentRangesResult Result;
+		if (SourceMode != ESourceMode::kCacheOnly)
 		{
-			Result.Bytes = IoBuffer(Result.Bytes, Range.Offset, Range.Bytes);
+			JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client(), m_AllowRedirect);
+			JupiterResult  GetResult = Session.GetCompressedBlob(m_Namespace, RawHash, m_TempFilePath);
+			AddStats(GetResult);
+
+			Result = LoadAttachmentRangesResult{ConvertResult(GetResult), std::move(GetResult.Response)};
+			if (GetResult.ErrorCode)
+			{
+				Result.Reason = fmt::format("Failed fetching oplog attachment from {}/{}/{}. Reason: '{}'",
+											m_JupiterClient->ServiceUrl(),
+											m_Namespace,
+											RawHash,
+											Result.Reason);
+			}
+			else
+			{
+				Result.Ranges = std::vector<std::pair<uint64_t, uint64_t>>(Ranges.begin(), Ranges.end());
+			}
 		}
 		return Result;
 	}
 
-	virtual LoadAttachmentsResult LoadAttachments(const std::vector<IoHash>& RawHashes) override
+	virtual LoadAttachmentsResult LoadAttachments(const std::vector<IoHash>& RawHashes, ESourceMode SourceMode) override
 	{
 		LoadAttachmentsResult Result;
 		for (const IoHash& Hash : RawHashes)
 		{
-			LoadAttachmentResult ChunkResult = LoadAttachment(Hash, {});
+			LoadAttachmentResult ChunkResult = LoadAttachment(Hash, SourceMode);
 			if (ChunkResult.ErrorCode)
 			{
 				return LoadAttachmentsResult{ChunkResult};