Removed cloning code from RNTuple implementation

Cloning is not an option for RNTuple.

Author: Dr15Jones

FWIO/RNTupleTempInput/src/RNTupleTempSource.cc

@@ -163,9 +163,6 @@ namespace edm::rntuple_temp {
 
   std::shared_ptr<FileBlock> RNTupleTempSource::readFile_() {
     std::shared_ptr<FileBlock> fb = primaryFileSequence_->readFile_();
-    if (secondaryFileSequence_) {
-      fb->setNotFastClonable(FileBlock::HasSecondaryFileSequence);
-    }
     return fb;
   }
 

FWIO/RNTupleTempInput/src/RootFile.cc

@@ -179,7 +179,6 @@ namespace edm::rntuple_temp {
         noRunLumiSort_(processingOptions.noRunLumiSort),
         noEventSort_(processingOptions.noEventSort),
         enforceGUIDInFileName_(fileOptions.enforceGUIDInFileName),
-        whyNotFastClonable_(0),
         hasNewlyDroppedBranch_(),
         branchListIndexesUnchanged_(false),
         eventAuxCache_(),
@@ -405,11 +404,6 @@ namespace edm::rntuple_temp {
     // propagate_const<T> has no reset() function
     provenanceReaderMaker_ = std::unique_ptr<MakeProvenanceReader>(makeProvenanceReaderMaker(inputType).release());
 
-    // Merge into the hashed registries.
-    if (eventSkipperByID_ && eventSkipperByID_->somethingToSkip()) {
-      whyNotFastClonable_ += FileBlock::EventsOrLumisSelectedByID;
-    }
-
     initializeDuplicateChecker(crossFileInfo.indexesIntoFiles, crossFileInfo.currentIndexIntoFile);
     indexIntoFileIter_ = indexIntoFileBegin_ = indexIntoFile_.begin(
         processingOptions.noRunLumiSort
@@ -528,9 +522,6 @@ namespace edm::rntuple_temp {
       }
     }
 
-    // Determine if this file is fast clonable.
-    setIfFastClonable(processingOptions.remainingEvents, processingOptions.remainingLumis);
-
     // We are done with our initial reading of EventAuxiliary.
     indexIntoFile_.doneFileInitialization();
 
@@ -630,51 +621,6 @@ namespace edm::rntuple_temp {
     }
   }
 
-  void RootFile::setIfFastClonable(int remainingEvents, int remainingLumis) {
-    if (fileFormatVersion().noMetaDataTrees() and !fileFormatVersion().storedProductProvenanceUsed()) {
-      //we must avoid copying the old branch which stored the per product per event provenance
-      whyNotFastClonable_ += FileBlock::FileTooOld;
-      return;
-    }
-    if (!fileFormatVersion().splitProductIDs()) {
-      whyNotFastClonable_ += FileBlock::FileTooOld;
-      return;
-    }
-    if (processingMode_ != InputSource::RunsLumisAndEvents) {
-      whyNotFastClonable_ += FileBlock::NotProcessingEvents;
-      return;
-    }
-    // Find entry for first event in file
-    IndexIntoFile::IndexIntoFileItr it = indexIntoFileBegin_;
-    while (it != indexIntoFileEnd_ && it.getEntryType() != IndexIntoFile::kEvent) {
-      ++it;
-    }
-    if (it == indexIntoFileEnd_) {
-      whyNotFastClonable_ += FileBlock::NoEventsInFile;
-      return;
-    }
-
-    // From here on, record all reasons we can't fast clone.
-    IndexIntoFile::SortOrder sortOrder =
-        (noRunLumiSort_ ? IndexIntoFile::entryOrder
-                        : (noEventSort_ ? IndexIntoFile::firstAppearanceOrder : IndexIntoFile::numericalOrder));
-    if (!indexIntoFile_.iterationWillBeInEntryOrder(sortOrder)) {
-      whyNotFastClonable_ += (noEventSort_ ? FileBlock::RunOrLumiNotContiguous : FileBlock::EventsToBeSorted);
-    }
-    if (skipAnyEvents_) {
-      whyNotFastClonable_ += FileBlock::InitialEventsSkipped;
-    }
-    if (remainingEvents >= 0 && eventTree_.entries() > remainingEvents) {
-      whyNotFastClonable_ += FileBlock::MaxEventsTooSmall;
-    }
-    if (remainingLumis >= 0 && lumiTree_.entries() > remainingLumis) {
-      whyNotFastClonable_ += FileBlock::MaxLumisTooSmall;
-    }
-    if (duplicateChecker_ && !duplicateChecker_->checkDisabled() && !duplicateChecker_->noDuplicatesInFile()) {
-      whyNotFastClonable_ += FileBlock::DuplicateEventsRemoved;
-    }
-  }
-
   std::shared_ptr<FileBlock> RootFile::createFileBlock() {
     std::vector<TTree*> processBlockTrees;
     std::vector<std::string> processesWithProcessBlockTrees;
@@ -693,7 +639,7 @@ namespace edm::rntuple_temp {
                                        runTree_.metaTree(),
                                        std::move(processBlockTrees),
                                        std::move(processesWithProcessBlockTrees),
-                                       whyNotFastClonable(),
+                                       0,
                                        hasNewlyDroppedBranch(),
                                        file_,
                                        branchListIndexesUnchanged(),

FWIO/RNTupleTempInput/src/RootFile.h

@@ -153,7 +153,6 @@ namespace edm {
       RootRNTuple const& lumiTree() const { return lumiTree_; }
       RootRNTuple const& runTree() const { return runTree_; }
       FileFormatVersion fileFormatVersion() const { return fileFormatVersion_; }
-      int whyNotFastClonable() const { return whyNotFastClonable_; }
       std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const { return hasNewlyDroppedBranch_; }
       bool branchListIndexesUnchanged() const { return branchListIndexesUnchanged_; }
       bool modifiedIDs() const { return daqProvenanceHelper_.get() != nullptr; }
@@ -214,7 +213,6 @@ namespace edm {
                                         InputType inputType,
                                         StoredProcessBlockHelper const& storedProcessBlockHelper);
       bool skipThisEntry();
-      void setIfFastClonable(int remainingEvents, int remainingLumis);
       void validateFile(InputType inputType,
                         bool usingGoToEvent,
                         std::vector<ProcessHistoryID>& orderedProcessHistoryIDs);
@@ -288,7 +286,6 @@ namespace edm {
       bool noRunLumiSort_;
       bool noEventSort_;
       bool enforceGUIDInFileName_;
-      int whyNotFastClonable_;
       std::array<bool, NumBranchTypes> hasNewlyDroppedBranch_;
       bool branchListIndexesUnchanged_;
       EventAuxiliary eventAuxCache_;  //Should only be used by fillThisEventAuxiliary()

FWIO/RNTupleTempOutput/interface/RNTupleTempOutputModule.h

@@ -66,7 +66,6 @@ namespace edm::rntuple_temp {
     std::string const& moduleLabel() const { return moduleLabel_; }
     unsigned int maxFileSize() const { return maxFileSize_; }
     int inputFileCount() const { return inputFileCount_; }
-    int whyNotFastClonable() const { return whyNotFastClonable_; }
 
     std::string const& currentFileName() const;
 
@@ -213,7 +212,6 @@ namespace edm::rntuple_temp {
     int const splitLevel_;
     std::string basketOrder_;
     int const treeMaxVirtualSize_;
-    int whyNotFastClonable_;
     DropMetaData dropMetaData_;
     std::string const moduleLabel_;
     bool initializedFromInput_;

FWIO/RNTupleTempOutput/src/RNTupleTempOutputModule.cc

@@ -50,8 +50,6 @@ namespace edm::rntuple_temp {
         splitLevel_(std::min<int>(pset.getUntrackedParameter<int>("splitLevel") + 1, 99)),
         basketOrder_(pset.getUntrackedParameter<std::string>("sortBaskets")),
         treeMaxVirtualSize_(pset.getUntrackedParameter<int>("treeMaxVirtualSize")),
-        whyNotFastClonable_(pset.getUntrackedParameter<bool>("fastCloning") ? FileBlock::CanFastClone
-                                                                            : FileBlock::DisabledInConfigFile),
         dropMetaData_(DropNone),
         moduleLabel_(pset.getParameter<std::string>("@module_label")),
         initializedFromInput_(false),
@@ -88,10 +86,6 @@ namespace edm::rntuple_temp {
           << "Legal values are 'NONE', 'DROPPED', 'PRIOR', and 'ALL'.\n";
     }
 
-    if (!wantAllEvents()) {
-      whyNotFastClonable_ += FileBlock::EventSelectionUsed;
-    }
-
     auto const& specialSplit{pset.getUntrackedParameterSetVector("overrideBranchesSplitLevel")};
 
     specialSplitLevelForBranches_.reserve(specialSplit.size());
@@ -509,10 +503,7 @@ namespace edm::rntuple_temp {
             "Used by ROOT when fast copying. Affects performance.");
     desc.addUntracked<int>("treeMaxVirtualSize", -1)
         ->setComment("Size of ROOT TTree TBasket cache.  Affects performance.");
-    desc.addUntracked<bool>("fastCloning", true)
-        ->setComment(
-            "True:  Allow fast copying, if possible.\n"
-            "False: Disable fast copying.");
+    desc.addUntracked<bool>("fastCloning", false)->setComment("Not used by RNTuple");
     desc.addUntracked("mergeJob", false)
         ->setComment(
             "If set to true and fast copying is disabled, copy input file compression and basket sizes to the output "