[ntuple] bump anchor version to v1.0.0.0

root-project · Oct 28, 2024 · f98dfb8 · f98dfb8
1 parent 8b4f6ce
commit f98dfb8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/tree/ntuple/v7/inc/ROOT/RNTuple.hxx b/tree/ntuple/v7/inc/ROOT/RNTuple.hxx
@@ -65,8 +65,8 @@ class RNTuple final {
    friend class Experimental::Internal::RPageSourceFile;
 
 public:
-   static constexpr std::uint16_t kVersionEpoch = 0;
-   static constexpr std::uint16_t kVersionMajor = 3;
+   static constexpr std::uint16_t kVersionEpoch = 1;
+   static constexpr std::uint16_t kVersionMajor = 0;
    static constexpr std::uint16_t kVersionMinor = 0;
    static constexpr std::uint16_t kVersionPatch = 0;
 

diff --git a/tree/ntuple/v7/src/RPageStorageDaos.cxx b/tree/ntuple/v7/src/RPageStorageDaos.cxx
@@ -172,13 +172,6 @@ struct RDaosContainerNTupleLocator {
          throw ROOT::Experimental::RException(
             R__FAIL("unsupported RNTuple epoch version: " + std::to_string(anchor.fVersionEpoch)));
       }
-      if (anchor.fVersionEpoch == 0) {
-         static std::once_flag once;
-         std::call_once(once, [&anchor]() {
-            R__LOG_WARNING(ROOT::Experimental::NTupleLog())
-               << "Pre-release format version: RC " << anchor.fVersionMajor;
-         });
-      }
 
       builder.SetOnDiskHeaderSize(anchor.fNBytesHeader);
       buffer = std::make_unique<unsigned char[]>(anchor.fLenHeader);

diff --git a/tree/ntuple/v7/src/RPageStorageFile.cxx b/tree/ntuple/v7/src/RPageStorageFile.cxx
@@ -322,12 +322,6 @@ void ROOT::Experimental::Internal::RPageSourceFile::LoadStructureImpl()
    if (fAnchor->GetVersionEpoch() != RNTuple::kVersionEpoch) {
       throw RException(R__FAIL("unsupported RNTuple epoch version: " + std::to_string(fAnchor->GetVersionEpoch())));
    }
-   if (fAnchor->GetVersionEpoch() == 0) {
-      static std::once_flag once;
-      std::call_once(once, [this]() {
-         R__LOG_WARNING(NTupleLog()) << "Pre-release format version: RC " << fAnchor->GetVersionMajor();
-      });
-   }
 
    fDescriptorBuilder.SetOnDiskHeaderSize(fAnchor->GetNBytesHeader());
    fDescriptorBuilder.AddToOnDiskFooterSize(fAnchor->GetNBytesFooter());