Commit ed555ec6 authored by Michael Davis's avatar Michael Davis
Browse files

Merge remote-tracking branch 'origin/master' into genericOStoreAlgos

parents d69488c8 7819f637
......@@ -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
......
......@@ -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;
......
......@@ -51,7 +51,7 @@ class ArchiveFileRow;
/**
* Forward declaration.
*/
class RdbmsArchiveFileItorImpl;
class RdbmsCatalogueGetArchiveFilesItor;
/**
* CTA catalogue implemented using a relational database backend.
......
......@@ -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()");
......
......@@ -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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment