Skip to content

[v6.36] fixes for RNTuple views #19826

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
jblomer merged 2 commits into from
Sep 8, 2025
Merged

[v6.36] fixes for RNTuple views #19826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ba50f7
[ntuple] remove const qualifier from RNTupleLocalRange members
jblomer Aug 26, 2025
557905f
[ntuple] fix moving of RNTupleCollectionView
jblomer Aug 26, 2025
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
6 changes: 3 additions & 3 deletions tree/ntuple/inc/ROOT/RNTupleRange.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ public:
// clang-format on
class RNTupleLocalRange {
private:
const ROOT::DescriptorId_t fClusterId;
const ROOT::NTupleSize_t fStart;
const ROOT::NTupleSize_t fEnd;
ROOT::DescriptorId_t fClusterId;
ROOT::NTupleSize_t fStart;
ROOT::NTupleSize_t fEnd;

public:
class RIterator {
Expand Down
15 changes: 13 additions & 2 deletions tree/ntuple/inc/ROOT/RNTupleView.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,9 +347,20 @@ private:

public:
RNTupleCollectionView(const RNTupleCollectionView &other) = delete;
RNTupleCollectionView(RNTupleCollectionView &&other) = default;
RNTupleCollectionView &operator=(const RNTupleCollectionView &other) = delete;
RNTupleCollectionView &operator=(RNTupleCollectionView &&other) = default;
RNTupleCollectionView(RNTupleCollectionView &&other)
: fSource(other.fSource), fField(std::move(other.fField)), fValue(fField.CreateValue())
{
}
RNTupleCollectionView &operator=(RNTupleCollectionView &&other)
{
if (this == &other)
return *this;
std::swap(fSource, other.fSource);
std::swap(fField, other.fField);
fValue = fField.CreateValue();
return *this;
}
~RNTupleCollectionView() = default;

ROOT::RNTupleLocalRange GetCollectionRange(ROOT::NTupleSize_t globalIndex)
Expand Down
Loading