From 02cd078f459e21f598dd43c954cbc24d9f1c2322 Mon Sep 17 00:00:00 2001 From: Jakob Blomer Date: Mon, 23 Sep 2024 17:40:55 +0200 Subject: [PATCH] [ntuple] remove RClusterSummary::fColumnGroupID --- tree/ntuple/v7/inc/ROOT/RNTupleSerialize.hxx | 2 -- tree/ntuple/v7/src/RNTupleSerialize.cxx | 5 +---- tree/ntuple/v7/test/ntuple_serialize.cxx | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tree/ntuple/v7/inc/ROOT/RNTupleSerialize.hxx b/tree/ntuple/v7/inc/ROOT/RNTupleSerialize.hxx index 589f2e3b9e9df..c77af70e6f287 100644 --- a/tree/ntuple/v7/inc/ROOT/RNTupleSerialize.hxx +++ b/tree/ntuple/v7/inc/ROOT/RNTupleSerialize.hxx @@ -88,8 +88,6 @@ public: std::uint64_t fFirstEntry = 0; std::uint64_t fNEntries = 0; std::uint8_t fFlags = 0; - /// -1 for "all columns" - std::int32_t fColumnGroupID = -1; }; struct RClusterGroup { diff --git a/tree/ntuple/v7/src/RNTupleSerialize.cxx b/tree/ntuple/v7/src/RNTupleSerialize.cxx index 10c86128cd1c8..aec83f5c1b0eb 100644 --- a/tree/ntuple/v7/src/RNTupleSerialize.cxx +++ b/tree/ntuple/v7/src/RNTupleSerialize.cxx @@ -1145,7 +1145,6 @@ ROOT::Experimental::Internal::RNTupleSerializer::DeserializeClusterSummary(const clusterSummary.fNEntries = nEntries; clusterSummary.fFlags = flags; - clusterSummary.fColumnGroupID = -1; return frameSize; } @@ -1512,7 +1511,7 @@ ROOT::Experimental::Internal::RNTupleSerializer::SerializePageList(void *buffer, pos += SerializeListFramePreamble(nClusters, *where); for (auto clusterId : physClusterIDs) { const auto &clusterDesc = desc.GetClusterDescriptor(context.GetMemClusterId(clusterId)); - RClusterSummary summary{clusterDesc.GetFirstEntryIndex(), clusterDesc.GetNEntries(), 0, -1}; + RClusterSummary summary{clusterDesc.GetFirstEntryIndex(), clusterDesc.GetNEntries(), 0}; pos += SerializeClusterSummary(summary, *where); } pos += SerializeFramePostscript(buffer ? clusterSummaryFrame : nullptr, pos - clusterSummaryFrame); @@ -1794,8 +1793,6 @@ ROOT::Experimental::Internal::RNTupleSerializer::DeserializePageList(const void if (!result) return R__FORWARD_ERROR(result); bytes += result.Unwrap(); - if (clusterSummary.fColumnGroupID >= 0) - return R__FAIL("sharded clusters are still unsupported"); RClusterDescriptorBuilder builder; builder.ClusterId(clusterId).FirstEntryIndex(clusterSummary.fFirstEntry).NEntries(clusterSummary.fNEntries); diff --git a/tree/ntuple/v7/test/ntuple_serialize.cxx b/tree/ntuple/v7/test/ntuple_serialize.cxx index 2d9f4a3f77523..3b06c07b0d903 100644 --- a/tree/ntuple/v7/test/ntuple_serialize.cxx +++ b/tree/ntuple/v7/test/ntuple_serialize.cxx @@ -456,7 +456,6 @@ TEST(RNTuple, SerializeClusterSummary) EXPECT_EQ(summary.fFirstEntry, reco.fFirstEntry); EXPECT_EQ(summary.fNEntries, reco.fNEntries); EXPECT_EQ(summary.fFlags, reco.fFlags); - EXPECT_EQ(summary.fColumnGroupID, reco.fColumnGroupID); summary.fFlags |= 0x01; EXPECT_EQ(24u, RNTupleSerializer::SerializeClusterSummary(summary, buffer));