Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
7819f637
Commit
7819f637
authored
Feb 11, 2019
by
Steven Murray
Browse files
Renamed the catalogue::RdbmsArchiveFileItorImpl class to RdbmsCatalogueGetArchiveFilesItor
parent
fb2e0ea2
Changes
5
Hide whitespace changes
Inline
Side-by-side
catalogue/CMakeLists.txt
View file @
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
...
...
catalogue/RdbmsCatalogue.cpp
View file @
7819f637
...
...
@@ -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
RdbmsArchiveFileItor
Impl
(
m_log
,
m_archiveFileListingConnPool
,
searchCriteria
);
auto
impl
=
new
Rdbms
CatalogueGet
ArchiveFile
s
Itor
(
m_log
,
m_archiveFileListingConnPool
,
searchCriteria
);
return
ArchiveFileItor
(
impl
);
}
catch
(
exception
::
UserError
&
)
{
throw
;
...
...
catalogue/RdbmsCatalogue.hpp
View file @
7819f637
...
...
@@ -51,7 +51,7 @@ class ArchiveFileRow;
/**
* Forward declaration.
*/
class
RdbmsArchiveFileItor
Impl
;
class
Rdbms
CatalogueGet
ArchiveFile
s
Itor
;
/**
* CTA catalogue implemented using a relational database backend.
...
...
catalogue/RdbmsArchiveFileItor
Impl
.cpp
→
catalogue/Rdbms
CatalogueGet
ArchiveFile
s
Itor.cpp
View file @
7819f637
...
...
@@ -17,7 +17,7 @@
*/
#include
"catalogue/ArchiveFileItor.hpp"
#include
"catalogue/RdbmsArchiveFileItor
Impl
.hpp"
#include
"catalogue/Rdbms
CatalogueGet
ArchiveFile
s
Itor.hpp"
#include
"common/exception/Exception.hpp"
#include
"common/exception/LostDatabaseConnection.hpp"
#include
"common/exception/UserError.hpp"
...
...
@@ -76,7 +76,7 @@ namespace {
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
RdbmsArchiveFileItor
Impl
::
RdbmsArchiveFileItor
Impl
(
Rdbms
CatalogueGet
ArchiveFile
s
Itor
::
Rdbms
CatalogueGet
ArchiveFile
s
Itor
(
log
::
Logger
&
log
,
rdbms
::
ConnPool
&
connPool
,
const
TapeFileSearchCriteria
&
searchCriteria
)
:
...
...
@@ -239,13 +239,13 @@ RdbmsArchiveFileItorImpl::RdbmsArchiveFileItorImpl(
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
RdbmsArchiveFileItor
Impl
::~
RdbmsArchiveFileItor
Impl
()
{
Rdbms
CatalogueGet
ArchiveFile
s
Itor
::~
Rdbms
CatalogueGet
ArchiveFile
s
Itor
()
{
}
//------------------------------------------------------------------------------
// hasMore
//------------------------------------------------------------------------------
bool
RdbmsArchiveFileItor
Impl
::
hasMore
()
{
bool
Rdbms
CatalogueGet
ArchiveFile
s
Itor
::
hasMore
()
{
m_hasMoreHasBeenCalled
=
true
;
if
(
m_rsetIsEmpty
)
{
...
...
@@ -263,7 +263,7 @@ bool RdbmsArchiveFileItorImpl::hasMore() {
//------------------------------------------------------------------------------
// next
//------------------------------------------------------------------------------
common
::
dataStructures
::
ArchiveFile
RdbmsArchiveFileItor
Impl
::
next
()
{
common
::
dataStructures
::
ArchiveFile
Rdbms
CatalogueGet
ArchiveFile
s
Itor
::
next
()
{
try
{
if
(
!
m_hasMoreHasBeenCalled
)
{
throw
exception
::
Exception
(
"hasMore() must be called before next()"
);
...
...
catalogue/RdbmsArchiveFileItor
Impl
.hpp
→
catalogue/Rdbms
CatalogueGet
ArchiveFile
s
Itor.hpp
View file @
7819f637
...
...
@@ -30,9 +30,9 @@ namespace cta {
namespace
catalogue
{
/**
* Rdbms implementation of ArchiveFileItorImpl.
* Rdbms
Catalogue::getArchiveFiles()
implementation of ArchiveFileItorImpl.
*/
class
RdbmsArchiveFileItor
Impl
:
public
ArchiveFileItorImpl
{
class
Rdbms
CatalogueGet
ArchiveFile
s
Itor
:
public
ArchiveFileItorImpl
{
public:
/**
...
...
@@ -43,7 +43,7 @@ public:
* @param searchCriteria The search criteria to be used when listing archive
* files.
*/
RdbmsArchiveFileItor
Impl
(
Rdbms
CatalogueGet
ArchiveFile
s
Itor
(
log
::
Logger
&
log
,
rdbms
::
ConnPool
&
connPool
,
const
TapeFileSearchCriteria
&
searchCriteria
);
...
...
@@ -51,7 +51,7 @@ public:
/**
* Destructor.
*/
~
RdbmsArchiveFileItor
Impl
()
override
;
~
Rdbms
CatalogueGet
ArchiveFile
s
Itor
()
override
;
/**
* Returns true if a call to next would return another archive file.
...
...
@@ -115,7 +115,7 @@ private:
*/
ArchiveFileBuilder
m_archiveFileBuilder
;
};
// class RdbmsArchiveFileItor
Impl
};
// class Rdbms
CatalogueGet
ArchiveFile
s
Itor
}
// namespace catalogue
}
// namespace cta
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment