[ntuple] fix type names with [U]Long64_t template args #20478
Conversation
Test Results 22 files 22 suites 3d 21h 1m 18s ⏱️ For more details on these failures, see this check. Results for commit 16a90ef. ♻️ This comment has been updated with latest results. |
jblomer
force-pushed
the
ntuple-fix-int-templ
branch
2 times, most recently
from
bd12deb to
be32af3
Compare
jblomer
force-pushed
the
ntuple-fix-int-templ
branch
from
a676f02 to
16a90ef
Compare
Custom classes with [U]Long64_t template arguments need to use their meta-normalized name as type alias. Otherwise, during reconstruction with the RNTuple normalized name, the streamer info for the `std::[u]int64_t` argument will be requested (typically `long` instead of `long long`).
| return GetRenormalizedMetaTypeName(metaNormalizedName); | ||
| } | ||
|
|
||
| bool ROOT::Internal::NeedsMetaNameAsAlias(const std::string &metaNormalizedName, std::string &renormalizedAlias) |
There was a problem hiding this comment.
This seems similar to (but better than): TClassEdit::GetLong64_Name, isn't it?
| EXPECT_TRUE(NeedsMetaNameAsAlias("MyClass<ULong64_t>", renormalizedAlias)); | ||
| EXPECT_TRUE(NeedsMetaNameAsAlias("std::vector<MyClass<Long64_t> >", renormalizedAlias)); | ||
| EXPECT_EQ("std::vector<MyClass<Long64_t>>", renormalizedAlias); | ||
| EXPECT_FALSE(NeedsMetaNameAsAlias("MyClass<ROOT::RVec<Long64_t>>", renormalizedAlias)); |
There was a problem hiding this comment.
We should also test map, i.e. when the long long is the second or third argument. We should also test when the argument is nested (eg EdmWrapper<map<int, UserStruct<something, Long64_t>>>).
| {"std::pair<CustomStruct, DerivedA>", {"DerivedA", "CustomStruct"}, ""}, | ||
| {"EdmWrapper<long long>", {"EdmWrapper<Long64_t>"}, "EdmWrapper<Long64_t>"}, | ||
| {"EdmContainer", {"EdmContainer", "EdmWrapper<Long64_t>"}, ""}, | ||
| {"EdmWrapper<long long>::Inner", {"EdmWrapper<Long64_t>::Inner"}, "EdmWrapper<Long64_t>::Inner"}, |
There was a problem hiding this comment.
Do we also test (besides for std) other combination of class template instance and regular class/namespaces? eg. CL::TP<long long>::CL2, CL::CL2::TP<long long>, etc.
hahnjo
left a comment
hahnjo
left a comment
There was a problem hiding this comment.
Should this be mentioned in "Type Name Normalization" of BinaryFormatSpecification.md?
3 participants
Custom classes with [U]Long64_t template arguments need to use their
meta-normalized name as type alias. Otherwise, during reconstruction
with the RNTuple normalized name, the streamer info for the
std::[u]int64_targument will be requested (typicallylonginstead of
long long).Fixes #20282