[ntuple] Fix remaining issues with deferred columns in RNTupleMerger #17810
+748
−101
Conversation
This file contains 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
silverweed
force-pushed
the
ntuple_merge_deferred3
branch
from
e39c070 to
b73b5bf
Compare
Test Results 18 files 18 suites 4d 9h 35m 31s ⏱️ Results for commit e60bf72. ♻️ This comment has been updated with latest results. |
enirolf
requested changes
Feb 26, 2025
If the compression is the expected one we don't need to check for uncompressible pages
silverweed
force-pushed
the
ntuple_merge_deferred3
branch
2 times, most recently
from
90ce31a to
f4bf5e1
Compare
hahnjo
approved these changes
Feb 28, 2025
enirolf
approved these changes
Feb 28, 2025
silverweed
force-pushed
the
ntuple_merge_deferred3
branch
from
f4bf5e1 to
8beb904
Compare
Adding the possibility of not copying the clustering when initting a sink from a descriptor. This is used in the Merger to init the first source in the non-incremental merging case.
Fixes (at least) the following cases: - deferred column in the first source - deferred column unaligned with a cluster boundary in any source
Similarly to what we're doing for deferred columns and late-model extended fields, we only write those in the footer and never in the non-extended header. Otherwise we get in trouble when incrementally merging a RNTuple, as it will end up with duplicate ExtraTypeInfo
silverweed
force-pushed
the
ntuple_merge_deferred3
branch
from
8beb904 to
e60bf72
Compare
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.
This Pull request:
fixes all remaining known cases of mishandling of deferred columns in the RNTupleMerger, most notably the inability of merging a file with a deferred column in the first source and mishandling of sources with a deferred column unaligned with cluster boundaries.
Several tests are added to cover those cases.
Optimizations left to do
Checklist: