From 476786b4a9340c603e658b8e8c32e575efd44cac Mon Sep 17 00:00:00 2001
From: Daniele Kruse <dkruse@cern.ch>
Date: Tue, 12 Apr 2016 16:15:45 +0200
Subject: [PATCH] Renamed EOSFileId into DiskFileId
---
catalogue/SqliteCatalogue.cpp | 8 ++++----
catalogue/SqliteCatalogueTest.cpp | 6 +++---
common/dataStructures/ArchiveFile.cpp | 4 ++--
common/dataStructures/ArchiveFile.hpp | 2 +-
common/dataStructures/ArchiveRequest.cpp | 4 ++--
common/dataStructures/ArchiveRequest.hpp | 2 +-
scheduler/OStoreDB/OStoreDB.cpp | 2 +-
scheduler/SchedulerTest.cpp | 2 +-
xroot_plugins/XrdCtaFile.cpp | 13 +++++++------
9 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp
index a61fd404f9..9a001c8416 100644
--- a/catalogue/SqliteCatalogue.cpp
+++ b/catalogue/SqliteCatalogue.cpp
@@ -1833,7 +1833,7 @@ uint64_t cta::catalogue::SqliteCatalogue::createArchiveFile(
std::unique_ptr<SqliteStmt> stmt(m_conn.createStmt(sql));
stmt->bind(":DISK_INSTANCE", archiveFile.drData.drInstance);
- stmt->bind(":DISK_FILE_ID", archiveFile.eosFileID);
+ stmt->bind(":DISK_FILE_ID", archiveFile.diskFileID);
stmt->bind(":FILE_SIZE", archiveFile.fileSize);
stmt->bind(":CHECKSUM_TYPE", archiveFile.checksumType);
stmt->bind(":CHECKSUM_VALUE", archiveFile.checksumValue);
@@ -1847,7 +1847,7 @@ uint64_t cta::catalogue::SqliteCatalogue::createArchiveFile(
stmt->step();
- return getArchiveFileId(archiveFile.drData.drInstance, archiveFile.eosFileID);
+ return getArchiveFileId(archiveFile.drData.drInstance, archiveFile.diskFileID);
}
//------------------------------------------------------------------------------
@@ -1917,7 +1917,7 @@ std::list<cta::common::dataStructures::ArchiveFile>
common::dataStructures::ArchiveFile file;
file.archiveFileID = id;
- file.eosFileID = stmt->columnText(nameToIdx["DISK_FILE_ID"]);
+ file.diskFileID = stmt->columnText(nameToIdx["DISK_FILE_ID"]);
file.fileSize = stmt->columnUint64(nameToIdx["FILE_SIZE"]);
file.checksumType = stmt->columnText(nameToIdx["CHECKSUM_TYPE"]);
file.checksumValue = stmt->columnText(nameToIdx["CHECKSUM_VALUE"]);
@@ -1977,7 +1977,7 @@ cta::common::dataStructures::ArchiveFile cta::catalogue::SqliteCatalogue::
cta::common::dataStructures::ArchiveFile file;
file.archiveFileID = id;
- file.eosFileID = stmt->columnText(nameToIdx["DISK_FILE_ID"]);
+ file.diskFileID = stmt->columnText(nameToIdx["DISK_FILE_ID"]);
file.fileSize = stmt->columnUint64(nameToIdx["FILE_SIZE"]);
file.checksumType = stmt->columnText(nameToIdx["CHECKSUM_TYPE"]);
file.checksumValue = stmt->columnText(nameToIdx["CHECKSUM_VALUE"]);
diff --git a/catalogue/SqliteCatalogueTest.cpp b/catalogue/SqliteCatalogueTest.cpp
index 35ca9e6252..a6e7912004 100644
--- a/catalogue/SqliteCatalogueTest.cpp
+++ b/catalogue/SqliteCatalogueTest.cpp
@@ -840,7 +840,7 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createArchiveFile) {
common::dataStructures::ArchiveFile file;
file.archiveFileID = 1234; // Should be ignored
- file.eosFileID = "EOS_file_ID";
+ file.diskFileID = "EOS_file_ID";
file.fileSize = 1;
file.checksumType = "checksum_type";
file.checksumValue = "cheskum_value";
@@ -860,7 +860,7 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createArchiveFile) {
const common::dataStructures::ArchiveFile frontFile = files.front();
- ASSERT_EQ(file.eosFileID, frontFile.eosFileID);
+ ASSERT_EQ(file.diskFileID, frontFile.diskFileID);
ASSERT_EQ(file.fileSize, frontFile.fileSize);
ASSERT_EQ(file.checksumType, frontFile.checksumType);
ASSERT_EQ(file.checksumValue, frontFile.checksumValue);
@@ -886,7 +886,7 @@ TEST_F(cta_catalogue_SqliteCatalogueTest, createArchiveFile_same_twice) {
"create storage class");
common::dataStructures::ArchiveFile file;
file.archiveFileID = 1234; // Should be ignored
- file.eosFileID = "EOS_file_ID";
+ file.diskFileID = "EOS_file_ID";
file.fileSize = 1;
file.checksumType = "checksum_type";
file.checksumValue = "cheskum_value";
diff --git a/common/dataStructures/ArchiveFile.cpp b/common/dataStructures/ArchiveFile.cpp
index e17992beb1..98822691a5 100644
--- a/common/dataStructures/ArchiveFile.cpp
+++ b/common/dataStructures/ArchiveFile.cpp
@@ -33,7 +33,7 @@ cta::common::dataStructures::ArchiveFile::ArchiveFile():
//------------------------------------------------------------------------------
bool cta::common::dataStructures::ArchiveFile::operator==(const ArchiveFile &rhs) const {
return archiveFileID==rhs.archiveFileID
- && eosFileID==rhs.eosFileID
+ && diskFileID==rhs.diskFileID
&& fileSize==rhs.fileSize
&& checksumType==rhs.checksumType
&& checksumValue==rhs.checksumValue
@@ -55,7 +55,7 @@ bool cta::common::dataStructures::ArchiveFile::operator!=(const ArchiveFile &rhs
//------------------------------------------------------------------------------
std::ostream &operator<<(std::ostream &os, const cta::common::dataStructures::ArchiveFile &obj) {
os << "(archiveFileID=" << obj.archiveFileID
- << " eosFileID=" << obj.eosFileID
+ << " diskFileID=" << obj.diskFileID
<< " fileSize=" << obj.fileSize
<< " checksumType=" << obj.checksumType
<< " checksumValue=" << obj.checksumValue
diff --git a/common/dataStructures/ArchiveFile.hpp b/common/dataStructures/ArchiveFile.hpp
index 6994151919..35ad7ed64b 100644
--- a/common/dataStructures/ArchiveFile.hpp
+++ b/common/dataStructures/ArchiveFile.hpp
@@ -42,7 +42,7 @@ struct ArchiveFile {
bool operator!=(const ArchiveFile &rhs) const;
uint64_t archiveFileID;
- std::string eosFileID;
+ std::string diskFileID;
uint64_t fileSize;
std::string checksumType;
std::string checksumValue;
diff --git a/common/dataStructures/ArchiveRequest.cpp b/common/dataStructures/ArchiveRequest.cpp
index 31215db060..626e8f3151 100644
--- a/common/dataStructures/ArchiveRequest.cpp
+++ b/common/dataStructures/ArchiveRequest.cpp
@@ -32,7 +32,7 @@ cta::common::dataStructures::ArchiveRequest::ArchiveRequest():
//------------------------------------------------------------------------------
bool cta::common::dataStructures::ArchiveRequest::operator==(const ArchiveRequest &rhs) const {
return requester==rhs.requester
- && eosFileID==rhs.eosFileID
+ && diskFileID==rhs.diskFileID
&& srcURL==rhs.srcURL
&& fileSize==rhs.fileSize
&& checksumType==rhs.checksumType
@@ -56,7 +56,7 @@ bool cta::common::dataStructures::ArchiveRequest::operator!=(const ArchiveReques
//------------------------------------------------------------------------------
std::ostream &operator<<(std::ostream &os, const cta::common::dataStructures::ArchiveRequest &obj) {
os << "(requester=" << obj.requester
- << " eosFileID=" << obj.eosFileID
+ << " diskFileID=" << obj.diskFileID
<< " srcURL=" << obj.srcURL
<< " fileSize=" << obj.fileSize
<< " checksumType=" << obj.checksumType
diff --git a/common/dataStructures/ArchiveRequest.hpp b/common/dataStructures/ArchiveRequest.hpp
index ec90e739f4..f49a920ad7 100644
--- a/common/dataStructures/ArchiveRequest.hpp
+++ b/common/dataStructures/ArchiveRequest.hpp
@@ -43,7 +43,7 @@ struct ArchiveRequest {
bool operator!=(const ArchiveRequest &rhs) const;
cta::common::dataStructures::UserIdentity requester;
- std::string eosFileID;
+ std::string diskFileID;
std::string srcURL;
uint64_t fileSize;
std::string checksumType;
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index d433fb0893..f60822674f 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -863,7 +863,7 @@ std::unique_ptr<cta::SchedulerDatabase::ArchiveRequestCreation> OStoreDB::queue(
ar.setDiskpoolName(request.diskpoolName);
ar.setDiskpoolThroughput(request.diskpoolThroughput);
ar.setDrData(request.drData);
- ar.setEosFileID(request.eosFileID);
+ ar.setEosFileID(request.diskFileID);
ar.setFileSize(request.fileSize);
ar.setMountPolicy(mountPolicy);
ar.setRequester(request.requester);
diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp
index 781fc321a3..f44623b588 100644
--- a/scheduler/SchedulerTest.cpp
+++ b/scheduler/SchedulerTest.cpp
@@ -220,7 +220,7 @@ TEST_P(SchedulerTest, DISABLED_archive_to_new_file) {
request.diskpoolName="diskpool1";
request.diskpoolThroughput=200*1000*1000;
request.drData=drData;
- request.eosFileID="eosFileID";
+ request.diskFileID="diskFileID";
request.fileSize=100*1000*1000;
cta::common::dataStructures::UserIdentity requester;
requester.name = userName;
diff --git a/xroot_plugins/XrdCtaFile.cpp b/xroot_plugins/XrdCtaFile.cpp
index dd684acd01..a446044a87 100644
--- a/xroot_plugins/XrdCtaFile.cpp
+++ b/xroot_plugins/XrdCtaFile.cpp
@@ -1563,7 +1563,7 @@ void XrdCtaFile::xCom_archivefile(const std::vector<std::string> &tokens, const
std::list<cta::common::dataStructures::ArchiveFile> list=m_catalogue->getArchiveFiles(id, 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","EOS id","size","checksum type","checksum value","storage class","owner","group","instance","path"};
+ 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"};
if(hasOption(tokens, "-h", "--header")) responseTable.push_back(header);
for(auto it = list.cbegin(); it != list.cend(); it++) {
for(auto jt = it->tapeCopies.cbegin(); jt != it->tapeCopies.cend(); jt++) {
@@ -1573,7 +1573,7 @@ void XrdCtaFile::xCom_archivefile(const std::vector<std::string> &tokens, const
currentRow.push_back(jt->second.vid);
currentRow.push_back(std::to_string((unsigned long long)jt->second.fSeq));
currentRow.push_back(std::to_string((unsigned long long)jt->second.blockId));
- currentRow.push_back(it->eosFileID);
+ currentRow.push_back(it->diskFileID);
currentRow.push_back(std::to_string((unsigned long long)it->fileSize));
currentRow.push_back(it->checksumType);
currentRow.push_back(it->checksumValue);
@@ -1581,7 +1581,8 @@ void XrdCtaFile::xCom_archivefile(const std::vector<std::string> &tokens, const
currentRow.push_back(it->drData.drOwner);
currentRow.push_back(it->drData.drGroup);
currentRow.push_back(it->drData.drInstance);
- currentRow.push_back(it->drData.drPath);
+ currentRow.push_back(it->drData.drPath);
+ currentRow.push_back(std::to_string((unsigned long long)it->creationTime));
responseTable.push_back(currentRow);
}
}
@@ -1751,7 +1752,7 @@ void XrdCtaFile::xCom_reconcile(const std::vector<std::string> &tokens, const ct
currentRow.push_back(jt->second.vid);
currentRow.push_back(std::to_string((unsigned long long)jt->second.fSeq));
currentRow.push_back(std::to_string((unsigned long long)jt->second.blockId));
- currentRow.push_back(it->eosFileID);
+ currentRow.push_back(it->diskFileID);
currentRow.push_back(std::to_string((unsigned long long)it->fileSize));
currentRow.push_back(it->checksumType);
currentRow.push_back(it->checksumValue);
@@ -1797,7 +1798,7 @@ void XrdCtaFile::xCom_listpendingarchives(const std::vector<std::string> &tokens
currentRow.push_back(std::to_string((unsigned long long)jt->archiveFileID));
currentRow.push_back(jt->request.storageClass);
currentRow.push_back(std::to_string((unsigned long long)jt->copyNumber));
- currentRow.push_back(jt->request.eosFileID);
+ currentRow.push_back(jt->request.diskFileID);
currentRow.push_back(jt->request.checksumType);
currentRow.push_back(jt->request.checksumValue);
currentRow.push_back(std::to_string((unsigned long long)jt->request.fileSize));
@@ -1980,7 +1981,7 @@ void XrdCtaFile::xCom_archive(const std::vector<std::string> &tokens, const cta:
request.diskpoolName=diskpool;
request.diskpoolThroughput=throughput;
request.drData=drData;
- request.eosFileID=eosid;
+ request.diskFileID=eosid;
request.fileSize=size;
request.requester=originator;
request.srcURL=srcurl;
--
GitLab