[ntuple] Renormalize field type names if needed in SetSchemaFromExisting#22816
[ntuple] Renormalize field type names if needed in SetSchemaFromExisting#22816silverweed wants to merge 2 commits into
Conversation
1750f9b to
e4b5e2e
Compare
Test Results 23 files 23 suites 3d 15h 23m 5s ⏱️ Results for commit 6e804fa. ♻️ This comment has been updated with latest results. |
|
Update: the user has kindly granted us permission to use his shared files, so I uploaded the integration test. |
jblomer
left a comment
There was a problem hiding this comment.
How about this approach, which would avoid another friend declaration:
We add an RFieldDescriptorBuilder::FromFieldDescriptor() method, and then we do the fixup in RNTupleDescriptor::Clone(): we replace RFieldDescriptor::Clone() with creating field descriptor builders first, and fixup the type name in that descriptor (using GetTypeNameForComparison()) before moving it into a destination field descriptor.
Btw I just realized the friend declaration is an unnecessary remnant from a previous experiment, I removed it. Do you think I should still try your proposal? |
b311627 to
3c62a30
Compare
3c62a30 to
2224cb8
Compare
2224cb8 to
f5d3b77
Compare
Fixes #22130.
I have a local integration test for this change but I'm waiting on a user's permission to use their files.
Otherwise we can craft our own files to be merged instead.