Skip to content

[ntuple] Merger: add field version check to schema validation #20243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

[ntuple] Merger: add field version check to schema validation #20243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions tree/ntuple/src/RNTupleMerger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,17 @@ CompareDescriptorStructure(const ROOT::RNTupleDescriptor &dst, const ROOT::RNTup
errors.push_back(ss.str());
}

// Require that field versions match
const auto srcFldVer = field.fSrc->GetFieldVersion();
const auto dstFldVer = field.fDst->GetFieldVersion();
if (srcFldVer != dstFldVer) {
std::stringstream ss;
ss << "Field `" << field.fSrc->GetFieldName()
<< "` has a different field version than previously-seen field with the same name (old: " << dstFldVer
<< ", new: " << srcFldVer << ")";
errors.push_back(ss.str());
}

const auto srcRole = field.fSrc->GetStructure();
const auto dstRole = field.fDst->GetStructure();
if (srcRole != dstRole) {
Expand Down
Loading