Skip to content

[ntuple] remove GetCollectionInfo() from collection fields #19929

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
Sep 22, 2025
Merged

[ntuple] remove GetCollectionInfo() from collection fields #19929

Show file tree
Hide file tree
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
10 changes: 0 additions & 10 deletions tree/ntuple/inc/ROOT/RField/RFieldProxiedCollection.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,6 @@ public:
size_t GetValueSize() const final { return fProxy->Sizeof(); }
size_t GetAlignment() const final { return alignof(std::max_align_t); }
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
void
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
fPrincipalColumn->GetCollectionInfo(globalIndex, collectionStart, size);
}
void
GetCollectionInfo(RNTupleLocalIndex localIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
fPrincipalColumn->GetCollectionInfo(localIndex, collectionStart, size);
}
};

////////////////////////////////////////////////////////////////////////////////
Expand Down
30 changes: 0 additions & 30 deletions tree/ntuple/inc/ROOT/RField/RFieldSequenceContainer.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,16 +163,6 @@ public:
size_t GetValueSize() const final;
size_t GetAlignment() const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
void
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
fPrincipalColumn->GetCollectionInfo(globalIndex, collectionStart, size);
}
void
GetCollectionInfo(RNTupleLocalIndex localIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
fPrincipalColumn->GetCollectionInfo(localIndex, collectionStart, size);
}
};

template <typename ItemT>
Expand Down Expand Up @@ -256,16 +246,6 @@ public:
size_t GetValueSize() const final { return sizeof(std::vector<char>); }
size_t GetAlignment() const final { return std::alignment_of<std::vector<char>>(); }
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
void
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
fPrincipalColumn->GetCollectionInfo(globalIndex, collectionStart, size);
}
void
GetCollectionInfo(RNTupleLocalIndex localIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
fPrincipalColumn->GetCollectionInfo(localIndex, collectionStart, size);
}
};

template <typename ItemT>
Expand Down Expand Up @@ -316,16 +296,6 @@ public:
size_t GetValueSize() const final { return sizeof(std::vector<bool>); }
size_t GetAlignment() const final { return std::alignment_of<std::vector<bool>>(); }
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
void
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
fPrincipalColumn->GetCollectionInfo(globalIndex, collectionStart, size);
}
void
GetCollectionInfo(RNTupleLocalIndex localIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
fPrincipalColumn->GetCollectionInfo(localIndex, collectionStart, size);
}
};

////////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion tree/ntuple/src/RFieldSequenceContainer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ std::size_t ROOT::RRVecField::ReadBulkImpl(const RBulkSpec &bulkSpec)
// Get size of the first RVec of the bulk
RNTupleLocalIndex firstItemIndex;
ROOT::NTupleSize_t collectionSize;
this->GetCollectionInfo(bulkSpec.fFirstIndex, &firstItemIndex, &collectionSize);
fPrincipalColumn->GetCollectionInfo(bulkSpec.fFirstIndex, &firstItemIndex, &collectionSize);
*beginPtr = itemValueArray;
*sizePtr = collectionSize;
*capacityPtr = -1;
Expand Down
19 changes: 6 additions & 13 deletions tree/ntuple/test/ntuple_emulated.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,20 +680,13 @@ TEST(RNTupleEmulated, CollectionProxy)
EXPECT_NE(field.GetTraits() & RFieldBase::kTraitEmulatedField, 0);
EXPECT_EQ(field.GetValueSize(), sizeof(std::vector<char>));

const auto *vec = dynamic_cast<const ROOT::RVectorField *>(&field);
ASSERT_NE(vec, nullptr);
RNTupleLocalIndex collectionStart;
ROOT::NTupleSize_t size;
vec->GetCollectionInfo(0, &collectionStart, &size);
EXPECT_EQ(collectionStart.GetClusterId(), 0);
EXPECT_EQ(collectionStart.GetIndexInCluster(), 0);
EXPECT_EQ(size, 100);
vec->GetCollectionInfo(1, &collectionStart, &size);
EXPECT_EQ(collectionStart.GetClusterId(), 0);
EXPECT_EQ(collectionStart.GetIndexInCluster(), 100);
EXPECT_EQ(size, 0);

auto vec = std::static_pointer_cast<std::vector<char>>(reader->GetModel().GetDefaultEntry().GetPtr<void>("proxyC"));
reader->LoadEntry(0);
EXPECT_EQ(100u, vec->size());
EXPECT_EQ(0x42, vec->at(0));
EXPECT_EQ(0x42, vec->at(99));
reader->LoadEntry(1);
EXPECT_EQ(0u, vec->size());
}

TEST(RNTupleEmulated, MergeEmulated)
Expand Down
Loading