Merge pull request #49134 from wddgit/removeTrivialFileCatalog

Remove obsolete TrivialFileCatalog

Author: cmsbuild

FWCore/Catalog/interface/FileLocator.h

@@ -1,77 +1,48 @@
 #ifndef FWCore_Catalog_FileLocator_h
 #define FWCore_Catalog_FileLocator_h
 
-#include "FWCore/Catalog/interface/SiteLocalConfig.h"
-#include <string>
-#include <list>
 #include <map>
-#include <utility>
 #include <regex>
-#include "tinyxml2.h"
+#include <string>
+#include <vector>
+
 #include <boost/property_tree/ptree.hpp>
 
 namespace edm {
 
+  struct CatalogAttributes;
+
   class FileLocator {
   public:
     explicit FileLocator(
-        edm::CatalogAttributes const& catAttr,
+        CatalogAttributes const& catalogAttributes,
         unsigned iCatalog = 0,
         //storageDescriptionPath is used to override path provided by SiteLocalConfig. This is used in FileLocator_t.cpp tests
         std::string const& storageDescriptionPath = std::string());
-    explicit FileLocator(std::string const& catUrl, unsigned iCatalog = 0);
 
-    ~FileLocator();
-
-    std::string pfn(std::string const& ilfn, edm::CatalogType catType) const;
+    std::string pfn(std::string const& ilfn) const;
 
   private:
-    /** For the time being the only allowed configuration item is a
-     *  prefix to be added to the GUID/LFN.
-     */
     struct Rule {
       std::regex pathMatch;
-      std::regex destinationMatch;
       std::string result;
       std::string chain;
     };
 
-    typedef std::vector<Rule> Rules;
-    typedef std::map<std::string, Rules> ProtocolRules;
+    using Rules = std::vector<Rule>;
+    using ProtocolRules = std::map<std::string, Rules>;
 
-    void init_trivialCatalog(std::string const& catUrl, unsigned iCatalog);
+    void init(CatalogAttributes const& catalogAttributes, unsigned iCatalog, std::string const& storageDescriptionPath);
 
-    void parseRuleTrivialCatalog(tinyxml2::XMLElement* ruleNode, ProtocolRules& rules);
-    //using data-access
-    void init(edm::CatalogAttributes const& input_dataCatalog,
-              unsigned iCatalog,
-              std::string const& storageDescriptionPath);
     void parseRule(boost::property_tree::ptree::value_type const& storageRule,
                    std::string const& protocol,
                    ProtocolRules& rules);
 
-    std::string applyRules(ProtocolRules const& protocolRules,
-                           std::string const& protocol,
-                           std::string const& destination,
-                           bool direct,
-                           std::string name) const;
-
-    std::string convert(std::string const& input, ProtocolRules const& rules, bool direct) const;
+    std::string applyRules(ProtocolRules const& protocolRules, std::string const& protocol, std::string name) const;
 
-    /** Direct rules are used to do the mapping from LFN to PFN.*/
-    ProtocolRules m_directRules_trivialCatalog;
-    /** Inverse rules are used to do the mapping from PFN to LFN*/
-    ProtocolRules m_inverseRules;
     /** Direct rules are used to do the mapping from LFN to PFN taken from storage.json*/
     ProtocolRules m_directRules;
-
-    std::string m_fileType;
-    std::string m_filename;
-    //TFC allows more than one protocols provided in a catalog, separated by a comma
-    //In new Rucio storage description, only one protocol is provided in a catalog
-    //This variable can be simplified in the future
-    std::vector<std::string> m_protocols;
-    std::string m_destination;
+    std::string m_protocol;
   };
 }  // namespace edm
 

FWCore/Catalog/interface/InputFileCatalog.h

@@ -2,28 +2,40 @@
 #define FWCore_Catalog_InputFileCatalog_h
 //////////////////////////////////////////////////////////////////////
 //
-// Class InputFileCatalog. Services to manage InputFile catalog.
-// Physical file names, pfns_ of FileCatalogItem, are constructed from multiple data catalogs in site-local-config.xml. Each member of pfns_ corresponds to a data catalog.
-// Note that fileNames(unsigned iCatalog) of InputFileCatalog return physical file names of all input files corresponding to a data catalog (for example, a job has 10 input files provided as a PoolSource, the fileNames(unsigned iCatalog) will return PFNs of these 10 files constructed from a data catalog)
-// Set catType=TrivialCatalog: use trivial data catalogs from <event-data>
-// Set catType=RucioCatalog: use data catalogs from <data-access> and storage.json
+// Class InputFileCatalog.
+//
+// The physical file names, pfns_ of each FileCatalogItem, are constructed from
+// multiple data catalogs in site-local-config.xml. Each member of pfns_ corresponds
+// to a data catalog.
+//
+// Note that InputFileCatalog::fileNames(unsigned iCatalog) returns the physical file
+// names of all input files corresponding to a data catalog (for example, a job has
+// 10 input files provided via a PoolSource, InputFileCatalog::fileNames(unsigned iCatalog)
+// will return the PFNs of those 10 files constructed from one data catalog)
+//
+// Catalogs are based on Rucio (from <data-access> and storage.json)
+//
+// Note that support for TrivialFileCatalog was removed in 2025.
 //
 //////////////////////////////////////////////////////////////////////
 
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
-#include "FWCore/Catalog/interface/FileLocator.h"
+
 #include "FWCore/Utilities/interface/propagate_const.h"
 
 namespace edm {
+
+  class FileLocator;
+
   class FileCatalogItem {
   public:
     FileCatalogItem(std::vector<std::string> pfns, std::string lfn) : pfns_(std::move(pfns)), lfn_(std::move(lfn)) {}
 
     std::string const& fileName(unsigned iCatalog) const { return pfns_[iCatalog]; }
     std::string const& logicalFileName() const { return lfn_; }
-
     std::vector<std::string> const& fileNames() const { return pfns_; }
 
   private:
@@ -33,34 +45,23 @@ namespace edm {
 
   class InputFileCatalog {
   public:
-    InputFileCatalog(std::vector<std::string> fileNames,
+    InputFileCatalog(std::vector<std::string> logicalFileNames,
                      std::string const& override,
-                     bool useLFNasPFNifLFNnotFound = false,
-                     //switching between two catalog types
-                     //edm::CatalogType catType = edm::CatalogType::TrivialCatalog);
-                     edm::CatalogType catType = edm::CatalogType::RucioCatalog);
-
+                     bool useLFNasPFNifLFNnotFound = false);
     ~InputFileCatalog();
+
     std::vector<FileCatalogItem> const& fileCatalogItems() const { return fileCatalogItems_; }
     std::vector<std::string> fileNames(unsigned iCatalog) const;
     bool empty() const { return fileCatalogItems_.empty(); }
     static bool isPhysical(std::string const& name) { return (name.empty() || name.find(':') != std::string::npos); }
 
   private:
-    void init(std::vector<std::string> logicalFileNames,
-              std::string const& override,
-              bool useLFNasPFNifLFNnotFound,
-              edm::CatalogType catType);
-    void findFile(std::string const& lfn,
-                  std::vector<std::string>& pfns,
-                  bool useLFNasPFNifLFNnotFound,
-                  edm::CatalogType catType);
-    std::vector<FileCatalogItem> fileCatalogItems_;
-    edm::propagate_const<std::unique_ptr<FileLocator>> overrideFileLocator_;
+    void init(std::vector<std::string> logicalFileNames, std::string const& override, bool useLFNasPFNifLFNnotFound);
+    void findFile(std::string const& lfn, std::vector<std::string>& pfns, bool useLFNasPFNifLFNnotFound);
 
-    std::vector<edm::propagate_const<std::unique_ptr<FileLocator>>> fileLocators_trivalCatalog_;
-    std::vector<edm::propagate_const<std::unique_ptr<FileLocator>>> fileLocators_;
+    std::vector<FileCatalogItem> fileCatalogItems_;
+    propagate_const<std::unique_ptr<FileLocator>> overrideFileLocator_;
+    std::vector<propagate_const<std::unique_ptr<FileLocator>>> fileLocators_;
   };
 }  // namespace edm
-
 #endif

FWCore/Catalog/interface/SiteLocalConfig.h

@@ -43,8 +43,6 @@ namespace edm {
     std::string volume;
     std::string protocol;
   };
-
-  enum class CatalogType { TrivialCatalog, RucioCatalog };
 }  // namespace edm
 
 // PUBLIC VARIABLES
@@ -57,7 +55,6 @@ namespace edm {
     SiteLocalConfig() {}
     virtual ~SiteLocalConfig() {}
 
-    virtual std::vector<std::string> const& trivialDataCatalogs() const = 0;
     virtual std::vector<edm::CatalogAttributes> const& dataCatalogs() const = 0;
     virtual std::filesystem::path const storageDescriptionPath(const edm::CatalogAttributes& aDataCatalog) const = 0;
     virtual std::string const lookupCalibConnect(std::string const& input) const = 0;