[ntuple] Rename RPageSink::CreateNewWithNewRNTuple -> DeriveFor

Author: silverweed

tree/ntuple/inc/ROOT/RPageNullSink.hxx

@@ -106,7 +106,10 @@ public:
    void CommitStagedClusters(std::span<RStagedCluster>) final {}
    void CommitClusterGroup() final {}
    void CommitDatasetImpl() final {}
-   std::unique_ptr<RPageSink> CreateNewWithNewRNTuple(std::string_view) const final { return nullptr; }
+   std::unique_ptr<RPageSink> DeriveFor(std::string_view, const ROOT::RNTupleWriteOptions &) const final
+   {
+      return nullptr;
+   }
 };
 
 } // namespace Internal

tree/ntuple/inc/ROOT/RPageSinkBuf.hxx

@@ -149,9 +149,9 @@ public:
 
    RPage ReservePage(ColumnHandle_t columnHandle, std::size_t nElements) final;
 
-   std::unique_ptr<RPageSink> CreateNewWithNewRNTuple(std::string_view newName) const final
+   std::unique_ptr<RPageSink> DeriveFor(std::string_view newName, const ROOT::RNTupleWriteOptions &opts) const final
    {
-      return std::make_unique<RPageSinkBuf>(fInnerSink->CreateNewWithNewRNTuple(newName));
+      return std::make_unique<RPageSinkBuf>(fInnerSink->DeriveFor(newName, opts));
    }
 }; // RPageSinkBuf
 

tree/ntuple/inc/ROOT/RPageStorage.hxx

@@ -315,7 +315,7 @@ public:
 
    /// Creates a new RPageSink linked to the same underlying storage as this, writing to a new RNTuple called `newName`.
    /// The existing sink will stay valid. The existing sink and the new one must not write concurrently.
-   virtual std::unique_ptr<RPageSink> CreateNewWithNewRNTuple(std::string_view newName) const = 0;
+   virtual std::unique_ptr<RPageSink> DeriveFor(std::string_view newName, const RNTupleWriteOptions &opts) const = 0;
 
    /// Physically creates the storage container to hold the ntuple (e.g., a keys a TFile or an S3 bucket)
    /// Init() associates column handles to the columns referenced by the model

tree/ntuple/inc/ROOT/RPageStorageDaos.hxx

@@ -142,7 +142,7 @@ public:
    RPageSinkDaos(std::string_view ntupleName, std::string_view uri, const ROOT::RNTupleWriteOptions &options);
    ~RPageSinkDaos() override;
 
-   std::unique_ptr<RPageSink> CreateNewWithNewRNTuple(std::string_view) const final;
+   std::unique_ptr<RPageSink> DeriveFor(std::string_view, const ROOT::RNTupleWriteOptions &) const final;
 }; // class RPageSinkDaos
 
 // clang-format off

tree/ntuple/inc/ROOT/RPageStorageFile.hxx

@@ -99,7 +99,7 @@ public:
    RPageSinkFile &operator=(RPageSinkFile &&) = default;
    ~RPageSinkFile() override;
 
-   std::unique_ptr<RPageSink> CreateNewWithNewRNTuple(std::string_view) const final;
+   std::unique_ptr<RPageSink> DeriveFor(std::string_view newName, const ROOT::RNTupleWriteOptions &opts) const final;
 
    ROOT::Internal::RNTupleFileWriter *GetUnderlyingWriter() const { return fWriter.get(); }
 }; // class RPageSinkFile

tree/ntuple/src/RNTupleParallelWriter.cxx

@@ -111,9 +111,9 @@ class RPageSynchronizingSink : public RPageSink {
    {
       throw ROOT::RException(R__FAIL("should never commit dataset via RPageSynchronizingSink"));
    }
-   std::unique_ptr<RPageSink> CreateNewWithNewRNTuple(std::string_view) const final
+   std::unique_ptr<RPageSink> DeriveFor(std::string_view, const ROOT::RNTupleWriteOptions &) const final
    {
-      throw ROOT::RException(R__FAIL("CreateNewWithNewRNTuple unavailable for RPageSynchronizingSink"));
+      throw ROOT::RException(R__FAIL("DeriveFor unavailable for RPageSynchronizingSink"));
    }
 
    RSinkGuard GetSinkGuard() final { return RSinkGuard(fMutex); }

tree/ntuple/src/RPageStorageDaos.cxx

@@ -484,7 +484,7 @@ void ROOT::Experimental::Internal::RPageSinkDaos::WriteNTupleAnchor()
 }
 
 std::unique_ptr<ROOT::Internal::RPageSink>
-ROOT::Experimental::Internal::RPageSinkDaos::CreateNewWithNewRNTuple(std::string_view) const
+ROOT::Experimental::Internal::RPageSinkDaos::DeriveFor(std::string_view, const ROOT::RNTupleWriteOptions &) const
 {
    throw ROOT::RException(R__FAIL("this method is not available for the DAOS backend"));
 }

tree/ntuple/src/RPageStorageFile.cxx

@@ -253,15 +253,13 @@ void ROOT::Internal::RPageSinkFile::CommitDatasetImpl(unsigned char *serializedF
 }
 
 std::unique_ptr<ROOT::Internal::RPageSink>
-ROOT::Internal::RPageSinkFile::CreateNewWithNewRNTuple(std::string_view newName) const
+ROOT::Internal::RPageSinkFile::DeriveFor(std::string_view newName, const ROOT::RNTupleWriteOptions &opts) const
 {
    if (auto *dir = Internal::GetUnderlyingDirectory(*fWriter)) {
-      auto opts = ROOT::RNTupleWriteOptions();
-      opts.SetCompression(GetWriteOptions().GetCompression());
       return std::make_unique<ROOT::Internal::RPageSinkFile>(newName, *dir, opts);
    }
    // TODO: support this method also for non-TFile-based writers
-   throw ROOT::RException(R__FAIL("cannot CreateNewWithNewRNTuple a non-TFile-based Sink."));
+   throw ROOT::RException(R__FAIL("cannot call DeriveFor on a non-TFile-based Sink."));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

tree/ntuple/test/ntuple_endian.cxx

@@ -59,7 +59,7 @@ class RPageSinkMock : public RPageSink {
    void CommitStagedClusters(std::span<RStagedCluster>) final {}
    void CommitClusterGroup() final {}
    void CommitDatasetImpl() final {}
-   std::unique_ptr<RPageSink> CreateNewWithNewRNTuple(std::string_view) const final
+   std::unique_ptr<RPageSink> DeriveFor(std::string_view, const ROOT::RNTupleWriteOptions &) const final
    {
       R__ASSERT(false);
       return nullptr;

tree/ntuple/test/ntuple_storage.cxx

@@ -54,7 +54,7 @@ class RPageSinkMock : public RPageSink {
    void CommitStagedClusters(std::span<RStagedCluster>) final {}
    void CommitClusterGroup() final {}
    void CommitDatasetImpl() final {}
-   std::unique_ptr<RPageSink> CreateNewWithNewRNTuple(std::string_view) const final
+   std::unique_ptr<RPageSink> DeriveFor(std::string_view, const ROOT::RNTupleWriteOptions &) const final
    {
       R__ASSERT(false);
       return nullptr;