[ntuple] Binary format version 1.0.0.0

core/testsupport/src/TestSupport.cxx

@@ -57,16 +57,6 @@ static struct ForbidDiagnostics {
       }
 
       // FIXME: RNTuple warns that it's in beta stage.
-      if (level == kWarning
-          && strstr(msg, "The RNTuple file format will change. Do not store real data with this version of RNTuple!") != nullptr) {
-        std::cerr << "Warning in " << location << " " << msg << std::endl;
-        return;
-      }
-      if (level == kWarning
-          && strstr(msg, "Pre-release format version: RC ") != nullptr) {
-        std::cerr << "Warning in " << location << " " << msg << std::endl;
-        return;
-      }
       if (level == kWarning && strstr(msg, "Merging RNTuples is experimental") != nullptr) {
          std::cerr << "Warning in " << location << " " << msg << std::endl;
          return;

tree/ntuple/v7/doc/BinaryFormatSpecification.md

@@ -1,6 +1,4 @@
-# RNTuple Binary Format Specification 0.3.0.0
-
-**Note:** This is work in progress. The RNTuple specification is not yet finalized.
+# RNTuple Binary Format Specification 1.0.0.0
 
 ## Versioning Notes
 
@@ -9,7 +7,7 @@ It uses the following scheme: EPOCH.MAJOR.MINOR.PATCH
 
 _Epoch_: an increment of the epoch indicates backward-incompatible changes.
 The RNTuple pre-release has epoch 0.
-The first public release will get epoch 1.
+The first public release has epoch 1.
 There is currently no further epoch foreseen.
 
 _Major_: an increment of the major version indicates forward-incompatible changes.

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

@@ -76,8 +76,8 @@ class RNTuple final {
       std::uint64_t nbytesFooter, std::uint64_t lenFooter, std::uint64_t maxKeySize);
 
 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;
 

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);

tree/ntuple/v7/src/RPageStorageFile.cxx

@@ -47,11 +47,6 @@ ROOT::Experimental::Internal::RPageSinkFile::RPageSinkFile(std::string_view ntup
                                                            const RNTupleWriteOptions &options)
    : RPagePersistentSink(ntupleName, options)
 {
-   static std::once_flag once;
-   std::call_once(once, []() {
-      R__LOG_WARNING(NTupleLog()) << "The RNTuple file format will change. "
-                                  << "Do not store real data with this version of RNTuple!";
-   });
    fCompressor = std::make_unique<RNTupleCompressor>();
    EnableDefaultMetrics("RPageSinkFile");
    fFeatures.fCanMergePages = true;
@@ -322,12 +317,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());

tree/ntuple/v7/test/ntuple_merger.cxx

@@ -734,8 +734,6 @@ TEST(RNTupleMerger, MergeThroughTFileMergerIncremental)
 TEST(RNTupleMerger, MergeThroughTFileMergerKey)
 {
    ROOT::TestSupport::CheckDiagsRAII diags;
-   diags.optionalDiag(kWarning, "RPageSinkFile", "The RNTuple file format will change.", false);
-   diags.optionalDiag(kWarning, "[ROOT.NTuple]", "Pre-release format version: RC 2", false);
    diags.requiredDiag(kWarning, "TFileMerger", "Merging RNTuples is experimental");
    diags.requiredDiag(kError, "RNTuple::Merge", "Output file already has key, but not of type RNTuple!");
    diags.requiredDiag(kError, "TFileMerger", "Could NOT merge RNTuples!");
@@ -774,8 +772,6 @@ TEST(RNTupleMerger, MergeThroughTFileMergerKey)
 TEST(RNTupleMerger, MergeThroughTBufferMerger)
 {
    ROOT::TestSupport::CheckDiagsRAII diags;
-   diags.optionalDiag(kWarning, "RPageSinkFile", "The RNTuple file format will change.", false);
-   diags.optionalDiag(kWarning, "[ROOT.NTuple]", "Pre-release format version: RC 2", false);
    diags.requiredDiag(kWarning, "TFileMerger", "Merging RNTuples is experimental");
    diags.requiredDiag(kWarning, "TBufferMergerFile", "not attached to the directory", false);
 

tree/ntuple/v7/test/ntuple_storage.cxx

@@ -487,7 +487,7 @@ TEST(RNTuple, WritePageBudget)
 #ifdef R__HAS_DAVIX
 TEST(RNTuple, OpenHTTP)
 {
-   std::unique_ptr<TFile> file(TFile::Open("http://root.cern/files/tutorials/ntpl004_dimuon_v1rc3.root"));
+   std::unique_ptr<TFile> file(TFile::Open("http://root.cern/files/tutorials/ntpl004_dimuon_v1.root"));
    auto Events = std::unique_ptr<ROOT::RNTuple>(file->Get<ROOT::RNTuple>("Events"));
    auto model = RNTupleModel::Create();
    model->MakeField<ROOT::RNTupleCardinality<std::uint32_t>>("nMuon");

tree/ntuple/v7/test/ntuple_storage_daos.cxx

@@ -26,7 +26,6 @@ class RPageStorageDaos : public ::testing::Test {
       // Initialized at the start of each test to expect diagnostic messages from TestSupport
       fRootDiags.optionalDiag(kWarning, "ROOT::Experimental::Internal::RPageSinkDaos::RPageSinkDaos",
                               "The DAOS backend is experimental and still under development.", false);
-      fRootDiags.optionalDiag(kWarning, "[ROOT.NTuple]", "Pre-release format version: RC 3", false);
       fRootDiags.optionalDiag(kWarning, "in int daos_init()",
                               "This RNTuple build uses libdaos_mock. Use only for testing!");
    }

tree/ntuple/v7/test/rfield_class.cxx

@@ -233,8 +233,6 @@ TEST(RNTuple, TClassReadRules)
 {
    ROOT::TestSupport::CheckDiagsRAII diags;
    diags.requiredDiag(kWarning, "[ROOT.NTuple]", "ignoring I/O customization rule with non-transient member: a", false);
-   diags.optionalDiag(kWarning, "[ROOT.NTuple]", "The RNTuple file format will change.", false);
-   diags.optionalDiag(kWarning, "[ROOT.NTuple]", "Pre-release format version: RC 2", false);
 
    FileRaii fileGuard("test_ntuple_tclassrules.root");
    char c[4] = {'R', 'O', 'O', 'T'};

tutorials/v7/ntuple/ntpl001_staff.C

@@ -12,8 +12,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleReader.hxx>

tutorials/v7/ntuple/ntpl002_vector.C

@@ -10,8 +10,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleReader.hxx>

tutorials/v7/ntuple/ntpl004_dimuon.C

@@ -14,8 +14,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RDataFrame.hxx>
 #include <ROOT/RNTupleDS.hxx>
@@ -37,7 +36,7 @@
 // Import classes from experimental namespace for the time being
 using RNTupleDS = ROOT::Experimental::RNTupleDS;
 
-constexpr char const *kNTupleFileName = "http://root.cern/files/tutorials/ntpl004_dimuon_v1rc3.root";
+constexpr char const *kNTupleFileName = "http://root.cern/files/tutorials/ntpl004_dimuon_v1.root";
 
 using namespace ROOT::VecOps;
 

tutorials/v7/ntuple/ntpl005_introspection.C

@@ -11,8 +11,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleReader.hxx>

tutorials/v7/ntuple/ntpl006_friends.C

@@ -10,8 +10,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleReader.hxx>

tutorials/v7/ntuple/ntpl007_mtFill.C

@@ -10,8 +10,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/REntry.hxx>
 #include <ROOT/RNTupleModel.hxx>

tutorials/v7/ntuple/ntpl008_import.C

@@ -10,8 +10,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RNTupleDS.hxx>
 #include <ROOT/RNTupleImporter.hxx>

tutorials/v7/ntuple/ntpl009_parallelWriter.C

@@ -10,8 +10,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RNTupleFillContext.hxx>
 #include <ROOT/RNTupleModel.hxx>

tutorials/v7/ntuple/ntpl010_skim.C

@@ -10,8 +10,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleReader.hxx>

tutorials/v7/ntuple/ntpl011_global_temperatures.C

@@ -14,8 +14,8 @@
 /// \author John Yoon
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data! During ROOT setup, configure the following flags:
+// Functionality and interface are still subject to changes.
+// During ROOT setup, configure the following flags:
 // `-DCMAKE_CXX_STANDARD=17 -Droot7=ON -Dwebgui=ON`
 
 #include <ROOT/RDataFrame.hxx>

tutorials/v7/ntuple/ntpl012_processor.C

@@ -10,8 +10,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleWriter.hxx>

tutorials/v7/ntuple/ntpl013_staged.C

@@ -9,8 +9,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/RNTupleFillContext.hxx>
 #include <ROOT/RNTupleModel.hxx>

tutorials/v7/ntuple/ntpl014_framework.C

@@ -25,8 +25,7 @@
 /// \author The ROOT Team
 
 // NOTE: The RNTuple classes are experimental at this point.
-// Functionality, interface, and data format is still subject to changes.
-// Do not use for real data!
+// Functionality and interface are still subject to changes.
 
 #include <ROOT/REntry.hxx>
 #include <ROOT/RNTupleFillContext.hxx>