Skip to content

[6.2] CAS validation improvements (#10966) #10968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akyrtzi merged 1 commit into from
Jul 9, 2025
Merged

[6.2] CAS validation improvements (#10966) #10968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions llvm/include/llvm/CAS/UnifiedOnDiskCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ class UnifiedOnDiskCache {

Error validateActionCache();

OnDiskGraphDB *getUpstreamGraphDB() const { return UpstreamGraphDB; }

private:
UnifiedOnDiskCache();

Expand Down
14 changes: 10 additions & 4 deletions llvm/lib/CAS/OnDiskCAS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,19 @@ class OnDiskCAS : public BuiltinCAS {

void OnDiskCAS::print(raw_ostream &OS) const { DB->print(OS); }
Error OnDiskCAS::validate(bool CheckHash) const {
return DB->validate(CheckHash, [](ArrayRef<ArrayRef<uint8_t>> Refs,
ArrayRef<char> Data,
SmallVectorImpl<uint8_t> &Result) {
auto Hasher = [](ArrayRef<ArrayRef<uint8_t>> Refs, ArrayRef<char> Data,
SmallVectorImpl<uint8_t> &Result) {
auto Hash = BuiltinObjectHasher<llvm::cas::builtin::HasherT>::hashObject(
Refs, Data);
Result.assign(Hash.begin(), Hash.end());
});
};

if (auto E = DB->validate(CheckHash, Hasher))
return E;
if (UniDB && UniDB->getUpstreamGraphDB())
return UniDB->getUpstreamGraphDB()->validate(CheckHash, Hasher);

return Error::success();
}

CASID OnDiskCAS::getID(ObjectRef Ref) const {
Expand Down
2 changes: 0 additions & 2 deletions llvm/lib/CAS/UnifiedOnDiskCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ Error UnifiedOnDiskCache::validateActionCache() {
};
if (ID.getOpaqueData() == 0)
return formatError("zero is not a valid ref");
if (!PrimaryGraphDB->containsObject(ID))
return formatError("cas does not contain ref");
return Error::success();
};
if (Error E = PrimaryKVDB->validate(ValidateRef))
Expand Down