[hadd] Fix file equivalence test in case of remote files#20878
Merged
silverweed merged 1 commit intoroot-project:masterfrom Jan 15, 2026
Merged
[hadd] Fix file equivalence test in case of remote files#20878silverweed merged 1 commit intoroot-project:masterfrom
silverweed merged 1 commit intoroot-project:masterfrom
Conversation
silverweed
force-pushed
the
hadd_checkequiv_remote
branch
from
6284930 to
4c1cc17
Compare
Test Results 23 files 23 suites 3d 19h 13m 14s ⏱️ Results for commit 4c1cc17. |
pcanal
reviewed
Jan 15, 2026
| if (sourceIsLocal != targetIsLocal) | ||
| return false; | ||
|
|
||
| // We cannot use std::filesystem functions for remote files. |
Member
There was a problem hiding this comment.
Suggested change
| // We cannot use std::filesystem functions for remote files. | |
| // We cannot use std::filesystem functions for remote files nor local files | |
| // expressed with a protocol. |
eg auto f = TFile::Open("file://t1.root", "RECREATE") creates a local file.
pcanal
reviewed
Jan 15, 2026
|
|
||
| static bool FilesAreEquivalent(std::string_view source, std::string_view target) | ||
| { | ||
| const bool sourceIsLocal = source.find_first_of("://") == std::string_view::npos; |
Member
There was a problem hiding this comment.
Suggested change
| const bool sourceIsLocal = source.find_first_of("://") == std::string_view::npos; | |
| const bool sourceHasProtocol = source.find_first_of("://") == std::string_view::npos; |
See https://github.com/root-project/root/pull/20878/changes#r2694519784
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
haddis trying to usestd::filesystem::equivalentindiscriminately for any source and target files, but the function only makes sense for local files.This PR adds a function that checks if the files are remote and, if so, if simply compares their URL.
NOTE: this PR should be backported to 6.38.
Checklist:
This PR fixes #20872