aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver
diff options
context:
space:
mode:
Diffstat (limited to 'src/zenserver')
-rw-r--r--src/zenserver/config.cpp2
-rw-r--r--src/zenserver/projectstore/httpprojectstore.cpp4
-rw-r--r--src/zenserver/projectstore/projectstore.cpp72
-rw-r--r--src/zenserver/projectstore/projectstore.h12
-rw-r--r--src/zenserver/projectstore/remoteprojectstore.cpp10
-rw-r--r--src/zenserver/projectstore/remoteprojectstore.h4
-rw-r--r--src/zenserver/projectstore/zenremoteprojectstore.cpp4
-rw-r--r--src/zenserver/upstream/upstreamcache.cpp70
-rw-r--r--src/zenserver/upstream/upstreamcache.h24
-rw-r--r--src/zenserver/upstream/zen.h10
10 files changed, 106 insertions, 106 deletions
diff --git a/src/zenserver/config.cpp b/src/zenserver/config.cpp
index 00fa99110..8aef2f7d3 100644
--- a/src/zenserver/config.cpp
+++ b/src/zenserver/config.cpp
@@ -151,7 +151,7 @@ ParseUpstreamCachePolicy(std::string_view Options)
}
ZenObjectStoreConfig
-ParseBucketConfigs(std::span<std::string> Buckets)
+ParseBucketConfigs(eastl::span<std::string> Buckets)
{
using namespace std::literals;
diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/projectstore/httpprojectstore.cpp
index 80e09939a..f80ead49e 100644
--- a/src/zenserver/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/projectstore/httpprojectstore.cpp
@@ -994,7 +994,7 @@ HttpProjectService::HandleOplogOpPrepRequest(HttpRouterRequest& Req)
ChunkList.push_back(Entry.AsHash());
}
- NeedList = FoundLog->CheckPendingChunkReferences(std::span(begin(ChunkList), end(ChunkList)), std::chrono::minutes(2));
+ NeedList = FoundLog->CheckPendingChunkReferences(eastl::span(begin(ChunkList), end(ChunkList)), std::chrono::minutes(2));
}
CbObjectWriter Cbo(1 + 1 + 5 + NeedList.size() * (1 + sizeof(IoHash::Hash)) + 1);
@@ -1173,7 +1173,7 @@ HttpProjectService::HandleOplogOpNewRequest(HttpRouterRequest& Req)
// Once we stored the op, we no longer need to retain any chunks this op references
if (!ReferencedChunks.empty())
{
- FoundLog->RemovePendingChunkReferences(std::span(begin(ReferencedChunks), end(ReferencedChunks)));
+ FoundLog->RemovePendingChunkReferences(eastl::span(begin(ReferencedChunks), end(ReferencedChunks)));
}
m_ProjectStats.OpWriteCount++;
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 0c0c942af..42158b729 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -572,7 +572,7 @@ struct ProjectStore::OplogStorage : public RefCounted
}
}
- uint64_t GetEffectiveBlobsSize(std::span<const OplogEntryAddress> Addresses) const
+ uint64_t GetEffectiveBlobsSize(eastl::span<const OplogEntryAddress> Addresses) const
{
uint64_t EffectiveSize = 0;
for (const OplogEntryAddress& Address : Addresses)
@@ -583,7 +583,7 @@ struct ProjectStore::OplogStorage : public RefCounted
}
void Compact(
- std::span<const uint32_t> LSNs,
+ eastl::span<const uint32_t> LSNs,
std::function<void(const Oid& OpKeyHash, uint32_t OldLSN, uint32_t NewLSN, const OplogEntryAddress& NewAddress)>&& Callback,
bool RetainLSNs,
bool DryRun)
@@ -901,7 +901,7 @@ struct ProjectStore::OplogStorage : public RefCounted
InvalidEntries);
}
- void ReplayLogEntries(const std::span<OplogEntryAddress> Entries, std::function<void(CbObjectView)>&& Handler)
+ void ReplayLogEntries(const eastl::span<OplogEntryAddress> Entries, std::function<void(CbObjectView)>&& Handler)
{
ZEN_MEMSCOPE(GetProjectstoreTag());
ZEN_TRACE_CPU("Store::OplogStorage::ReplayLogEntries");
@@ -993,7 +993,7 @@ struct ProjectStore::OplogStorage : public RefCounted
return Entry;
}
- eastl::vector<OplogEntry> AppendOps(std::span<const AppendOpData> Ops)
+ eastl::vector<OplogEntry> AppendOps(eastl::span<const AppendOpData> Ops)
{
ZEN_MEMSCOPE(GetProjectstoreTag());
ZEN_TRACE_CPU("Store::OplogStorage::AppendOps");
@@ -2087,7 +2087,7 @@ ProjectStore::Oplog::GetChunkByRawHash(const IoHash& RawHash)
}
bool
-ProjectStore::Oplog::IterateChunks(std::span<IoHash> RawHashes,
+ProjectStore::Oplog::IterateChunks(eastl::span<IoHash> RawHashes,
bool IncludeModTag,
const std::function<bool(size_t Index, const IoBuffer& Payload, uint64_t ModTag)>& AsyncCallback,
WorkerThreadPool* OptionalWorkerPool,
@@ -2103,7 +2103,7 @@ ProjectStore::Oplog::IterateChunks(std::span<IoHash> RawHashes,
}
bool
-ProjectStore::Oplog::IterateChunks(std::span<Oid> ChunkIds,
+ProjectStore::Oplog::IterateChunks(eastl::span<Oid> ChunkIds,
bool IncludeModTag,
const std::function<bool(size_t Index, const IoBuffer& Payload, uint64_t ModTag)>& AsyncCallback,
WorkerThreadPool* OptionalWorkerPool,
@@ -2368,13 +2368,13 @@ ProjectStore::Oplog::IterateOplog(std::function<void(CbObjectView)>&& Handler, c
}
template<typename ContainerElement>
-std::span<ContainerElement>
+eastl::span<ContainerElement>
CreateSpanFromPaging(eastl::vector<ContainerElement>& Container, const ProjectStore::Oplog::Paging& Paging)
{
- std::span<ContainerElement> Span(Container);
- int32_t Size = int32_t(Container.size());
- int32_t Start = std::clamp(Paging.Start, 0, Size);
- int32_t End = Paging.Count < 0 ? Size : (Start + std::min<int32_t>(Paging.Count, Size - Start));
+ eastl::span<ContainerElement> Span(Container);
+ int32_t Size = int32_t(Container.size());
+ int32_t Start = std::clamp(Paging.Start, 0, Size);
+ int32_t End = Paging.Count < 0 ? Size : (Start + std::min<int32_t>(Paging.Count, Size - Start));
return Span.subspan(Start, End - Start);
}
@@ -2403,7 +2403,7 @@ ProjectStore::Oplog::IterateOplogLocked(std::function<void(CbObjectView)>&& Hand
return Lhs.Offset < Rhs.Offset;
});
- std::span<OplogEntryAddress> EntrySpan = CreateSpanFromPaging(Entries, EntryPaging);
+ eastl::span<OplogEntryAddress> EntrySpan = CreateSpanFromPaging(Entries, EntryPaging);
m_Storage->ReplayLogEntries(EntrySpan, [&](CbObjectView Op) { Handler(Op); });
}
@@ -2428,7 +2428,7 @@ ProjectStore::Oplog::GetAttachmentsLocked(eastl::vector<IoHash>& OutAttachments,
if (GetAttachmentsFromMetaData<Oid, IoHash>(
MetadataPayload,
OplogMetaDataExpectedMagic,
- [&](std::span<const Oid> Keys, std::span<const uint32_t> AttachmentCounts, std::span<const IoHash> Attachments) {
+ [&](eastl::span<const Oid> Keys, eastl::span<const uint32_t> AttachmentCounts, eastl::span<const IoHash> Attachments) {
ZEN_UNUSED(Keys);
ZEN_UNUSED(AttachmentCounts);
OutAttachments.insert(OutAttachments.end(), Attachments.begin(), Attachments.end());
@@ -2463,7 +2463,7 @@ ProjectStore::Oplog::GetAttachmentsLocked(eastl::vector<IoHash>& OutAttachments,
IoBuffer MetaPayload = BuildReferenceMetaData<Oid>(OplogMetaDataExpectedMagic,
Keys,
AttachmentCounts,
- std::span<const IoHash>(FirstAttachment, AttachmentCount))
+ eastl::span<const IoHash>(FirstAttachment, AttachmentCount))
.Flatten()
.AsIoBuffer();
@@ -2559,8 +2559,8 @@ ProjectStore::Oplog::IterateOplogWithKey(std::function<void(uint32_t, const Oid&
}
}
- std::span<OplogEntryAddress> EntrySpan = CreateSpanFromPaging(SortedEntries, EntryPaging);
- size_t EntryIndex = EntrySpan.empty() ? 0 : static_cast<size_t>(&EntrySpan.front() - &SortedEntries.front());
+ eastl::span<OplogEntryAddress> EntrySpan = CreateSpanFromPaging(SortedEntries, EntryPaging);
+ size_t EntryIndex = EntrySpan.empty() ? 0 : static_cast<size_t>(&EntrySpan.front() - &SortedEntries.front());
m_Storage->ReplayLogEntries(EntrySpan, [&](CbObjectView Op) {
Handler(SortedLSNs[EntryIndex], SortedKeys[EntryIndex], Op);
EntryIndex++;
@@ -2630,7 +2630,7 @@ ProjectStore::Oplog::AddChunkMappings(const std::unordered_map<Oid, IoHash, Oid:
}
void
-ProjectStore::Oplog::CaptureAddedAttachments(std::span<const IoHash> AttachmentHashes)
+ProjectStore::Oplog::CaptureAddedAttachments(eastl::span<const IoHash> AttachmentHashes)
{
ZEN_MEMSCOPE(GetProjectstoreTag());
@@ -2717,7 +2717,7 @@ ProjectStore::Oplog::GetCapturedAttachmentsLocked()
}
eastl::vector<IoHash>
-ProjectStore::Oplog::CheckPendingChunkReferences(std::span<const IoHash> ChunkHashes, const GcClock::Duration& RetainTime)
+ProjectStore::Oplog::CheckPendingChunkReferences(eastl::span<const IoHash> ChunkHashes, const GcClock::Duration& RetainTime)
{
ZEN_MEMSCOPE(GetProjectstoreTag());
@@ -2749,7 +2749,7 @@ ProjectStore::Oplog::CheckPendingChunkReferences(std::span<const IoHash> ChunkHa
}
void
-ProjectStore::Oplog::RemovePendingChunkReferences(std::span<const IoHash> ChunkHashes)
+ProjectStore::Oplog::RemovePendingChunkReferences(eastl::span<const IoHash> ChunkHashes)
{
ZEN_MEMSCOPE(GetProjectstoreTag());
@@ -3060,7 +3060,7 @@ ProjectStore::Oplog::AppendNewOplogEntry(CbObjectView Core)
}
eastl::vector<uint32_t>
-ProjectStore::Oplog::AppendNewOplogEntries(std::span<CbObjectView> Cores)
+ProjectStore::Oplog::AppendNewOplogEntries(eastl::span<CbObjectView> Cores)
{
ZEN_MEMSCOPE(GetProjectstoreTag());
ZEN_TRACE_CPU("Store::Oplog::AppendNewOplogEntries");
@@ -5269,7 +5269,7 @@ ProjectStore::WriteOplog(const std::string_view ProjectId, const std::string_vie
auto OnChunkedAttachment = [](const ChunkedInfo&) {};
- auto OnReferencedAttachments = [&Oplog](std::span<IoHash> RawHashes) { Oplog->CaptureAddedAttachments(RawHashes); };
+ auto OnReferencedAttachments = [&Oplog](eastl::span<IoHash> RawHashes) { Oplog->CaptureAddedAttachments(RawHashes); };
// Make sure we retain any attachments we download before writing the oplog
Oplog->EnableUpdateCapture();
auto _ = MakeGuard([&Oplog]() { Oplog->DisableUpdateCapture(); });
@@ -5527,7 +5527,7 @@ ProjectStore::Rpc(HttpServerRequest& HttpReq,
return true;
}
- std::span<const CbAttachment> Attachments = Package.GetAttachments();
+ eastl::span<const CbAttachment> Attachments = Package.GetAttachments();
if (!Attachments.empty())
{
eastl::vector<IoBuffer> WriteAttachmentBuffers;
@@ -6268,7 +6268,7 @@ public:
FilterReferences(Ctx, fmt::format("projectstore [LOCKSTATE] '{}'", "projectstore"), m_References);
}
- virtual std::span<IoHash> GetUnusedReferences(GcCtx& Ctx, std::span<IoHash> IoCids) override
+ virtual eastl::span<IoHash> GetUnusedReferences(GcCtx& Ctx, eastl::span<IoHash> IoCids) override
{
ZEN_TRACE_CPU("Store::GetUnusedReferences");
@@ -6290,8 +6290,8 @@ public:
NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
});
- std::span<IoHash> UnusedReferences = KeepUnusedReferences(m_References, IoCids);
- UsedCount = IoCids.size() - UnusedReferences.size();
+ eastl::span<IoHash> UnusedReferences = KeepUnusedReferences(m_References, IoCids);
+ UsedCount = IoCids.size() - UnusedReferences.size();
return UnusedReferences;
}
@@ -6452,7 +6452,7 @@ public:
FilterReferences(Ctx, fmt::format("projectstore [LOCKSTATE] '{}'", m_OplogBasePath), m_AddedReferences);
}
- virtual std::span<IoHash> GetUnusedReferences(GcCtx& Ctx, std::span<IoHash> IoCids) override
+ virtual eastl::span<IoHash> GetUnusedReferences(GcCtx& Ctx, eastl::span<IoHash> IoCids) override
{
ZEN_TRACE_CPU("Store::Oplog::GetUnusedReferences");
@@ -6476,9 +6476,9 @@ public:
m_OplogId);
});
- std::span<IoHash> UnusedReferences = KeepUnusedReferences(m_References, IoCids);
- UnusedReferences = KeepUnusedReferences(m_AddedReferences, UnusedReferences);
- UsedCount = IoCids.size() - UnusedReferences.size();
+ eastl::span<IoHash> UnusedReferences = KeepUnusedReferences(m_References, IoCids);
+ UnusedReferences = KeepUnusedReferences(m_AddedReferences, UnusedReferences);
+ UsedCount = IoCids.size() - UnusedReferences.size();
return UnusedReferences;
}
@@ -6736,7 +6736,7 @@ namespace testutils {
return OidStringBuilder.ToString();
}
- CbPackage CreateBulkDataOplogPackage(const Oid& Id, const std::span<const std::pair<Oid, CompressedBuffer>>& Attachments)
+ CbPackage CreateBulkDataOplogPackage(const Oid& Id, const eastl::span<const std::pair<Oid, CompressedBuffer>>& Attachments)
{
CbPackage Package;
CbObjectWriter Object;
@@ -6762,9 +6762,9 @@ namespace testutils {
return Package;
};
- CbPackage CreateFilesOplogPackage(const Oid& Id,
- const std::filesystem::path ProjectRootDir,
- const std::span<const std::pair<Oid, std::filesystem::path>>& Attachments)
+ CbPackage CreateFilesOplogPackage(const Oid& Id,
+ const std::filesystem::path ProjectRootDir,
+ const eastl::span<const std::pair<Oid, std::filesystem::path>>& Attachments)
{
CbPackage Package;
CbObjectWriter Object;
@@ -6789,9 +6789,9 @@ namespace testutils {
};
eastl::vector<std::pair<Oid, CompressedBuffer>> CreateAttachments(
- const std::span<const size_t>& Sizes,
- OodleCompressionLevel CompressionLevel = OodleCompressionLevel::VeryFast,
- uint64_t BlockSize = 0)
+ const eastl::span<const size_t>& Sizes,
+ OodleCompressionLevel CompressionLevel = OodleCompressionLevel::VeryFast,
+ uint64_t BlockSize = 0)
{
eastl::vector<std::pair<Oid, CompressedBuffer>> Result;
Result.reserve(Sizes.size());
diff --git a/src/zenserver/projectstore/projectstore.h b/src/zenserver/projectstore/projectstore.h
index b502bd6dc..ccba87d04 100644
--- a/src/zenserver/projectstore/projectstore.h
+++ b/src/zenserver/projectstore/projectstore.h
@@ -122,12 +122,12 @@ public:
IoBuffer FindChunk(const Oid& ChunkId, uint64_t* OptOutModificationTag);
IoBuffer GetChunkByRawHash(const IoHash& RawHash);
- bool IterateChunks(std::span<IoHash> RawHashes,
+ bool IterateChunks(eastl::span<IoHash> RawHashes,
bool IncludeModTag,
const std::function<bool(size_t Index, const IoBuffer& Payload, uint64_t ModTag)>& AsyncCallback,
WorkerThreadPool* OptionalWorkerPool,
uint64_t LargeSizeLimit);
- bool IterateChunks(std::span<Oid> ChunkIds,
+ bool IterateChunks(eastl::span<Oid> ChunkIds,
bool IncludeModTag,
const std::function<bool(size_t Index, const IoBuffer& Payload, uint64_t ModTag)>& AsyncCallback,
WorkerThreadPool* OptionalWorkerPool,
@@ -141,7 +141,7 @@ public:
uint32_t AppendNewOplogEntry(CbPackage Op);
uint32_t AppendNewOplogEntry(CbObjectView Core);
- eastl::vector<uint32_t> AppendNewOplogEntries(std::span<CbObjectView> Cores);
+ eastl::vector<uint32_t> AppendNewOplogEntries(eastl::span<CbObjectView> Cores);
enum UpdateType
{
@@ -173,10 +173,10 @@ public:
void EnableUpdateCapture();
void DisableUpdateCapture();
- void CaptureAddedAttachments(std::span<const IoHash> AttachmentHashes);
+ void CaptureAddedAttachments(eastl::span<const IoHash> AttachmentHashes);
eastl::vector<IoHash> GetCapturedAttachmentsLocked();
- eastl::vector<IoHash> CheckPendingChunkReferences(std::span<const IoHash> ChunkHashes, const GcClock::Duration& RetainTime);
- void RemovePendingChunkReferences(std::span<const IoHash> ChunkHashes);
+ eastl::vector<IoHash> CheckPendingChunkReferences(eastl::span<const IoHash> ChunkHashes, const GcClock::Duration& RetainTime);
+ void RemovePendingChunkReferences(eastl::span<const IoHash> ChunkHashes);
eastl::vector<IoHash> GetPendingChunkReferencesLocked();
RwLock::SharedLockScope GetGcReferencerLock() { return RwLock::SharedLockScope(m_OplogLock); }
diff --git a/src/zenserver/projectstore/remoteprojectstore.cpp b/src/zenserver/projectstore/remoteprojectstore.cpp
index 41f20d760..8c657ab5b 100644
--- a/src/zenserver/projectstore/remoteprojectstore.cpp
+++ b/src/zenserver/projectstore/remoteprojectstore.cpp
@@ -1104,7 +1104,7 @@ GetBlockHashesFromOplog(CbObjectView ContainerObject)
}
eastl::vector<ThinChunkBlockDescription>
-GetBlocksFromOplog(CbObjectView ContainerObject, std::span<const IoHash> IncludeBlockHashes)
+GetBlocksFromOplog(CbObjectView ContainerObject, eastl::span<const IoHash> IncludeBlockHashes)
{
using namespace std::literals;
eastl::vector<ThinChunkBlockDescription> Result;
@@ -1650,7 +1650,7 @@ BuildContainer(CidStore& ChunkStore,
CompositeBuffer Decompressed = Compressed.DecompressToComposite();
if (Decompressed)
{
- std::span<const SharedBuffer> Segments = Decompressed.GetSegments();
+ eastl::span<const SharedBuffer> Segments = Decompressed.GetSegments();
if (Segments.size() == 1)
{
IoBuffer DecompressedData = Segments[0].AsIoBuffer();
@@ -2634,7 +2634,7 @@ SaveOplog(CidStore& ChunkStore,
RemoteProjectStore::Result
ParseOplogContainer(const CbObject& ContainerObject,
- const std::function<void(std::span<IoHash> RawHashes)>& OnReferencedAttachments,
+ const std::function<void(eastl::span<IoHash> RawHashes)>& OnReferencedAttachments,
const std::function<bool(const IoHash& RawHash)>& HasAttachment,
const std::function<void(const IoHash& BlockHash, eastl::vector<IoHash>&& Chunks)>& OnNeedBlock,
const std::function<void(const IoHash& RawHash)>& OnNeedAttachment,
@@ -2778,7 +2778,7 @@ ParseOplogContainer(const CbObject& ContainerObject,
RemoteProjectStore::Result
SaveOplogContainer(ProjectStore::Oplog& Oplog,
const CbObject& ContainerObject,
- const std::function<void(std::span<IoHash> RawHashes)>& OnReferencedAttachments,
+ const std::function<void(eastl::span<IoHash> RawHashes)>& OnReferencedAttachments,
const std::function<bool(const IoHash& RawHash)>& HasAttachment,
const std::function<void(const IoHash& BlockHash, eastl::vector<IoHash>&& Chunks)>& OnNeedBlock,
const std::function<void(const IoHash& RawHash)>& OnNeedAttachment,
@@ -2975,7 +2975,7 @@ LoadOplog(CidStore& ChunkStore,
}
};
- auto OnReferencedAttachments = [&Oplog](std::span<IoHash> RawHashes) { Oplog.CaptureAddedAttachments(RawHashes); };
+ auto OnReferencedAttachments = [&Oplog](eastl::span<IoHash> RawHashes) { Oplog.CaptureAddedAttachments(RawHashes); };
// Make sure we retain any attachments we download before writing the oplog
Oplog.EnableUpdateCapture();
diff --git a/src/zenserver/projectstore/remoteprojectstore.h b/src/zenserver/projectstore/remoteprojectstore.h
index 26788179d..582194022 100644
--- a/src/zenserver/projectstore/remoteprojectstore.h
+++ b/src/zenserver/projectstore/remoteprojectstore.h
@@ -140,7 +140,7 @@ class JobContext;
RemoteProjectStore::Result SaveOplogContainer(
ProjectStore::Oplog& Oplog,
const CbObject& ContainerObject,
- const std::function<void(std::span<IoHash> RawHashes)>& OnReferencedAttachments,
+ const std::function<void(eastl::span<IoHash> RawHashes)>& OnReferencedAttachments,
const std::function<bool(const IoHash& RawHash)>& HasAttachment,
const std::function<void(const IoHash& BlockHash, eastl::vector<IoHash>&& Chunks)>& OnNeedBlock,
const std::function<void(const IoHash& RawHash)>& OnNeedAttachment,
@@ -168,6 +168,6 @@ RemoteProjectStore::Result LoadOplog(CidStore& ChunkStore,
JobContext* OptionalContext);
eastl::vector<IoHash> GetBlockHashesFromOplog(CbObjectView ContainerObject);
-eastl::vector<ThinChunkBlockDescription> GetBlocksFromOplog(CbObjectView ContainerObject, std::span<const IoHash> IncludeBlockHashes);
+eastl::vector<ThinChunkBlockDescription> GetBlocksFromOplog(CbObjectView ContainerObject, eastl::span<const IoHash> IncludeBlockHashes);
} // namespace zen
diff --git a/src/zenserver/projectstore/zenremoteprojectstore.cpp b/src/zenserver/projectstore/zenremoteprojectstore.cpp
index 0f6be6d6a..43981004f 100644
--- a/src/zenserver/projectstore/zenremoteprojectstore.cpp
+++ b/src/zenserver/projectstore/zenremoteprojectstore.cpp
@@ -191,8 +191,8 @@ public:
}
else
{
- CbPackage Package = Response.AsPackage();
- std::span<const CbAttachment> Attachments = Package.GetAttachments();
+ CbPackage Package = Response.AsPackage();
+ eastl::span<const CbAttachment> Attachments = Package.GetAttachments();
Result.Chunks.reserve(Attachments.size());
for (const CbAttachment& Attachment : Attachments)
{
diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp
index 5ddc141d4..a54e77103 100644
--- a/src/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/upstream/upstreamcache.cpp
@@ -295,9 +295,9 @@ namespace detail {
}
}
- virtual GetUpstreamCacheResult GetCacheRecords(std::string_view Namespace,
- std::span<CacheKeyRequest*> Requests,
- OnCacheRecordGetComplete&& OnComplete) override
+ virtual GetUpstreamCacheResult GetCacheRecords(std::string_view Namespace,
+ eastl::span<CacheKeyRequest*> Requests,
+ OnCacheRecordGetComplete&& OnComplete) override
{
ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheRecords");
@@ -392,9 +392,9 @@ namespace detail {
}
}
- virtual GetUpstreamCacheResult GetCacheChunks(std::string_view Namespace,
- std::span<CacheChunkRequest*> CacheChunkRequests,
- OnCacheChunksGetComplete&& OnComplete) override final
+ virtual GetUpstreamCacheResult GetCacheChunks(std::string_view Namespace,
+ eastl::span<CacheChunkRequest*> CacheChunkRequests,
+ OnCacheChunksGetComplete&& OnComplete) override final
{
ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheChunks");
@@ -447,9 +447,9 @@ namespace detail {
return Result;
}
- virtual GetUpstreamCacheResult GetCacheValues(std::string_view Namespace,
- std::span<CacheValueRequest*> CacheValueRequests,
- OnCacheValueGetComplete&& OnComplete) override final
+ virtual GetUpstreamCacheResult GetCacheValues(std::string_view Namespace,
+ eastl::span<CacheValueRequest*> CacheValueRequests,
+ OnCacheValueGetComplete&& OnComplete) override final
{
ZEN_TRACE_CPU("Upstream::Jupiter::GetCacheValues");
@@ -522,9 +522,9 @@ namespace detail {
return Result;
}
- virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord& CacheRecord,
- IoBuffer RecordValue,
- std::span<IoBuffer const> Values) override
+ virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord& CacheRecord,
+ IoBuffer RecordValue,
+ eastl::span<IoBuffer const> Values) override
{
ZEN_TRACE_CPU("Upstream::Jupiter::PutCacheRecord");
@@ -646,7 +646,7 @@ namespace detail {
double TotalElapsedSeconds = 0.0;
std::string_view BlobStoreNamespace = GetActualBlobStoreNamespace(Namespace);
- const auto PutBlobs = [&](std::span<IoHash> ValueContentIds, std::string& OutReason) -> bool {
+ const auto PutBlobs = [&](eastl::span<IoHash> ValueContentIds, std::string& OutReason) -> bool {
for (const IoHash& ValueContentId : ValueContentIds)
{
IoBuffer BlobBuffer;
@@ -865,9 +865,9 @@ namespace detail {
}
}
- virtual GetUpstreamCacheResult GetCacheRecords(std::string_view Namespace,
- std::span<CacheKeyRequest*> Requests,
- OnCacheRecordGetComplete&& OnComplete) override
+ virtual GetUpstreamCacheResult GetCacheRecords(std::string_view Namespace,
+ eastl::span<CacheKeyRequest*> Requests,
+ OnCacheRecordGetComplete&& OnComplete) override
{
ZEN_TRACE_CPU("Upstream::Zen::GetCacheRecords");
ZEN_ASSERT(Requests.size() > 0);
@@ -988,9 +988,9 @@ namespace detail {
}
}
- virtual GetUpstreamCacheResult GetCacheValues(std::string_view Namespace,
- std::span<CacheValueRequest*> CacheValueRequests,
- OnCacheValueGetComplete&& OnComplete) override final
+ virtual GetUpstreamCacheResult GetCacheValues(std::string_view Namespace,
+ eastl::span<CacheValueRequest*> CacheValueRequests,
+ OnCacheValueGetComplete&& OnComplete) override final
{
ZEN_TRACE_CPU("Upstream::Zen::GetCacheValues");
ZEN_ASSERT(!CacheValueRequests.empty());
@@ -1108,9 +1108,9 @@ namespace detail {
return {.Error{.ErrorCode = Result.ErrorCode, .Reason = std::move(Result.Reason)}};
}
- virtual GetUpstreamCacheResult GetCacheChunks(std::string_view Namespace,
- std::span<CacheChunkRequest*> CacheChunkRequests,
- OnCacheChunksGetComplete&& OnComplete) override final
+ virtual GetUpstreamCacheResult GetCacheChunks(std::string_view Namespace,
+ eastl::span<CacheChunkRequest*> CacheChunkRequests,
+ OnCacheChunksGetComplete&& OnComplete) override final
{
ZEN_TRACE_CPU("Upstream::Zen::GetCacheChunks");
ZEN_ASSERT(!CacheChunkRequests.empty());
@@ -1244,9 +1244,9 @@ namespace detail {
return {.Error{.ErrorCode = Result.ErrorCode, .Reason = std::move(Result.Reason)}};
}
- virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord& CacheRecord,
- IoBuffer RecordValue,
- std::span<IoBuffer const> Values) override
+ virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord& CacheRecord,
+ IoBuffer RecordValue,
+ eastl::span<IoBuffer const> Values) override
{
ZEN_TRACE_CPU("Upstream::Zen::PutCacheRecord");
@@ -1586,9 +1586,9 @@ public:
return {};
}
- virtual void GetCacheRecords(std::string_view Namespace,
- std::span<CacheKeyRequest*> Requests,
- OnCacheRecordGetComplete&& OnComplete) override final
+ virtual void GetCacheRecords(std::string_view Namespace,
+ eastl::span<CacheKeyRequest*> Requests,
+ OnCacheRecordGetComplete&& OnComplete) override final
{
ZEN_TRACE_CPU("Upstream::GetCacheRecords");
@@ -1654,9 +1654,9 @@ public:
}
}
- virtual void GetCacheChunks(std::string_view Namespace,
- std::span<CacheChunkRequest*> CacheChunkRequests,
- OnCacheChunksGetComplete&& OnComplete) override final
+ virtual void GetCacheChunks(std::string_view Namespace,
+ eastl::span<CacheChunkRequest*> CacheChunkRequests,
+ OnCacheChunksGetComplete&& OnComplete) override final
{
ZEN_TRACE_CPU("Upstream::GetCacheChunks");
@@ -1767,9 +1767,9 @@ public:
return {};
}
- virtual void GetCacheValues(std::string_view Namespace,
- std::span<CacheValueRequest*> CacheValueRequests,
- OnCacheValueGetComplete&& OnComplete) override final
+ virtual void GetCacheValues(std::string_view Namespace,
+ eastl::span<CacheValueRequest*> CacheValueRequests,
+ OnCacheValueGetComplete&& OnComplete) override final
{
ZEN_TRACE_CPU("Upstream::GetCacheValues");
@@ -1945,7 +1945,7 @@ private:
PutUpstreamCacheResult Result;
{
metrics::OperationTiming::Scope Scope(Stats.CachePutRequestTiming);
- Result = Endpoint->PutCacheRecord(CacheRecord, CacheValue.Value, std::span(Payloads));
+ Result = Endpoint->PutCacheRecord(CacheRecord, CacheValue.Value, eastl::span(Payloads));
}
Stats.CachePutTotalBytes.Increment(Result.Bytes);
diff --git a/src/zenserver/upstream/upstreamcache.h b/src/zenserver/upstream/upstreamcache.h
index 219f2474e..16f921885 100644
--- a/src/zenserver/upstream/upstreamcache.h
+++ b/src/zenserver/upstream/upstreamcache.h
@@ -107,22 +107,22 @@ public:
virtual UpstreamEndpointStatus GetStatus() = 0;
virtual GetUpstreamCacheSingleResult GetCacheRecord(std::string_view Namespace, const CacheKey& CacheKey, ZenContentType Type) = 0;
- virtual GetUpstreamCacheResult GetCacheRecords(std::string_view Namespace,
- std::span<CacheKeyRequest*> Requests,
- OnCacheRecordGetComplete&& OnComplete) = 0;
+ virtual GetUpstreamCacheResult GetCacheRecords(std::string_view Namespace,
+ eastl::span<CacheKeyRequest*> Requests,
+ OnCacheRecordGetComplete&& OnComplete) = 0;
- virtual GetUpstreamCacheResult GetCacheValues(std::string_view Namespace,
- std::span<CacheValueRequest*> CacheValueRequests,
- OnCacheValueGetComplete&& OnComplete) = 0;
+ virtual GetUpstreamCacheResult GetCacheValues(std::string_view Namespace,
+ eastl::span<CacheValueRequest*> CacheValueRequests,
+ OnCacheValueGetComplete&& OnComplete) = 0;
virtual GetUpstreamCacheSingleResult GetCacheChunk(std::string_view Namespace, const CacheKey& CacheKey, const IoHash& PayloadId) = 0;
- virtual GetUpstreamCacheResult GetCacheChunks(std::string_view Namespace,
- std::span<CacheChunkRequest*> CacheChunkRequests,
- OnCacheChunksGetComplete&& OnComplete) = 0;
+ virtual GetUpstreamCacheResult GetCacheChunks(std::string_view Namespace,
+ eastl::span<CacheChunkRequest*> CacheChunkRequests,
+ OnCacheChunksGetComplete&& OnComplete) = 0;
- virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord& CacheRecord,
- IoBuffer RecordValue,
- std::span<IoBuffer const> Payloads) = 0;
+ virtual PutUpstreamCacheResult PutCacheRecord(const UpstreamCacheRecord& CacheRecord,
+ IoBuffer RecordValue,
+ eastl::span<IoBuffer const> Payloads) = 0;
virtual UpstreamEndpointStats& Stats() = 0;
diff --git a/src/zenserver/upstream/zen.h b/src/zenserver/upstream/zen.h
index 78b6bc589..2ef5dd660 100644
--- a/src/zenserver/upstream/zen.h
+++ b/src/zenserver/upstream/zen.h
@@ -45,11 +45,11 @@ struct ZenCacheResult
struct ZenStructuredCacheClientOptions
{
- std::string_view Name;
- std::string_view Url;
- std::span<std::string const> Urls;
- std::chrono::milliseconds ConnectTimeout{};
- std::chrono::milliseconds Timeout{};
+ std::string_view Name;
+ std::string_view Url;
+ eastl::span<std::string const> Urls;
+ std::chrono::milliseconds ConnectTimeout{};
+ std::chrono::milliseconds Timeout{};
};
/** Zen Structured Cache session
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 13:03:26 +0000