From 9e38faa3c8a1d3224c02fe0b738f006f003161cc Mon Sep 17 00:00:00 2001
From: Steven Murray <steven.murray@cern.ch>
Date: Tue, 9 Aug 2016 11:43:44 +0200
Subject: [PATCH] Renamed Catalogue::getArchiveFileSummary() to
getTapeFileSummary
---
catalogue/Catalogue.hpp | 4 ++--
catalogue/RdbmsCatalogue.cpp | 4 ++--
catalogue/RdbmsCatalogue.hpp | 4 ++--
xroot_plugins/XrdCtaFile.cpp | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/catalogue/Catalogue.hpp b/catalogue/Catalogue.hpp
index bdf0d19ec7..a29e15b82b 100644
--- a/catalogue/Catalogue.hpp
+++ b/catalogue/Catalogue.hpp
@@ -485,13 +485,13 @@ public:
const uint64_t nbArchiveFilesToPrefetch = 1000) const = 0;
/**
- * Returns a summary of the archive files that meet the specified search
+ * Returns a summary of the tape files that meet the specified search
* criteria.
*
* @param searchCriteria The search criteria.
* @return The summary.
*/
- virtual common::dataStructures::ArchiveFileSummary getArchiveFileSummary(
+ virtual common::dataStructures::ArchiveFileSummary getTapeFileSummary(
const ArchiveFileSearchCriteria &searchCriteria = ArchiveFileSearchCriteria()) const = 0;
/**
diff --git a/catalogue/RdbmsCatalogue.cpp b/catalogue/RdbmsCatalogue.cpp
index 9b6d324785..b85a5edfa8 100644
--- a/catalogue/RdbmsCatalogue.cpp
+++ b/catalogue/RdbmsCatalogue.cpp
@@ -3619,9 +3619,9 @@ std::list<common::dataStructures::ArchiveFile> RdbmsCatalogue::getArchiveFilesFo
}
//------------------------------------------------------------------------------
-// getArchiveFileSummary
+// getTapeFileSummary
//------------------------------------------------------------------------------
-common::dataStructures::ArchiveFileSummary RdbmsCatalogue::getArchiveFileSummary(
+common::dataStructures::ArchiveFileSummary RdbmsCatalogue::getTapeFileSummary(
const ArchiveFileSearchCriteria &searchCriteria) const {
throw exception::Exception(std::string(__FUNCTION__) + " not implemented");
}
diff --git a/catalogue/RdbmsCatalogue.hpp b/catalogue/RdbmsCatalogue.hpp
index a18758791c..d4ca8ce6f0 100644
--- a/catalogue/RdbmsCatalogue.hpp
+++ b/catalogue/RdbmsCatalogue.hpp
@@ -471,13 +471,13 @@ public:
const uint64_t nbArchiveFilesToPrefetch) const override;
/**
- * Returns a summary of the archive files that meet the specified search
+ * Returns a summary of the tape files that meet the specified search
* criteria.
*
* @param searchCriteria The search criteria.
* @return The summary.
*/
- common::dataStructures::ArchiveFileSummary getArchiveFileSummary(
+ common::dataStructures::ArchiveFileSummary getTapeFileSummary(
const ArchiveFileSearchCriteria &searchCriteria) const override;
/**
diff --git a/xroot_plugins/XrdCtaFile.cpp b/xroot_plugins/XrdCtaFile.cpp
index 32d0ffe5d6..d37a5297c3 100644
--- a/xroot_plugins/XrdCtaFile.cpp
+++ b/xroot_plugins/XrdCtaFile.cpp
@@ -1736,7 +1736,7 @@ void XrdCtaFile::xCom_archivefile() {
}
}
else { //summary
- cta::common::dataStructures::ArchiveFileSummary summary=m_catalogue->getArchiveFileSummary(searchCriteria);
+ cta::common::dataStructures::ArchiveFileSummary summary=m_catalogue->getTapeFileSummary(searchCriteria);
std::vector<std::vector<std::string>> responseTable;
std::vector<std::string> header = {"total number of files","total size"};
std::vector<std::string> row = {std::to_string((unsigned long long)summary.totalFiles),std::to_string((unsigned long long)summary.totalBytes)};
--
GitLab