Skip to content

[ntuple] Change GetColumn methods in Inspector #19467

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
Aug 4, 2025
Merged

[ntuple] Change GetColumn methods in Inspector #19467

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 tree/ntupleutil/v7/inc/ROOT/RNTupleInspector.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public:
/// \param [in] fieldId The ID of the field for which to collect the columns.
///
/// \return A vector containing the IDs of all columns for the provided field ID.
std::vector<ROOT::DescriptorId_t> GetColumnsByFieldId(ROOT::DescriptorId_t fieldId) const;
std::vector<ROOT::DescriptorId_t> GetAllColumnsOfField(ROOT::DescriptorId_t fieldId) const;

/////////////////////////////////////////////////////////////////////////////
/// \brief Get all column types present in the RNTuple being inspected.
Expand Down
2 changes: 1 addition & 1 deletion tree/ntupleutil/v7/src/RNTupleInspector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ ROOT::Experimental::RNTupleInspector::CollectFieldTreeInfo(ROOT::DescriptorId_t
}

std::vector<ROOT::DescriptorId_t>
ROOT::Experimental::RNTupleInspector::GetColumnsByFieldId(ROOT::DescriptorId_t fieldId) const
ROOT::Experimental::RNTupleInspector::GetAllColumnsOfField(ROOT::DescriptorId_t fieldId) const
{
std::vector<ROOT::DescriptorId_t> colIds;
std::deque<ROOT::DescriptorId_t> fieldIdQueue{fieldId};
Expand Down
33 changes: 31 additions & 2 deletions tree/ntupleutil/v7/test/ntuple_inspector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,6 @@ TEST(RNTupleInspector, ColumnsByType)
}

auto inspector = RNTupleInspector::Create("ntuple", fileGuard.GetPath());

EXPECT_EQ(2U, inspector->GetColumnsByType(ENTupleColumnType::kSplitInt64).size());
for (const auto colId : inspector->GetColumnsByType(ENTupleColumnType::kSplitInt64)) {
EXPECT_EQ(ENTupleColumnType::kSplitInt64, inspector->GetColumnInspector(colId).GetType());
Expand All @@ -385,7 +384,6 @@ TEST(RNTupleInspector, ColumnsByType)
EXPECT_EQ(ENTupleColumnType::kSplitReal32, inspector->GetColumnInspector(colId).GetType());
}

EXPECT_EQ(1U, inspector->GetColumnsByType(ENTupleColumnType::kSplitIndex64).size());
EXPECT_EQ(1U, inspector->GetColumnsByType(ENTupleColumnType::kSplitIndex64).size());
for (const auto colId : inspector->GetColumnsByType(ENTupleColumnType::kSplitIndex64)) {
EXPECT_EQ(ENTupleColumnType::kSplitIndex64, inspector->GetColumnInspector(colId).GetType());
Expand All @@ -394,6 +392,37 @@ TEST(RNTupleInspector, ColumnsByType)
EXPECT_EQ(0U, inspector->GetColumnsByType(ENTupleColumnType::kSplitReal64).size());
}

TEST(RNTupleInspector, AllColumnsOfField)
{
FileRaii fileGuard("test_ntuple_inspector_all_columns_of_field.root");
{
auto model = RNTupleModel::Create();
auto nFldInt1 = model->MakeField<std::int64_t>("int1");
auto nFldInt2 = model->MakeField<std::int64_t>("int2");
auto nFldFloat = model->MakeField<float>("float");
auto nFldFloatVec = model->MakeField<std::vector<float>>("floatVec");

auto writeOptions = RNTupleWriteOptions();
writeOptions.SetCompression(505);
auto ntuple = RNTupleWriter::Recreate(std::move(model), "ntuple", fileGuard.GetPath(), writeOptions);
}

auto inspector = RNTupleInspector::Create("ntuple", fileGuard.GetPath());

EXPECT_EQ(1U, inspector->GetAllColumnsOfField(0).size());
EXPECT_EQ(1U, inspector->GetAllColumnsOfField(1).size());
for (const auto colId : inspector->GetAllColumnsOfField(0)) {
EXPECT_EQ(ENTupleColumnType::kSplitInt64, inspector->GetColumnInspector(colId).GetType());
}

EXPECT_EQ(1U, inspector->GetAllColumnsOfField(2).size());
for (const auto colId : inspector->GetAllColumnsOfField(2)) {
EXPECT_EQ(ENTupleColumnType::kSplitReal32, inspector->GetColumnInspector(colId).GetType());
}

EXPECT_EQ(2U, inspector->GetAllColumnsOfField(3).size());
}

TEST(RNTupleInspector, ColumnTypes)
{
FileRaii fileGuard("test_ntuple_inspector_column_types.root");
Expand Down
Loading