From 99e248a18388cd9634bed9b040c7677187526c17 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Mon, 11 Feb 2019 14:30:34 +0100
Subject: [PATCH] Renamed the catalogue::RdbmsArchiveFileItorImpl class to
RdbmsCatalogueGetArchiveFilesItor
---
catalogue/CMakeLists.txt | 2 +-
catalogue/RdbmsCatalogue.cpp | 4 ++--
catalogue/RdbmsCatalogue.hpp | 2 +-
...rImpl.cpp => RdbmsCatalogueGetArchiveFilesItor.cpp} | 10 +++++-----
...rImpl.hpp => RdbmsCatalogueGetArchiveFilesItor.hpp} | 10 +++++-----
5 files changed, 14 insertions(+), 14 deletions(-)
rename catalogue/{RdbmsArchiveFileItorImpl.cpp => RdbmsCatalogueGetArchiveFilesItor.cpp} (97%)
rename catalogue/{RdbmsArchiveFileItorImpl.hpp => RdbmsCatalogueGetArchiveFilesItor.hpp} (90%)
diff --git a/catalogue/CMakeLists.txt b/catalogue/CMakeLists.txt
index 95adc7dfa5..e8e895cf48 100644
--- a/catalogue/CMakeLists.txt
+++ b/catalogue/CMakeLists.txt
@@ -43,8 +43,8 @@ set (CATALOGUE_LIB_SRC_FILES
TapeFileWritten.cpp
TapeItemImplementation.cpp
TapePool.cpp
- RdbmsArchiveFileItorImpl.cpp
RdbmsCatalogue.cpp
+ RdbmsCatalogueGetArchiveFilesItor.cpp
SchemaCreatingSqliteCatalogue.cpp
SqliteCatalogue.cpp
SqliteCatalogueFactory.cpp
diff --git a/catalogue/RdbmsCatalogue.cpp b/catalogue/RdbmsCatalogue.cpp
index d3eaec12ca..0b3b124c9c 100644
--- a/catalogue/RdbmsCatalogue.cpp
+++ b/catalogue/RdbmsCatalogue.cpp
@@ -17,8 +17,8 @@
*/
#include "catalogue/ArchiveFileRow.hpp"
-#include "catalogue/RdbmsArchiveFileItorImpl.hpp"
#include "catalogue/RdbmsCatalogue.hpp"
+#include "catalogue/RdbmsCatalogueGetArchiveFilesItor.hpp"
#include "catalogue/retryOnLostConnection.hpp"
#include "catalogue/SqliteCatalogueSchema.hpp"
#include "catalogue/UserSpecifiedANonEmptyTape.hpp"
@@ -4009,7 +4009,7 @@ ArchiveFileItor RdbmsCatalogue::getArchiveFiles(const TapeFileSearchCriteria &se
checkTapeFileSearchCriteria(searchCriteria);
try {
- auto impl = new RdbmsArchiveFileItorImpl(m_log, m_archiveFileListingConnPool, searchCriteria);
+ auto impl = new RdbmsCatalogueGetArchiveFilesItor(m_log, m_archiveFileListingConnPool, searchCriteria);
return ArchiveFileItor(impl);
} catch(exception::UserError &) {
throw;
diff --git a/catalogue/RdbmsCatalogue.hpp b/catalogue/RdbmsCatalogue.hpp
index e80c4a173c..66db59e7ea 100644
--- a/catalogue/RdbmsCatalogue.hpp
+++ b/catalogue/RdbmsCatalogue.hpp
@@ -51,7 +51,7 @@ class ArchiveFileRow;
/**
* Forward declaration.
*/
-class RdbmsArchiveFileItorImpl;
+class RdbmsCatalogueGetArchiveFilesItor;
/**
* CTA catalogue implemented using a relational database backend.
diff --git a/catalogue/RdbmsArchiveFileItorImpl.cpp b/catalogue/RdbmsCatalogueGetArchiveFilesItor.cpp
similarity index 97%
rename from catalogue/RdbmsArchiveFileItorImpl.cpp
rename to catalogue/RdbmsCatalogueGetArchiveFilesItor.cpp
index b9edfbba72..9002096da7 100644
--- a/catalogue/RdbmsArchiveFileItorImpl.cpp
+++ b/catalogue/RdbmsCatalogueGetArchiveFilesItor.cpp
@@ -17,7 +17,7 @@
*/
#include "catalogue/ArchiveFileItor.hpp"
-#include "catalogue/RdbmsArchiveFileItorImpl.hpp"
+#include "catalogue/RdbmsCatalogueGetArchiveFilesItor.hpp"
#include "common/exception/Exception.hpp"
#include "common/exception/LostDatabaseConnection.hpp"
#include "common/exception/UserError.hpp"
@@ -76,7 +76,7 @@ namespace {
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-RdbmsArchiveFileItorImpl::RdbmsArchiveFileItorImpl(
+RdbmsCatalogueGetArchiveFilesItor::RdbmsCatalogueGetArchiveFilesItor(
log::Logger &log,
rdbms::ConnPool &connPool,
const TapeFileSearchCriteria &searchCriteria):
@@ -239,13 +239,13 @@ RdbmsArchiveFileItorImpl::RdbmsArchiveFileItorImpl(
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
-RdbmsArchiveFileItorImpl::~RdbmsArchiveFileItorImpl() {
+RdbmsCatalogueGetArchiveFilesItor::~RdbmsCatalogueGetArchiveFilesItor() {
}
//------------------------------------------------------------------------------
// hasMore
//------------------------------------------------------------------------------
-bool RdbmsArchiveFileItorImpl::hasMore() {
+bool RdbmsCatalogueGetArchiveFilesItor::hasMore() {
m_hasMoreHasBeenCalled = true;
if(m_rsetIsEmpty) {
@@ -263,7 +263,7 @@ bool RdbmsArchiveFileItorImpl::hasMore() {
//------------------------------------------------------------------------------
// next
//------------------------------------------------------------------------------
-common::dataStructures::ArchiveFile RdbmsArchiveFileItorImpl::next() {
+common::dataStructures::ArchiveFile RdbmsCatalogueGetArchiveFilesItor::next() {
try {
if(!m_hasMoreHasBeenCalled) {
throw exception::Exception("hasMore() must be called before next()");
diff --git a/catalogue/RdbmsArchiveFileItorImpl.hpp b/catalogue/RdbmsCatalogueGetArchiveFilesItor.hpp
similarity index 90%
rename from catalogue/RdbmsArchiveFileItorImpl.hpp
rename to catalogue/RdbmsCatalogueGetArchiveFilesItor.hpp
index 48800758f0..dacdaf62ac 100644
--- a/catalogue/RdbmsArchiveFileItorImpl.hpp
+++ b/catalogue/RdbmsCatalogueGetArchiveFilesItor.hpp
@@ -30,9 +30,9 @@ namespace cta {
namespace catalogue {
/**
- * Rdbms implementation of ArchiveFileItorImpl.
+ * RdbmsCatalogue::getArchiveFiles() implementation of ArchiveFileItorImpl.
*/
-class RdbmsArchiveFileItorImpl: public ArchiveFileItorImpl {
+class RdbmsCatalogueGetArchiveFilesItor: public ArchiveFileItorImpl {
public:
/**
@@ -43,7 +43,7 @@ public:
* @param searchCriteria The search criteria to be used when listing archive
* files.
*/
- RdbmsArchiveFileItorImpl(
+ RdbmsCatalogueGetArchiveFilesItor(
log::Logger &log,
rdbms::ConnPool &connPool,
const TapeFileSearchCriteria &searchCriteria);
@@ -51,7 +51,7 @@ public:
/**
* Destructor.
*/
- ~RdbmsArchiveFileItorImpl() override;
+ ~RdbmsCatalogueGetArchiveFilesItor() override;
/**
* Returns true if a call to next would return another archive file.
@@ -115,7 +115,7 @@ private:
*/
ArchiveFileBuilder m_archiveFileBuilder;
-}; // class RdbmsArchiveFileItorImpl
+}; // class RdbmsCatalogueGetArchiveFilesItor
} // namespace catalogue
} // namespace cta
--
GitLab