[ntuple] remove RNTupleDescriptorBuilder::BuildStreamerInfos()

Author: jblomer

tree/ntuple/inc/ROOT/RNTupleDescriptor.hxx

@@ -1762,9 +1762,6 @@ public:
    ///   - Logical columns of piece two
    ///   - ...
    void ShiftAliasColumns(std::uint32_t offset);
-
-   /// Get the streamer info records for custom classes. Currently requires the corresponding dictionaries to be loaded.
-   ROOT::Internal::RNTupleSerializer::StreamerInfoMap_t BuildStreamerInfos() const;
 };
 
 inline RNTupleDescriptor CloneDescriptorSchema(const RNTupleDescriptor &desc)

tree/ntuple/src/RNTupleDescriptor.cxx

@@ -24,7 +24,6 @@
 
 #include <RZip.h>
 #include <TError.h>
-#include <TVirtualStreamerInfo.h>
 
 #include <algorithm>
 #include <cstdint>
@@ -1412,48 +1411,6 @@ ROOT::Internal::RNTupleDescriptorBuilder::AddAttributeSet(Experimental::RNTupleA
    return RResult<void>::Success();
 }
 
-RNTupleSerializer::StreamerInfoMap_t ROOT::Internal::RNTupleDescriptorBuilder::BuildStreamerInfos() const
-{
-   RNTupleSerializer::StreamerInfoMap_t streamerInfoMap;
-   const auto &desc = GetDescriptor();
-
-   std::function<void(const RFieldDescriptor &)> fnWalkFieldTree;
-   fnWalkFieldTree = [&desc, &streamerInfoMap, &fnWalkFieldTree](const RFieldDescriptor &fieldDesc) {
-      if (fieldDesc.IsCustomClass()) {
-         // Add streamer info for this class to streamerInfoMap
-         auto cl = TClass::GetClass(fieldDesc.GetTypeName().c_str());
-         if (!cl) {
-            throw RException(R__FAIL(std::string("cannot get TClass for ") + fieldDesc.GetTypeName()));
-         }
-         auto streamerInfo = cl->GetStreamerInfo(fieldDesc.GetTypeVersion());
-         if (!streamerInfo) {
-            throw RException(R__FAIL(std::string("cannot get streamerInfo for ") + fieldDesc.GetTypeName()));
-         }
-         streamerInfoMap[streamerInfo->GetNumber()] = streamerInfo;
-      }
-
-      // Recursively traverse sub fields
-      for (const auto &subFieldDesc : desc.GetFieldIterable(fieldDesc)) {
-         fnWalkFieldTree(subFieldDesc);
-      }
-   };
-
-   fnWalkFieldTree(desc.GetFieldZero());
-
-   // Add the streamer info records from streamer fields: because of runtime polymorphism we may need to add additional
-   // types not covered by the type names stored in the field headers
-   for (const auto &extraTypeInfo : desc.GetExtraTypeInfoIterable()) {
-      if (extraTypeInfo.GetContentId() != EExtraTypeInfoIds::kStreamerInfo)
-         continue;
-      // Ideally, we would avoid deserializing the streamer info records of the streamer fields that we just serialized.
-      // However, this happens only once at the end of writing and only when streamer fields are used, so the
-      // preference here is for code simplicity.
-      streamerInfoMap.merge(RNTupleSerializer::DeserializeStreamerInfos(extraTypeInfo.GetContent()).Unwrap());
-   }
-
-   return streamerInfoMap;
-}
-
 ROOT::RClusterDescriptor::RColumnRangeIterable ROOT::RClusterDescriptor::GetColumnRangeIterable() const
 {
    return RColumnRangeIterable(*this);

tree/ntuple/test/ntuple_descriptor.cxx

@@ -609,88 +609,6 @@ TEST(RNTupleDescriptor, Clone)
    EXPECT_EQ(desc, clone);
 }
 
-TEST(RNTupleDescriptor, BuildStreamerInfos)
-{
-   auto fnBuildStreamerInfosOf = [](const RFieldBase &field) -> RNTupleSerializer::StreamerInfoMap_t {
-      RNTupleDescriptorBuilder descBuilder;
-      descBuilder.SetNTuple("test", "");
-      descBuilder.AddField(
-         RFieldDescriptorBuilder().FieldId(0).Structure(ROOT::ENTupleStructure::kRecord).MakeDescriptor().Unwrap());
-      auto fieldBuilder = RFieldDescriptorBuilder::FromField(field);
-      descBuilder.AddField(fieldBuilder.FieldId(1).MakeDescriptor().Unwrap());
-      descBuilder.AddFieldLink(0, 1);
-      int i = 2;
-      // In this test, we only support field hierarchies up to 2 levels
-      for (const auto &child : field.GetConstSubfields()) {
-         fieldBuilder = RFieldDescriptorBuilder::FromField(*child);
-         descBuilder.AddField(fieldBuilder.FieldId(i).MakeDescriptor().Unwrap());
-         descBuilder.AddFieldLink(1, i);
-         const auto childId = i;
-         i++;
-         for (const auto &grandChild : child->GetConstSubfields()) {
-            fieldBuilder = RFieldDescriptorBuilder::FromField(*grandChild);
-            descBuilder.AddField(fieldBuilder.FieldId(i).MakeDescriptor().Unwrap());
-            descBuilder.AddFieldLink(childId, i);
-            i++;
-         }
-      }
-      return descBuilder.BuildStreamerInfos();
-   };
-
-   RNTupleSerializer::StreamerInfoMap_t streamerInfoMap;
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "float").Unwrap());
-   EXPECT_TRUE(streamerInfoMap.empty());
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "std::vector<float>").Unwrap());
-   EXPECT_TRUE(streamerInfoMap.empty());
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "std::pair<float, float>").Unwrap());
-   EXPECT_TRUE(streamerInfoMap.empty());
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "std::map<int, float>").Unwrap());
-   EXPECT_TRUE(streamerInfoMap.empty());
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "std::unordered_map<int, float>").Unwrap());
-   EXPECT_TRUE(streamerInfoMap.empty());
-
-   std::vector<std::unique_ptr<RFieldBase>> itemFields;
-   streamerInfoMap = fnBuildStreamerInfosOf(ROOT::RRecordField("f", std::move(itemFields)));
-   EXPECT_TRUE(streamerInfoMap.empty());
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "CustomStruct").Unwrap());
-   EXPECT_EQ(1u, streamerInfoMap.size());
-   EXPECT_STREQ("CustomStruct", streamerInfoMap.begin()->second->GetName());
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "std::vector<CustomStruct>").Unwrap());
-   EXPECT_EQ(1u, streamerInfoMap.size());
-   EXPECT_STREQ("CustomStruct", streamerInfoMap.begin()->second->GetName());
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "std::map<int, CustomStruct>").Unwrap());
-   EXPECT_EQ(1u, streamerInfoMap.size());
-   EXPECT_STREQ("CustomStruct", streamerInfoMap.begin()->second->GetName());
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "DerivedA").Unwrap());
-   EXPECT_EQ(2u, streamerInfoMap.size());
-   std::vector<std::string> typeNames;
-   for (const auto &[_, si] : streamerInfoMap) {
-      typeNames.emplace_back(si->GetName());
-   }
-   std::sort(typeNames.begin(), typeNames.end());
-   EXPECT_STREQ("CustomStruct", typeNames[0].c_str());
-   EXPECT_STREQ("DerivedA", typeNames[1].c_str());
-
-   streamerInfoMap = fnBuildStreamerInfosOf(*RFieldBase::Create("f", "std::pair<CustomStruct, DerivedA>").Unwrap());
-   EXPECT_EQ(2u, streamerInfoMap.size());
-   typeNames.clear();
-   for (const auto &[_, si] : streamerInfoMap) {
-      typeNames.emplace_back(si->GetName());
-   }
-   std::sort(typeNames.begin(), typeNames.end());
-   EXPECT_STREQ("CustomStruct", typeNames[0].c_str());
-   EXPECT_STREQ("DerivedA", typeNames[1].c_str());
-}
-
 TEST(RNTupleDescriptor, CloneSchema)
 {
    FileRaii fileGuard("test_ntuple_desc_cloneschema.root");