diff options
| author | Dan Engelbrecht <[email protected]> | 2024-04-09 13:22:00 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2024-04-09 13:22:00 +0200 |
| commit | 6ab371e8799e56a8bade2cc5f1f5cce4e69d393b (patch) | |
| tree | 774671c0ab1189f3111388ea21bd721c7707d61b | |
| parent | Merge pull request #41 from ue-foundation/zs/import-oplog-clean (diff) | |
| download | zen-6ab371e8799e56a8bade2cc5f1f5cce4e69d393b.tar.xz zen-6ab371e8799e56a8bade2cc5f1f5cce4e69d393b.zip | |
Use proper API when checking oplog export blob existance in Jupiter (#42)
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/zenserver/projectstore/jupiterremoteprojectstore.cpp | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c0445d71..9ec6fdad1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## - Bugfix: Get raw size for compressed chunks correctly for `/prj/{project}/oplog/{log}/chunkinfos` - Bugfix: Fix log of Success/Failure for oplog import +- Bugfix: Use proper API when checking oplog export blob existence in Jupiter - Improvement: It is now possible to control which fields to include in `/prj/{project}/oplog/{log}/chunkinfos` request by adding a comma delimited list of filed names for `fieldnames` parameter - Default fields are: `id`, `rawhash` and `rawsize` (translates to `?fieldnames=id,rawhash,rawsize`) - Use `?fieldnames=*` to get all the fields diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp index 6b1f591f0..e68eb2823 100644 --- a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp +++ b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp @@ -135,9 +135,10 @@ public: virtual HasAttachmentsResult HasAttachments(const std::span<IoHash> RawHashes) override { CloudCacheSession Session(m_CloudClient.Get()); - CloudCacheExistsResult ExistsResult = Session.BlobExists(m_Namespace, std::set<IoHash>(RawHashes.begin(), RawHashes.end())); - HasAttachmentsResult Result{ConvertResult(ExistsResult), - std::unordered_set<IoHash, IoHash::Hasher>(ExistsResult.Needs.begin(), ExistsResult.Needs.end())}; + CloudCacheExistsResult ExistsResult = + Session.CompressedBlobExists(m_Namespace, std::set<IoHash>(RawHashes.begin(), RawHashes.end())); + HasAttachmentsResult Result{ConvertResult(ExistsResult), + std::unordered_set<IoHash, IoHash::Hasher>(ExistsResult.Needs.begin(), ExistsResult.Needs.end())}; if (ExistsResult.ErrorCode) { Result.Reason = fmt::format("Failed checking attachment existance in {}/{}. Reason: '{}'", |