Repository navigation
Fix off-by-one error for merging nested directories - #23878
Merged
Merged
Conversation
Instead of comparing the *file* of the source directory to the target directory, we should be comparing it to the *file* of the target directory.
enirolf
added
bug
in:I/O
experiment
enirolf
requested review from
bellenot,
dpiparo,
jblomer and
pcanal
as code owners
October 28, 2026 14:34
enirolf
requested review from
jblomer,
pcanal and
vepadulano
and removed request for
bellenot,
dpiparo,
jblomer and
pcanal
October 28, 2026 14:34
1 of 2 tasks
vepadulano
reviewed
Oct 28, 2026
Regression test for root-project#23666 Co-authored-by: Vincenzo Eduardo Padulano <v.e.padulano@gmail.com>
...directly using `hadd`, and not only the TFileMerger
enirolf
force-pushed
the
23666-hadd-nested-dirs
branch
from
October 28, 2026 15:28
b9c9cd5 to
c973835
Compare
Test Results 23 files 23 suites 3d 19h 47m 37s ⏱️ Results for commit c973835. |
Contributor
Author
|
/backport to 6.40, 6.36 |
|
Preparing to backport PR #23878 to branches 6.40 and 6.36 requested by enirolf |
|
This PR has been backported to branch 6.40: #23882 |
This was referenced Oct 29, 2026
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
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.
The problem was observed when calling
haddwith the-nflag, or equivalently settingTFileMerger::SetMaxOpenedFilesto a number smaller than the number of files to merge, as well as when the number of files to merge was larger than 127.The underlying issue is that instead of comparing the file of the source directory to the file of the target directory, we were be comparing it to the target directory itself.
The initial PR (#23791) pointed us in the right direction, but still required non-insignificant time to properly understand and validate the changes.
Fixes #23666.