From a9ed8d55ffa242550a6458814e561c9e5255d043 Mon Sep 17 00:00:00 2001
From: Daniele Kruse <dkruse@cern.ch>
Date: Thu, 14 Apr 2016 16:54:16 +0200
Subject: [PATCH] Changed the interface to EOS doc and changed the type of the
first parameter of catalogue.getArchiveFiles from uint64_t to string
---
catalogue/Catalogue.hpp | 4 ++--
catalogue/SqliteCatalogue.cpp | 7 ++++---
catalogue/SqliteCatalogue.hpp | 4 ++--
catalogue/SqliteCatalogueTest.cpp | 6 +++---
xroot_plugins/XrdCtaFile.cpp | 5 ++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/catalogue/Catalogue.hpp b/catalogue/Catalogue.hpp
index 3dee1db636..fefeb15c62 100644
--- a/catalogue/Catalogue.hpp
+++ b/catalogue/Catalogue.hpp
@@ -180,9 +180,9 @@ public:
virtual void modifyDedicationUntil(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t untilTimestamp) = 0;
virtual void modifyDedicationComment(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &comment) = 0;
- virtual std::list<cta::common::dataStructures::ArchiveFile> getArchiveFiles(const uint64_t id, const std::string &eosid,
+ virtual std::list<cta::common::dataStructures::ArchiveFile> getArchiveFiles(const std::string &id, const std::string &eosid,
const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) = 0;
- virtual cta::common::dataStructures::ArchiveFileSummary getArchiveFileSummary(const uint64_t id, const std::string &eosid,
+ virtual cta::common::dataStructures::ArchiveFileSummary getArchiveFileSummary(const std::string &id, const std::string &eosid,
const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) = 0;
virtual cta::common::dataStructures::ArchiveFile getArchiveFileById(const uint64_t id) = 0;
diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp
index df4e34558b..37bb737d48 100644
--- a/catalogue/SqliteCatalogue.cpp
+++ b/catalogue/SqliteCatalogue.cpp
@@ -1882,7 +1882,7 @@ uint64_t cta::catalogue::SqliteCatalogue::getArchiveFileId(
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::ArchiveFile>
cta::catalogue::SqliteCatalogue::getArchiveFiles(
- const uint64_t id,
+ const std::string &id,
const std::string &eosid,
const std::string ©nb,
const std::string &tapepool,
@@ -1894,6 +1894,7 @@ std::list<cta::common::dataStructures::ArchiveFile>
std::list<cta::common::dataStructures::ArchiveFile> files;
const char *const sql =
"SELECT "
+ "ARCHIVE_FILE_ID AS ARCHIVE_FILE_ID,"
"DISK_INSTANCE AS DISK_INSTANCE,"
"DISK_FILE_ID AS DISK_FILE_ID,"
"FILE_SIZE AS FILE_SIZE,"
@@ -1916,7 +1917,7 @@ std::list<cta::common::dataStructures::ArchiveFile>
}
common::dataStructures::ArchiveFile file;
- file.archiveFileID = id;
+ file.archiveFileID = stmt->columnUint64(nameToIdx["ARCHIVE_FILE_ID"]);
file.diskFileID = stmt->columnText(nameToIdx["DISK_FILE_ID"]);
file.fileSize = stmt->columnUint64(nameToIdx["FILE_SIZE"]);
file.checksumType = stmt->columnText(nameToIdx["CHECKSUM_TYPE"]);
@@ -1937,7 +1938,7 @@ std::list<cta::common::dataStructures::ArchiveFile>
//------------------------------------------------------------------------------
// getArchiveFileSummary
//------------------------------------------------------------------------------
-cta::common::dataStructures::ArchiveFileSummary cta::catalogue::SqliteCatalogue::getArchiveFileSummary(const uint64_t id, const std::string &eosid,
+cta::common::dataStructures::ArchiveFileSummary cta::catalogue::SqliteCatalogue::getArchiveFileSummary(const std::string &id, const std::string &eosid,
const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) {
return cta::common::dataStructures::ArchiveFileSummary();
}
diff --git a/catalogue/SqliteCatalogue.hpp b/catalogue/SqliteCatalogue.hpp
index 5308ac490d..4586322177 100644
--- a/catalogue/SqliteCatalogue.hpp
+++ b/catalogue/SqliteCatalogue.hpp
@@ -152,9 +152,9 @@ public:
* storageClass attribute.
*/
virtual uint64_t createArchiveFile(const common::dataStructures::ArchiveFile &archiveFile);
- virtual std::list<cta::common::dataStructures::ArchiveFile> getArchiveFiles(const uint64_t id, const std::string &eosid,
+ virtual std::list<cta::common::dataStructures::ArchiveFile> getArchiveFiles(const std::string &id, const std::string &eosid,
const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path);
- virtual cta::common::dataStructures::ArchiveFileSummary getArchiveFileSummary(const uint64_t id, const std::string &eosid,
+ virtual cta::common::dataStructures::ArchiveFileSummary getArchiveFileSummary(const std::string &id, const std::string &eosid,
const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path);
virtual cta::common::dataStructures::ArchiveFile getArchiveFileById(const uint64_t id);
diff --git a/catalogue/SqliteCatalogueTest.cpp b/catalogue/SqliteCatalogueTest.cpp
index 409e35a039..a8261c5dab 100644
--- a/catalogue/SqliteCatalogueTest.cpp
+++ b/catalogue/SqliteCatalogueTest.cpp
@@ -831,7 +831,7 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createArchiveFile) {
catalogue::SqliteCatalogue catalogue;
- ASSERT_TRUE(catalogue.getArchiveFiles(0, "", "", "", "", "", "", "", "").empty());
+ ASSERT_TRUE(catalogue.getArchiveFiles("", "", "", "", "", "", "", "", "").empty());
const std::string storageClassName = "storage_class";
const uint64_t nbCopies = 2;
@@ -855,7 +855,7 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createArchiveFile) {
catalogue.createArchiveFile(file);
std::list<common::dataStructures::ArchiveFile> files;
- files = catalogue.getArchiveFiles(0, "", "", "", "", "", "", "", "");
+ files = catalogue.getArchiveFiles("", "", "", "", "", "", "", "", "");
ASSERT_EQ(1, files.size());
const common::dataStructures::ArchiveFile frontFile = files.front();
@@ -878,7 +878,7 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createArchiveFile_same_twice) {
catalogue::SqliteCatalogue catalogue;
- ASSERT_TRUE(catalogue.getArchiveFiles(0, "", "", "", "", "", "", "", "").empty());
+ ASSERT_TRUE(catalogue.getArchiveFiles("", "", "", "", "", "", "", "", "").empty());
const std::string storageClassName = "storage_class";
const uint64_t nbCopies = 2;
diff --git a/xroot_plugins/XrdCtaFile.cpp b/xroot_plugins/XrdCtaFile.cpp
index aec9457f95..0f44584511 100644
--- a/xroot_plugins/XrdCtaFile.cpp
+++ b/xroot_plugins/XrdCtaFile.cpp
@@ -1558,9 +1558,8 @@ void XrdCtaFile::xCom_archivefile(const std::vector<std::string> &tokens, const
m_data = help.str();
return;
}
- uint64_t id; std::stringstream id_ss; id_ss << id_s; id_ss >> id;
if(!summary) {
- std::list<cta::common::dataStructures::ArchiveFile> list=m_catalogue->getArchiveFiles(id, eosid, copynb, tapepool, vid, owner, group, storageclass, path);
+ std::list<cta::common::dataStructures::ArchiveFile> list=m_catalogue->getArchiveFiles(id_s, eosid, copynb, tapepool, vid, owner, group, storageclass, path);
if(list.size()>0) {
std::vector<std::vector<std::string>> responseTable;
std::vector<std::string> header = {"id","copy no","vid","fseq","block id","disk id","size","checksum type","checksum value","storage class","owner","group","instance","path","creation time"};
@@ -1590,7 +1589,7 @@ void XrdCtaFile::xCom_archivefile(const std::vector<std::string> &tokens, const
}
}
else { //summary
- cta::common::dataStructures::ArchiveFileSummary summary=m_catalogue->getArchiveFileSummary(id, eosid, copynb, tapepool, vid, owner, group, storageclass, path);
+ cta::common::dataStructures::ArchiveFileSummary summary=m_catalogue->getArchiveFileSummary(id_s, eosid, copynb, tapepool, vid, owner, group, storageclass, path);
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