[ntuple] merge version to/from in extra type info

Author: jblomer

tree/ntuple/v7/doc/specifications.md

@@ -592,13 +592,11 @@ The type information record frame has the following contents followed by a strin
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 +                       Content Identifier                      +
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                        Type Version From                      |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                         Type Version To                       |
+|                          Type Version                         |
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 ```
 
-The combination of type version from/to, type name, and content identifier should be unique in the list.
+The combination of type version, type name, and content identifier should be unique in the list.
 However, not every type needs to provide additional type information.
 
 The following kinds of content are supported:
@@ -609,7 +607,7 @@ The following kinds of content are supported:
 
 The serialized ROOT streamer info is not bound to a specific type.
 It is the combined streamer information from all fields serialized by the ROOT streamer.
-Writers set version from/to to zero and use an empty type name.
+Writers set the version to zero and use an empty type name.
 Readers should ignore the type-specific information.
 The format of the content is a ROOT streamed `TList` of `TStreamerInfo` objects.
 

tree/ntuple/v7/inc/ROOT/RNTupleDescriptor.hxx

@@ -481,9 +481,8 @@ class RExtraTypeInfoDescriptor {
 private:
    /// Specifies the meaning of the extra information
    EExtraTypeInfoIds fContentId = EExtraTypeInfoIds::kInvalid;
-   /// Extra type information restricted to a certain version range of the type
-   std::uint32_t fTypeVersionFrom = 0;
-   std::uint32_t fTypeVersionTo = 0;
+   /// Type version the extra type information is bound to
+   std::uint32_t fTypeVersion = 0;
    /// The type name the extra information refers to; empty for RNTuple-wide extra information
    std::string fTypeName;
    /// The content format depends on the content ID and may be binary
@@ -501,8 +500,7 @@ public:
    RExtraTypeInfoDescriptor Clone() const;
 
    EExtraTypeInfoIds GetContentId() const { return fContentId; }
-   std::uint32_t GetTypeVersionFrom() const { return fTypeVersionFrom; }
-   std::uint32_t GetTypeVersionTo() const { return fTypeVersionTo; }
+   std::uint32_t GetTypeVersion() const { return fTypeVersion; }
    const std::string &GetTypeName() const { return fTypeName; }
    const std::string &GetContent() const { return fContent; }
 };
@@ -1325,14 +1323,9 @@ public:
       fExtraTypeInfo.fContentId = contentId;
       return *this;
    }
-   RExtraTypeInfoDescriptorBuilder &TypeVersionFrom(std::uint32_t typeVersionFrom)
-   {
-      fExtraTypeInfo.fTypeVersionFrom = typeVersionFrom;
-      return *this;
-   }
-   RExtraTypeInfoDescriptorBuilder &TypeVersionTo(std::uint32_t typeVersionTo)
+   RExtraTypeInfoDescriptorBuilder &TypeVersion(std::uint32_t typeVersion)
    {
-      fExtraTypeInfo.fTypeVersionTo = typeVersionTo;
+      fExtraTypeInfo.fTypeVersion = typeVersion;
       return *this;
    }
    RExtraTypeInfoDescriptorBuilder &TypeName(const std::string &typeName)

tree/ntuple/v7/src/RField.cxx

@@ -2212,8 +2212,7 @@ ROOT::Experimental::RExtraTypeInfoDescriptor ROOT::Experimental::RUnsplitField::
 {
    Internal::RExtraTypeInfoDescriptorBuilder extraTypeInfoBuilder;
    extraTypeInfoBuilder.ContentId(EExtraTypeInfoIds::kStreamerInfo)
-      .TypeVersionFrom(GetTypeVersion())
-      .TypeVersionTo(GetTypeVersion())
+      .TypeVersion(GetTypeVersion())
       .TypeName(GetTypeName())
       .Content(Internal::RNTupleSerializer::SerializeStreamerInfos(fStreamerInfos));
    return extraTypeInfoBuilder.MoveDescriptor().Unwrap();

tree/ntuple/v7/src/RNTupleDescriptor.cxx

@@ -240,16 +240,14 @@ ROOT::Experimental::RClusterDescriptor ROOT::Experimental::RClusterDescriptor::C
 
 bool ROOT::Experimental::RExtraTypeInfoDescriptor::operator==(const RExtraTypeInfoDescriptor &other) const
 {
-   return fContentId == other.fContentId && fTypeName == other.fTypeName &&
-          fTypeVersionFrom == other.fTypeVersionFrom && fTypeVersionTo == other.fTypeVersionTo;
+   return fContentId == other.fContentId && fTypeName == other.fTypeName && fTypeVersion == other.fTypeVersion;
 }
 
 ROOT::Experimental::RExtraTypeInfoDescriptor ROOT::Experimental::RExtraTypeInfoDescriptor::Clone() const
 {
    RExtraTypeInfoDescriptor clone;
    clone.fContentId = fContentId;
-   clone.fTypeVersionFrom = fTypeVersionFrom;
-   clone.fTypeVersionTo = fTypeVersionTo;
+   clone.fTypeVersion = fTypeVersion;
    clone.fTypeName = fTypeName;
    clone.fContent = fContent;
    return clone;

tree/ntuple/v7/src/RNTupleSerialize.cxx

@@ -337,8 +337,7 @@ std::uint32_t SerializeExtraTypeInfo(const ROOT::Experimental::RExtraTypeInfoDes
    pos += RNTupleSerializer::SerializeRecordFramePreamble(*where);
 
    pos += RNTupleSerializer::SerializeExtraTypeInfoId(desc.GetContentId(), *where);
-   pos += RNTupleSerializer::SerializeUInt32(desc.GetTypeVersionFrom(), *where);
-   pos += RNTupleSerializer::SerializeUInt32(desc.GetTypeVersionTo(), *where);
+   pos += RNTupleSerializer::SerializeUInt32(desc.GetTypeVersion(), *where);
    pos += RNTupleSerializer::SerializeString(desc.GetTypeName(), *where);
    pos += RNTupleSerializer::SerializeString(desc.GetContent(), *where);
 
@@ -376,17 +375,15 @@ RResult<std::uint32_t> DeserializeExtraTypeInfo(const void *buffer, std::uint64_
    bytes += result.Unwrap();
 
    EExtraTypeInfoIds contentId{EExtraTypeInfoIds::kInvalid};
-   std::uint32_t typeVersionFrom;
-   std::uint32_t typeVersionTo;
-   if (fnFrameSizeLeft() < 3 * sizeof(std::uint32_t)) {
+   std::uint32_t typeVersion;
+   if (fnFrameSizeLeft() < 2 * sizeof(std::uint32_t)) {
       return R__FAIL("extra type info record frame too short");
    }
    result = RNTupleSerializer::DeserializeExtraTypeInfoId(bytes, contentId);
    if (!result)
       return R__FORWARD_ERROR(result);
    bytes += result.Unwrap();
-   bytes += RNTupleSerializer::DeserializeUInt32(bytes, typeVersionFrom);
-   bytes += RNTupleSerializer::DeserializeUInt32(bytes, typeVersionTo);
+   bytes += RNTupleSerializer::DeserializeUInt32(bytes, typeVersion);
 
    std::string typeName;
    std::string content;
@@ -400,8 +397,7 @@ RResult<std::uint32_t> DeserializeExtraTypeInfo(const void *buffer, std::uint64_
    bytes += result.Unwrap();
 
    desc.ContentId(contentId)
-      .TypeVersionFrom(typeVersionFrom)
-      .TypeVersionTo(typeVersionTo)
+      .TypeVersion(typeVersion)
       .TypeName(typeName)
       .Content(content);
 

tree/ntuple/v7/test/ntuple_serialize.cxx

@@ -649,8 +649,7 @@ TEST(RNTuple, SerializeHeader)
    EXPECT_EQ(1u, desc.GetNExtraTypeInfos());
    const auto &extraTypeInfoDesc = *desc.GetExtraTypeInfoIterable().begin();
    EXPECT_EQ(EExtraTypeInfoIds::kStreamerInfo, extraTypeInfoDesc.GetContentId());
-   EXPECT_EQ(0u, extraTypeInfoDesc.GetTypeVersionFrom());
-   EXPECT_EQ(0u, extraTypeInfoDesc.GetTypeVersionTo());
+   EXPECT_EQ(0u, extraTypeInfoDesc.GetTypeVersion());
    EXPECT_TRUE(extraTypeInfoDesc.GetTypeName().empty());
    EXPECT_STREQ("xyz", extraTypeInfoDesc.GetContent().c_str());
 }
@@ -922,8 +921,7 @@ TEST(RNTuple, SerializeFooterXHeader)
    EXPECT_EQ(1u, desc.GetNExtraTypeInfos());
    const auto &extraTypeInfoDesc = *desc.GetExtraTypeInfoIterable().begin();
    EXPECT_EQ(EExtraTypeInfoIds::kStreamerInfo, extraTypeInfoDesc.GetContentId());
-   EXPECT_EQ(0u, extraTypeInfoDesc.GetTypeVersionFrom());
-   EXPECT_EQ(0u, extraTypeInfoDesc.GetTypeVersionTo());
+   EXPECT_EQ(0u, extraTypeInfoDesc.GetTypeVersion());
    EXPECT_TRUE(extraTypeInfoDesc.GetTypeName().empty());
    EXPECT_STREQ("xyz", extraTypeInfoDesc.GetContent().c_str());
 }