From f98dfb874fe264fed2a8a02d1bd226167f56b0dc Mon Sep 17 00:00:00 2001 From: Jakob Blomer Date: Mon, 28 Oct 2024 16:36:17 +0100 Subject: [PATCH] [ntuple] bump anchor version to v1.0.0.0 --- tree/ntuple/v7/inc/ROOT/RNTuple.hxx | 4 ++-- tree/ntuple/v7/src/RPageStorageDaos.cxx | 7 ------- tree/ntuple/v7/src/RPageStorageFile.cxx | 6 ------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/tree/ntuple/v7/inc/ROOT/RNTuple.hxx b/tree/ntuple/v7/inc/ROOT/RNTuple.hxx index 9632f7ff7aa8cd..2134f8e8f9a611 100644 --- 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 index 9afadc7d1b68d0..07b9929d6045ee 100644 --- 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(anchor.fLenHeader); diff --git a/tree/ntuple/v7/src/RPageStorageFile.cxx b/tree/ntuple/v7/src/RPageStorageFile.cxx index 6d692b5e8e0890..a7d8ddb984147c 100644 --- 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());