[ntuple] accept full descriptor in EnsureMatchingTypePrefix()

Author: jblomer

tree/ntuple/inc/ROOT/RFieldBase.hxx

@@ -537,7 +537,7 @@ protected:
    /// Many fields accept a range of type prefixes for schema evolution,
    /// e.g. std::unique_ptr< and std::optional< for nullable fields
    RResult<void>
-   EnsureMatchingTypePrefix(const RFieldDescriptor &fieldDesc, const std::vector<std::string> &prefixes) const;
+   EnsureMatchingTypePrefix(const RNTupleDescriptor &desc, const std::vector<std::string> &prefixes) const;
 
    /// Factory method to resurrect a field from the stored on-disk type information.  This overload takes an already
    /// normalized type name and type alias.

tree/ntuple/src/RField.cxx

@@ -880,8 +880,7 @@ void ROOT::RNullableField::ReconcileOnDiskField(const RNTupleDescriptor &desc)
    static const std::vector<std::string> prefixes = {"std::optional<", "std::unique_ptr<"};
 
    EnsureMatchingOnDiskField(desc, kDiffTypeName).ThrowOnError();
-   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
-   EnsureMatchingTypePrefix(fieldDesc, prefixes).ThrowOnError();
+   EnsureMatchingTypePrefix(desc, prefixes).ThrowOnError();
 }
 
 ROOT::RNTupleLocalIndex ROOT::RNullableField::GetItemIndex(ROOT::NTupleSize_t globalIndex)
@@ -1100,8 +1099,7 @@ void ROOT::RAtomicField::ReconcileOnDiskField(const RNTupleDescriptor &desc)
    static const std::vector<std::string> prefixes = {"std::atomic<"};
 
    EnsureMatchingOnDiskField(desc, kDiffTypeName).ThrowOnError();
-   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
-   EnsureMatchingTypePrefix(fieldDesc, prefixes).ThrowOnError();
+   EnsureMatchingTypePrefix(desc, prefixes).ThrowOnError();
 }
 
 std::vector<ROOT::RFieldBase::RValue> ROOT::RAtomicField::SplitValue(const RValue &value) const

tree/ntuple/src/RFieldBase.cxx

@@ -1049,9 +1049,10 @@ ROOT::RFieldBase::EnsureMatchingOnDiskField(const RNTupleDescriptor &desc, std::
    return R__FAIL(errMsg.str());
 }
 
-ROOT::RResult<void> ROOT::RFieldBase::EnsureMatchingTypePrefix(const RFieldDescriptor &fieldDesc,
+ROOT::RResult<void> ROOT::RFieldBase::EnsureMatchingTypePrefix(const RNTupleDescriptor &desc,
                                                                const std::vector<std::string> &prefixes) const
 {
+   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
    for (const auto &p : prefixes) {
       if (fieldDesc.GetTypeName().rfind(p, 0) == 0)
          return RResult<void>::Success();

tree/ntuple/src/RFieldMeta.cxx

@@ -685,9 +685,9 @@ void ROOT::RPairField::ReconcileOnDiskField(const RNTupleDescriptor &desc)
    static const std::vector<std::string> prefixes = {"std::pair<", "std::tuple<"};
 
    EnsureMatchingOnDiskField(desc, kDiffTypeName).ThrowOnError();
-   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
-   EnsureMatchingTypePrefix(fieldDesc, prefixes).ThrowOnError();
+   EnsureMatchingTypePrefix(desc, prefixes).ThrowOnError();
 
+   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
    const auto nOnDiskSubfields = fieldDesc.GetLinkIds().size();
    if (nOnDiskSubfields != 2) {
       throw ROOT::RException(
@@ -1232,9 +1232,9 @@ void ROOT::RTupleField::ReconcileOnDiskField(const RNTupleDescriptor &desc)
    static const std::vector<std::string> prefixes = {"std::pair<", "std::tuple<"};
 
    EnsureMatchingOnDiskField(desc, kDiffTypeName).ThrowOnError();
-   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
-   EnsureMatchingTypePrefix(fieldDesc, prefixes).ThrowOnError();
+   EnsureMatchingTypePrefix(desc, prefixes).ThrowOnError();
 
+   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
    const auto nOnDiskSubfields = fieldDesc.GetLinkIds().size();
    const auto nSubfields = fSubfields.size();
    if (nOnDiskSubfields != nSubfields) {
@@ -1394,9 +1394,9 @@ void ROOT::RVariantField::ReconcileOnDiskField(const RNTupleDescriptor &desc)
    static const std::vector<std::string> prefixes = {"std::variant<"};
 
    EnsureMatchingOnDiskField(desc, kDiffTypeName).ThrowOnError();
-   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
-   EnsureMatchingTypePrefix(fieldDesc, prefixes).ThrowOnError();
+   EnsureMatchingTypePrefix(desc, prefixes).ThrowOnError();
 
+   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
    if (fSubfields.size() != fieldDesc.GetLinkIds().size()) {
       throw RException(R__FAIL("number of variants on-disk do not match for " + GetQualifiedFieldName()));
    }

tree/ntuple/src/RFieldSequenceContainer.cxx

@@ -86,8 +86,7 @@ void ROOT::RArrayField::ReconcileOnDiskField(const RNTupleDescriptor &desc)
    static const std::vector<std::string> prefixes = {"std::array<"};
 
    EnsureMatchingOnDiskField(desc, kDiffTypeName).ThrowOnError();
-   const auto &fieldDesc = desc.GetFieldDescriptor(GetOnDiskId());
-   EnsureMatchingTypePrefix(fieldDesc, prefixes).ThrowOnError();
+   EnsureMatchingTypePrefix(desc, prefixes).ThrowOnError();
 }
 
 void ROOT::RArrayField::ConstructValue(void *where) const