Skip to content
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

[ntuple] Move RFieldVisitor out of Experimental #18031

Merged
merged 1 commit into from
Mar 19, 2025
Merged

[ntuple] Move RFieldVisitor out of Experimental #18031

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
2 changes: 1 addition & 1 deletion gui/browsable/src/RFieldProvider.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using namespace std::string_literals;
*/

class RFieldProvider : public RProvider {
class RDrawVisitor : public ROOT::Experimental::Detail::RFieldVisitor {
class RDrawVisitor : public ROOT::Detail::RFieldVisitor {
private:
std::shared_ptr<ROOT::Experimental::RNTupleReader> fNtplReader;
std::unique_ptr<TH1> fHist;
Expand Down
20 changes: 10 additions & 10 deletions tree/ntuple/v7/inc/ROOT/RField.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ namespace ROOT {

class TSchemaRule;

namespace Detail {
class RFieldVisitor;
} // namespace Detail

namespace Experimental {

class REntry;
class RNTupleCollectionView;

namespace Detail {
class RFieldVisitor;
} // namespace Detail

} // namespace Experimental

/// The container field for an ntuple model, which itself has no physical representation.
Expand All @@ -70,7 +70,7 @@ public:
size_t GetValueSize() const final { return 0; }
size_t GetAlignment() const final { return 0; }

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

/// Used in RFieldBase::Check() to record field creation failures.
Expand Down Expand Up @@ -205,7 +205,7 @@ public:
size_t GetAlignment() const final { return fMaxAlignment; }
std::uint32_t GetTypeVersion() const final;
std::uint32_t GetTypeChecksum() const final;
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

/// The field for a class using ROOT standard streaming
Expand Down Expand Up @@ -257,7 +257,7 @@ public:
size_t GetAlignment() const final;
std::uint32_t GetTypeVersion() const final;
std::uint32_t GetTypeChecksum() const final;
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

/// The field for an unscoped or scoped enum with dictionary
Expand All @@ -284,7 +284,7 @@ public:
std::vector<RValue> SplitValue(const RValue &value) const final;
size_t GetValueSize() const final { return fSubfields[0]->GetValueSize(); }
size_t GetAlignment() const final { return fSubfields[0]->GetAlignment(); }
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

/// Classes with dictionaries that can be inspected by TClass
Expand Down Expand Up @@ -345,7 +345,7 @@ public:
RCardinalityField &operator=(RCardinalityField &&other) = default;
~RCardinalityField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;

const RField<RNTupleCardinality<std::uint32_t>> *As32Bit() const;
const RField<RNTupleCardinality<std::uint64_t>> *As64Bit() const;
Expand Down Expand Up @@ -497,7 +497,7 @@ public:
size_t GetAlignment() const final;
std::uint32_t GetTypeVersion() const final;
std::uint32_t GetTypeChecksum() const final;
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

// Has to be implemented after the definition of all RField<T> types
Expand Down
24 changes: 12 additions & 12 deletions tree/ntuple/v7/inc/ROOT/RField/RFieldFundamental.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public:
RField &operator=(RField &&other) = default;
~RField() final = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

extern template class RSimpleField<char>;
Expand All @@ -100,7 +100,7 @@ public:
RField &operator=(RField &&other) = default;
~RField() final = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

// For other integral types, we introduce an intermediate RIntegralField. It is specialized for fixed-width integer
Expand All @@ -127,7 +127,7 @@ public:
RIntegralField &operator=(RIntegralField &&other) = default;
~RIntegralField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

extern template class RSimpleField<std::uint8_t>;
Expand All @@ -144,7 +144,7 @@ public:
RIntegralField &operator=(RIntegralField &&other) = default;
~RIntegralField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

extern template class RSimpleField<std::int16_t>;
Expand All @@ -161,7 +161,7 @@ public:
RIntegralField &operator=(RIntegralField &&other) = default;
~RIntegralField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

extern template class RSimpleField<std::uint16_t>;
Expand All @@ -178,7 +178,7 @@ public:
RIntegralField &operator=(RIntegralField &&other) = default;
~RIntegralField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

extern template class RSimpleField<std::int32_t>;
Expand All @@ -195,7 +195,7 @@ public:
RIntegralField &operator=(RIntegralField &&other) = default;
~RIntegralField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

extern template class RSimpleField<std::uint32_t>;
Expand All @@ -212,7 +212,7 @@ public:
RIntegralField &operator=(RIntegralField &&other) = default;
~RIntegralField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

extern template class RSimpleField<std::int64_t>;
Expand All @@ -229,7 +229,7 @@ public:
RIntegralField &operator=(RIntegralField &&other) = default;
~RIntegralField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

extern template class RSimpleField<std::uint64_t>;
Expand All @@ -246,7 +246,7 @@ public:
RIntegralField &operator=(RIntegralField &&other) = default;
~RIntegralField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

namespace Internal {
Expand Down Expand Up @@ -495,7 +495,7 @@ public:

explicit RField(std::string_view name) : RRealField<float>(name, TypeName()) {}

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

template <>
Expand All @@ -514,7 +514,7 @@ public:

explicit RField(std::string_view name) : RRealField<double>(name, TypeName()) {}

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;

// Set the column representation to 32 bit floating point and the type alias to Double32_t
void SetDouble32();
Expand Down
5 changes: 1 addition & 4 deletions tree/ntuple/v7/inc/ROOT/RField/RFieldProxiedCollection.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,11 @@
#include <vector>

namespace ROOT {
namespace Experimental {

namespace Detail {
class RFieldVisitor;
} // namespace Detail

} // namespace Experimental

/// The field for a class representing a collection of elements via `TVirtualCollectionProxy`.
/// Objects of such type behave as collections that can be accessed through the corresponding member functions in
/// `TVirtualCollectionProxy`. For STL collections, these proxies are provided. Custom classes need to implement the
Expand Down Expand Up @@ -184,7 +181,7 @@ public:
std::vector<RValue> SplitValue(const RValue &value) const final;
size_t GetValueSize() const final { return fProxy->Sizeof(); }
size_t GetAlignment() const final { return alignof(std::max_align_t); }
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
void
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
Expand Down
5 changes: 1 addition & 4 deletions tree/ntuple/v7/inc/ROOT/RField/RFieldRecord.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,11 @@
#include <vector>

namespace ROOT {
namespace Experimental {

namespace Detail {
class RFieldVisitor;
} // namespace Detail

} // namespace Experimental

namespace Internal {
std::unique_ptr<RFieldBase> CreateEmulatedField(std::string_view fieldName,
std::vector<std::unique_ptr<RFieldBase>> itemFields,
Expand Down Expand Up @@ -121,7 +118,7 @@ public:
return std::max<size_t>(1ul, fSize);
}
size_t GetAlignment() const final { return fMaxAlignment; }
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;

const std::vector<std::size_t> &GetOffsets() const { return fOffsets; }
};
Expand Down
10 changes: 5 additions & 5 deletions tree/ntuple/v7/inc/ROOT/RField/RFieldSTLMisc.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public:
size_t GetValueSize() const final { return fSubfields[0]->GetValueSize(); }
size_t GetAlignment() const final { return fSubfields[0]->GetAlignment(); }

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

template <typename ItemT>
Expand Down Expand Up @@ -116,7 +116,7 @@ public:

size_t GetValueSize() const final { return kWordSize * ((fN + kBitsPerWord - 1) / kBitsPerWord); }
size_t GetAlignment() const final { return alignof(Word_t); }
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;

/// Get the number of bits in the bitset, i.e. the N in std::bitset<N>
std::size_t GetN() const { return fN; }
Expand Down Expand Up @@ -155,7 +155,7 @@ public:
RField &operator=(RField &&other) = default;
~RField() final = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -190,7 +190,7 @@ public:
RNullableField &operator=(RNullableField &&other) = default;
~RNullableField() override = default;

void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

class ROptionalField : public RNullableField {
Expand Down Expand Up @@ -323,7 +323,7 @@ public:

size_t GetValueSize() const final { return sizeof(std::string); }
size_t GetAlignment() const final { return std::alignment_of<std::string>(); }
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

////////////////////////////////////////////////////////////////////////////////
Expand Down
13 changes: 5 additions & 8 deletions tree/ntuple/v7/inc/ROOT/RField/RFieldSequenceContainer.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,11 @@
#include <vector>

namespace ROOT {
namespace Experimental {

namespace Detail {
class RFieldVisitor;
} // namespace Detail

} // namespace Experimental

////////////////////////////////////////////////////////////////////////////////
/// Template specializations for C++ std::array and C-style arrays
////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -81,7 +78,7 @@ public:
size_t GetLength() const { return fArrayLength; }
size_t GetValueSize() const final { return fItemSize * fArrayLength; }
size_t GetAlignment() const final { return fSubfields[0]->GetAlignment(); }
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

template <typename ItemT, std::size_t N>
Expand Down Expand Up @@ -158,7 +155,7 @@ public:
std::vector<RValue> SplitValue(const RValue &value) const final;
size_t GetValueSize() const final;
size_t GetAlignment() const final;
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
void
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
Expand Down Expand Up @@ -242,7 +239,7 @@ public:
std::vector<RValue> SplitValue(const RValue &value) const final;
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::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
void
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
Expand Down Expand Up @@ -300,7 +297,7 @@ 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::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
void
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
{
Expand Down Expand Up @@ -361,7 +358,7 @@ public:
std::size_t GetAlignment() const final;

std::vector<RFieldBase::RValue> SplitValue(const RFieldBase::RValue &value) const final;
void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final;
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
};

namespace Experimental {
Expand Down
10 changes: 5 additions & 5 deletions tree/ntuple/v7/inc/ROOT/RFieldBase.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ namespace ROOT {
class RFieldBase;
class RClassField;

namespace Detail {
class RFieldVisitor;
} // namespace Detail

namespace Experimental {

class RNTupleJoinProcessor;
Expand All @@ -44,10 +48,6 @@ class RPageSink;
class RPageSource;
} // namespace Internal

namespace Detail {
class RFieldVisitor;
} // namespace Detail

} // namespace Experimental

namespace Internal {
Expand Down Expand Up @@ -619,7 +619,7 @@ public:
RConstSchemaIterator cbegin() const;
RConstSchemaIterator cend() const;

virtual void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const;
virtual void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const;
}; // class RFieldBase

/// Iterates over the sub tree of fields in depth-first search order
Expand Down
Loading
Loading