Skip to content

Commit 432c500

Browse files
committed
[ntuple] rename RHeaderExtension::AddExtended* to MarkExtended*
1 parent fb679bf commit 432c500

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

tree/ntuple/v7/inc/ROOT/RNTupleDescriptor.hxx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,13 +1002,19 @@ private:
10021002
std::uint32_t fNLogicalColumns = 0;
10031003
std::uint32_t fNPhysicalColumns = 0;
10041004

1005-
void AddExtendedField(const RFieldDescriptor &fieldDesc)
1005+
/// Marks `fieldDesc` as an extended field, i.e. a field that appears in the Header Extension (e.g. having been added
1006+
/// through late model extension). Note that the field descriptor should also have been added to the RNTuple
1007+
/// Descriptor alongside non-extended fields.
1008+
void MarkExtendedField(const RFieldDescriptor &fieldDesc)
10061009
{
10071010
fFieldIdsOrder.emplace_back(fieldDesc.GetId());
10081011
fFieldIdsLookup.insert(fieldDesc.GetId());
10091012
}
10101013

1011-
void AddExtendedColumn(const RColumnDescriptor &columnDesc)
1014+
/// Marks `columnDesc` as an extended column, i.e. a column that appears in the Header Extension (e.g. having been
1015+
/// added through late model extension as an additional representation of an existing column). Note that the column
1016+
/// descriptor should also have been added to the RNTuple Descriptor alongside non-extended columns.
1017+
void MarkExtendedColumn(const RColumnDescriptor &columnDesc)
10121018
{
10131019
fNLogicalColumns++;
10141020
if (!columnDesc.IsAliasColumn())

tree/ntuple/v7/src/RNTupleDescriptor.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ void ROOT::Experimental::Internal::RNTupleDescriptorBuilder::AddField(const RFie
10631063
{
10641064
fDescriptor.fFieldDescriptors.emplace(fieldDesc.GetId(), fieldDesc.Clone());
10651065
if (fDescriptor.fHeaderExtension)
1066-
fDescriptor.fHeaderExtension->AddExtendedField(fieldDesc);
1066+
fDescriptor.fHeaderExtension->MarkExtendedField(fieldDesc);
10671067
if (fieldDesc.GetFieldName().empty() && fieldDesc.GetParentId() == kInvalidDescriptorId) {
10681068
fDescriptor.fFieldZeroId = fieldDesc.GetId();
10691069
}
@@ -1171,7 +1171,7 @@ ROOT::RResult<void> ROOT::Experimental::Internal::RNTupleDescriptorBuilder::AddC
11711171
fDescriptor.fNPhysicalColumns++;
11721172
fDescriptor.fColumnDescriptors.emplace(logicalId, std::move(columnDesc));
11731173
if (fDescriptor.fHeaderExtension)
1174-
fDescriptor.fHeaderExtension->AddExtendedColumn(columnDesc);
1174+
fDescriptor.fHeaderExtension->MarkExtendedColumn(columnDesc);
11751175

11761176
return RResult<void>::Success();
11771177
}

0 commit comments

Comments
 (0)