[ntuple] ensure valid descriptor in AddAliasColumn/AddColumnRepresentation

silverweed · silverweed · commit 9eaef1b8f1bb · 2026-06-17T17:07:04.000+02:00
Also set the anchor version in InitFromDescriptor().
diff --git a/tree/ntuple/src/RPageStorage.cxx b/tree/ntuple/src/RPageStorage.cxx
@@ -1077,6 +1077,7 @@ ROOT::Internal::RPagePersistentSink::InitFromDescriptor(const ROOT::RNTupleDescr
 {
    // Create new descriptor
    fDescriptorBuilder.SetSchemaFromExisting(srcDescriptor);
+   fDescriptorBuilder.SetVersionForWriting();
    const auto &descriptor = fDescriptorBuilder.GetDescriptor();
 
    // Create column/page ranges
@@ -1215,6 +1216,8 @@ ROOT::Internal::RPagePersistentSink::AddColumnRepresentation(const ROOT::RFieldD
       ++columnIndex;
    }
 
+   fDescriptorBuilder.EnsureValidDescriptor().ThrowOnError();
+
    return firstPhysicalIndex;
 }
 
@@ -1238,6 +1241,8 @@ void ROOT::Internal::RPagePersistentSink::AddAliasColumn(const ROOT::RNTupleDesc
       .FirstElementIndex(pointedColumn.GetFirstElementIndex())
       .RepresentationIndex(pointedColumn.GetRepresentationIndex());
    fDescriptorBuilder.AddColumn(columnBuilder.MakeDescriptor().Unwrap());
+
+   fDescriptorBuilder.EnsureValidDescriptor().ThrowOnError();
 }
 
 void ROOT::Internal::RPagePersistentSink::CommitSuppressedColumn(ColumnHandle_t columnHandle)

Original file line number	Diff line number	Diff line change
`@@ -1077,6 +1077,7 @@ ROOT::Internal::RPagePersistentSink::InitFromDescriptor(const ROOT::RNTupleDescr`
`1077`	`1077`	`{`
`1078`	`1078`	`// Create new descriptor`
`1079`	`1079`	`fDescriptorBuilder.SetSchemaFromExisting(srcDescriptor);`
	`1080`	`+ fDescriptorBuilder.SetVersionForWriting();`
`1080`	`1081`	`const auto &descriptor = fDescriptorBuilder.GetDescriptor();`
`1081`	`1082`
`1082`	`1083`	`// Create column/page ranges`
`@@ -1215,6 +1216,8 @@ ROOT::Internal::RPagePersistentSink::AddColumnRepresentation(const ROOT::RFieldD`
`1215`	`1216`	`++columnIndex;`
`1216`	`1217`	`}`
`1217`	`1218`
	`1219`	`+ fDescriptorBuilder.EnsureValidDescriptor().ThrowOnError();`
	`1220`	`+`
`1218`	`1221`	`return firstPhysicalIndex;`
`1219`	`1222`	`}`
`1220`	`1223`
`@@ -1238,6 +1241,8 @@ void ROOT::Internal::RPagePersistentSink::AddAliasColumn(const ROOT::RNTupleDesc`
`1238`	`1241`	`.FirstElementIndex(pointedColumn.GetFirstElementIndex())`
`1239`	`1242`	`.RepresentationIndex(pointedColumn.GetRepresentationIndex());`
`1240`	`1243`	`fDescriptorBuilder.AddColumn(columnBuilder.MakeDescriptor().Unwrap());`
	`1244`	`+`
	`1245`	`+ fDescriptorBuilder.EnsureValidDescriptor().ThrowOnError();`
`1241`	`1246`	`}`
`1242`	`1247`
`1243`	`1248`	`void ROOT::Internal::RPagePersistentSink::CommitSuppressedColumn(ColumnHandle_t columnHandle)`