From 7985a605a9a5f7695d697ab98f221ad0dc5df704 Mon Sep 17 00:00:00 2001
From: Daniele Kruse <dkruse@cern.ch>
Date: Mon, 7 Mar 2016 12:35:37 +0100
Subject: [PATCH] rebasing
---
common/dataStructures/ArchiveFile.cpp | 28 ++------
common/dataStructures/ArchiveFile.hpp | 19 ++----
common/dataStructures/ArchiveRequest.cpp | 38 +++++------
common/dataStructures/ArchiveRequest.hpp | 12 ++--
.../dataStructures/CancelRetrieveRequest.cpp | 20 ------
.../dataStructures/CancelRetrieveRequest.hpp | 7 --
common/dataStructures/Dedication.cpp | 40 +++++------
common/dataStructures/Dedication.hpp | 12 ++--
.../dataStructures/DeleteArchiveRequest.cpp | 20 ------
.../dataStructures/DeleteArchiveRequest.hpp | 7 --
common/dataStructures/DriveState.cpp | 44 ++++++-------
common/dataStructures/DriveState.hpp | 18 ++---
common/dataStructures/EntryLog.cpp | 32 ---------
common/dataStructures/EntryLog.hpp | 24 +------
.../ListStorageClassRequest.cpp | 22 +------
.../ListStorageClassRequest.hpp | 7 --
common/dataStructures/ReadTestResult.cpp | 28 ++++++--
common/dataStructures/ReadTestResult.hpp | 18 +++--
common/dataStructures/RepackInfo.cpp | 40 +++++------
common/dataStructures/RepackInfo.hpp | 12 ++--
common/dataStructures/RetrieveJob.cpp | 4 +-
common/dataStructures/RetrieveJob.hpp | 6 +-
common/dataStructures/RetrieveRequest.cpp | 38 +++++------
common/dataStructures/RetrieveRequest.hpp | 12 ++--
.../dataStructures/UpdateFileInfoRequest.cpp | 20 ------
.../dataStructures/UpdateFileInfoRequest.hpp | 7 --
common/dataStructures/User.cpp | 34 +++++-----
common/dataStructures/User.hpp | 12 ++--
common/dataStructures/UserIdentity.cpp | 65 +++++-------------
common/dataStructures/UserIdentity.hpp | 34 +++-------
common/dataStructures/VerifyInfo.cpp | 2 +-
common/dataStructures/WriteTestResult.cpp | 28 ++++++--
common/dataStructures/WriteTestResult.hpp | 18 +++--
objectstore/ArchiveRequest.cpp | 12 ++--
objectstore/RetrieveRequest.cpp | 12 ++--
objectstore/cta.proto | 4 +-
xroot_plugins/XrdCtaFile.cpp | 66 ++++++++-----------
37 files changed, 315 insertions(+), 507 deletions(-)
diff --git a/common/dataStructures/ArchiveFile.cpp b/common/dataStructures/ArchiveFile.cpp
index 1772c18678..1d3981a3a2 100644
--- a/common/dataStructures/ArchiveFile.cpp
+++ b/common/dataStructures/ArchiveFile.cpp
@@ -31,7 +31,6 @@ cta::common::dataStructures::ArchiveFile::ArchiveFile() {
m_fileSizeSet = false;
m_storageClassSet = false;
m_tapeCopiesSet = false;
- m_creationLogSet = false;
}
//------------------------------------------------------------------------------
@@ -47,7 +46,6 @@ bool cta::common::dataStructures::ArchiveFile::allFieldsSet() const {
return m_archiveFileIDSet
&& m_checksumTypeSet
&& m_checksumValueSet
- && m_creationLogSet
&& m_drDataSet
&& m_eosFileIDSet
&& m_fileSizeSet
@@ -58,7 +56,7 @@ bool cta::common::dataStructures::ArchiveFile::allFieldsSet() const {
//------------------------------------------------------------------------------
// setArchiveFileID
//------------------------------------------------------------------------------
-void cta::common::dataStructures::ArchiveFile::setArchiveFileID(const std::string &archiveFileID) {
+void cta::common::dataStructures::ArchiveFile::setArchiveFileID(const uint64_t archiveFileID) {
m_archiveFileID = archiveFileID;
m_archiveFileIDSet = true;
}
@@ -66,7 +64,7 @@ void cta::common::dataStructures::ArchiveFile::setArchiveFileID(const std::strin
//------------------------------------------------------------------------------
// getArchiveFileID
//------------------------------------------------------------------------------
-std::string cta::common::dataStructures::ArchiveFile::getArchiveFileID() const {
+uint64_t cta::common::dataStructures::ArchiveFile::getArchiveFileID() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the ArchiveFile have been set!");
}
@@ -184,7 +182,7 @@ std::string cta::common::dataStructures::ArchiveFile::getStorageClass() const {
//------------------------------------------------------------------------------
// setTapeCopies
//------------------------------------------------------------------------------
-void cta::common::dataStructures::ArchiveFile::setTapeCopies(const std::map<int,cta::common::dataStructures::TapeFileLocation> &tapeCopies) {
+void cta::common::dataStructures::ArchiveFile::setTapeCopies(const std::map<uint64_t,cta::common::dataStructures::TapeFileLocation> &tapeCopies) {
m_tapeCopies = tapeCopies;
m_tapeCopiesSet = true;
}
@@ -192,27 +190,9 @@ void cta::common::dataStructures::ArchiveFile::setTapeCopies(const std::map<int,
//------------------------------------------------------------------------------
// getTapeCopies
//------------------------------------------------------------------------------
-std::map<int,cta::common::dataStructures::TapeFileLocation> cta::common::dataStructures::ArchiveFile::getTapeCopies() const {
+std::map<uint64_t,cta::common::dataStructures::TapeFileLocation> cta::common::dataStructures::ArchiveFile::getTapeCopies() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the ArchiveFile have been set!");
}
return m_tapeCopies;
}
-
-//------------------------------------------------------------------------------
-// setCreationLog
-//------------------------------------------------------------------------------
-void cta::common::dataStructures::ArchiveFile::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
- m_creationLog = creationLog;
- m_creationLogSet = true;
-}
-
-//------------------------------------------------------------------------------
-// getCreationLog
-//------------------------------------------------------------------------------
-cta::common::dataStructures::EntryLog cta::common::dataStructures::ArchiveFile::getCreationLog() const {
- if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
- }
- return m_creationLog;
-}
diff --git a/common/dataStructures/ArchiveFile.hpp b/common/dataStructures/ArchiveFile.hpp
index 9ab761d437..14b489b462 100644
--- a/common/dataStructures/ArchiveFile.hpp
+++ b/common/dataStructures/ArchiveFile.hpp
@@ -24,7 +24,6 @@
#include <string>
#include "common/dataStructures/DRData.hpp"
-#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/TapeFileLocation.hpp"
namespace cta {
@@ -45,8 +44,8 @@ public:
*/
~ArchiveFile() throw();
- void setArchiveFileID(const std::string &archiveFileID);
- std::string getArchiveFileID() const;
+ void setArchiveFileID(const uint64_t archiveFileID);
+ uint64_t getArchiveFileID() const;
void setChecksumType(const std::string &checksumType);
std::string getChecksumType() const;
@@ -66,11 +65,8 @@ public:
void setStorageClass(const std::string &storageClass);
std::string getStorageClass() const;
- void setTapeCopies(const std::map<int,cta::common::dataStructures::TapeFileLocation> &tapeCopies);
- std::map<int,cta::common::dataStructures::TapeFileLocation> getTapeCopies() const;
-
- void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
- cta::common::dataStructures::EntryLog getCreationLog() const;
+ void setTapeCopies(const std::map<uint64_t,cta::common::dataStructures::TapeFileLocation> &tapeCopies);
+ std::map<uint64_t,cta::common::dataStructures::TapeFileLocation> getTapeCopies() const;
private:
@@ -80,7 +76,7 @@ private:
*/
bool allFieldsSet() const;
- std::string m_archiveFileID;
+ uint64_t m_archiveFileID;
bool m_archiveFileIDSet;
std::string m_checksumType;
@@ -101,12 +97,9 @@ private:
std::string m_storageClass;
bool m_storageClassSet;
- std::map<int,cta::common::dataStructures::TapeFileLocation> m_tapeCopies;
+ std::map<uint64_t,cta::common::dataStructures::TapeFileLocation> m_tapeCopies;
bool m_tapeCopiesSet;
- cta::common::dataStructures::EntryLog m_creationLog;
- bool m_creationLogSet;
-
}; // class ArchiveFile
} // namespace dataStructures
diff --git a/common/dataStructures/ArchiveRequest.cpp b/common/dataStructures/ArchiveRequest.cpp
index 7576a0f151..039c61d860 100644
--- a/common/dataStructures/ArchiveRequest.cpp
+++ b/common/dataStructures/ArchiveRequest.cpp
@@ -25,6 +25,7 @@
cta::common::dataStructures::ArchiveRequest::ArchiveRequest() {
m_checksumTypeSet = false;
m_checksumValueSet = false;
+ m_creationLogSet = false;
m_diskpoolNameSet = false;
m_diskpoolThroughputSet = false;
m_drDataSet = false;
@@ -33,7 +34,6 @@ cta::common::dataStructures::ArchiveRequest::ArchiveRequest() {
m_requesterSet = false;
m_srcURLSet = false;
m_storageClassSet = false;
- m_creationLogSet = false;
}
//------------------------------------------------------------------------------
@@ -95,6 +95,24 @@ std::string cta::common::dataStructures::ArchiveRequest::getChecksumValue() cons
return m_checksumValue;
}
+//------------------------------------------------------------------------------
+// setCreationLog
+//------------------------------------------------------------------------------
+void cta::common::dataStructures::ArchiveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
+ m_creationLog = creationLog;
+ m_creationLogSet = true;
+}
+
+//------------------------------------------------------------------------------
+// getCreationLog
+//------------------------------------------------------------------------------
+cta::common::dataStructures::EntryLog cta::common::dataStructures::ArchiveRequest::getCreationLog() const {
+ if(!allFieldsSet()) {
+ throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the ArchiveRequest have been set!");
+ }
+ return m_creationLog;
+}
+
//------------------------------------------------------------------------------
// setDiskpoolName
//------------------------------------------------------------------------------
@@ -238,21 +256,3 @@ std::string cta::common::dataStructures::ArchiveRequest::getStorageClass() const
}
return m_storageClass;
}
-
-//------------------------------------------------------------------------------
-// setCreationLog
-//------------------------------------------------------------------------------
-void cta::common::dataStructures::ArchiveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
- m_creationLog = creationLog;
- m_creationLogSet = true;
-}
-
-//------------------------------------------------------------------------------
-// getCreationLog
-//------------------------------------------------------------------------------
-cta::common::dataStructures::EntryLog cta::common::dataStructures::ArchiveRequest::getCreationLog() const {
- if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
- }
- return m_creationLog;
-}
diff --git a/common/dataStructures/ArchiveRequest.hpp b/common/dataStructures/ArchiveRequest.hpp
index d54fd3f047..83add18a84 100644
--- a/common/dataStructures/ArchiveRequest.hpp
+++ b/common/dataStructures/ArchiveRequest.hpp
@@ -51,6 +51,9 @@ public:
void setChecksumValue(const std::string &checksumValue);
std::string getChecksumValue() const;
+ void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
+ cta::common::dataStructures::EntryLog getCreationLog() const;
+
void setDiskpoolName(const std::string &diskpoolName);
std::string getDiskpoolName() const;
@@ -74,9 +77,6 @@ public:
void setStorageClass(const std::string &storageClass);
std::string getStorageClass() const;
-
- void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
- cta::common::dataStructures::EntryLog getCreationLog() const;
private:
@@ -92,6 +92,9 @@ private:
std::string m_checksumValue;
bool m_checksumValueSet;
+ cta::common::dataStructures::EntryLog m_creationLog;
+ bool m_creationLogSet;
+
std::string m_diskpoolName;
bool m_diskpoolNameSet;
@@ -116,9 +119,6 @@ private:
std::string m_storageClass;
bool m_storageClassSet;
- cta::common::dataStructures::EntryLog m_creationLog;
- bool m_creationLogSet;
-
}; // class ArchiveRequest
} // namespace dataStructures
diff --git a/common/dataStructures/CancelRetrieveRequest.cpp b/common/dataStructures/CancelRetrieveRequest.cpp
index 9000f1c40f..f2e9e00408 100644
--- a/common/dataStructures/CancelRetrieveRequest.cpp
+++ b/common/dataStructures/CancelRetrieveRequest.cpp
@@ -27,7 +27,6 @@ cta::common::dataStructures::CancelRetrieveRequest::CancelRetrieveRequest() {
m_drDataSet = false;
m_dstURLSet = false;
m_requesterSet = false;
- m_creationLogSet = false;
}
//------------------------------------------------------------------------------
@@ -41,7 +40,6 @@ cta::common::dataStructures::CancelRetrieveRequest::~CancelRetrieveRequest() thr
//------------------------------------------------------------------------------
bool cta::common::dataStructures::CancelRetrieveRequest::allFieldsSet() const {
return m_archiveFileIDSet
- && m_creationLogSet
&& m_drDataSet
&& m_dstURLSet
&& m_requesterSet;
@@ -118,21 +116,3 @@ cta::common::dataStructures::Requester cta::common::dataStructures::CancelRetrie
}
return m_requester;
}
-
-//------------------------------------------------------------------------------
-// setCreationLog
-//------------------------------------------------------------------------------
-void cta::common::dataStructures::CancelRetrieveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
- m_creationLog = creationLog;
- m_creationLogSet = true;
-}
-
-//------------------------------------------------------------------------------
-// getCreationLog
-//------------------------------------------------------------------------------
-cta::common::dataStructures::EntryLog cta::common::dataStructures::CancelRetrieveRequest::getCreationLog() const {
- if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
- }
- return m_creationLog;
-}
diff --git a/common/dataStructures/CancelRetrieveRequest.hpp b/common/dataStructures/CancelRetrieveRequest.hpp
index d4fd433364..5f221a0bd9 100644
--- a/common/dataStructures/CancelRetrieveRequest.hpp
+++ b/common/dataStructures/CancelRetrieveRequest.hpp
@@ -24,7 +24,6 @@
#include <string>
#include "common/dataStructures/DRData.hpp"
-#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
@@ -56,9 +55,6 @@ public:
void setRequester(const cta::common::dataStructures::Requester &requester);
cta::common::dataStructures::Requester getRequester() const;
-
- void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
- cta::common::dataStructures::EntryLog getCreationLog() const;
private:
@@ -80,9 +76,6 @@ private:
cta::common::dataStructures::Requester m_requester;
bool m_requesterSet;
- cta::common::dataStructures::EntryLog m_creationLog;
- bool m_creationLogSet;
-
}; // class CancelRetrieveRequest
} // namespace dataStructures
diff --git a/common/dataStructures/Dedication.cpp b/common/dataStructures/Dedication.cpp
index c95bb1f133..4edeaa66fc 100644
--- a/common/dataStructures/Dedication.cpp
+++ b/common/dataStructures/Dedication.cpp
@@ -29,9 +29,9 @@ cta::common::dataStructures::Dedication::Dedication() {
m_driveNameSet = false;
m_fromTimestampSet = false;
m_lastModificationLogSet = false;
+ m_mountGroupSet = false;
m_tagSet = false;
m_untilTimestampSet = false;
- m_mountGroupSet = false;
m_vidSet = false;
}
@@ -51,9 +51,9 @@ bool cta::common::dataStructures::Dedication::allFieldsSet() const {
&& m_driveNameSet
&& m_fromTimestampSet
&& m_lastModificationLogSet
+ && m_mountGroupSet
&& m_tagSet
&& m_untilTimestampSet
- && m_mountGroupSet
&& m_vidSet;
}
@@ -165,6 +165,24 @@ cta::common::dataStructures::EntryLog cta::common::dataStructures::Dedication::g
return m_lastModificationLog;
}
+//------------------------------------------------------------------------------
+// setMountGroup
+//------------------------------------------------------------------------------
+void cta::common::dataStructures::Dedication::setMountGroup(const std::string &mountGroup) {
+ m_mountGroup = mountGroup;
+ m_mountGroupSet = true;
+}
+
+//------------------------------------------------------------------------------
+// getMountGroup
+//------------------------------------------------------------------------------
+std::string cta::common::dataStructures::Dedication::getMountGroup() const {
+ if(!allFieldsSet()) {
+ throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the Dedication have been set!");
+ }
+ return m_mountGroup;
+}
+
//------------------------------------------------------------------------------
// setTag
//------------------------------------------------------------------------------
@@ -201,24 +219,6 @@ uint64_t cta::common::dataStructures::Dedication::getUntilTimestamp() const {
return m_untilTimestamp;
}
-//------------------------------------------------------------------------------
-// setMountGroup
-//------------------------------------------------------------------------------
-void cta::common::dataStructures::Dedication::setMountGroup(const std::string &mountGroup) {
- m_mountGroup = mountGroup;
- m_mountGroupSet = true;
-}
-
-//------------------------------------------------------------------------------
-// getMountGroup
-//------------------------------------------------------------------------------
-std::string cta::common::dataStructures::Dedication::getMountGroup() const {
- if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the Dedication have been set!");
- }
- return m_mountGroup;
-}
-
//------------------------------------------------------------------------------
// setVid
//------------------------------------------------------------------------------
diff --git a/common/dataStructures/Dedication.hpp b/common/dataStructures/Dedication.hpp
index a4f6153ec8..76f1fee360 100644
--- a/common/dataStructures/Dedication.hpp
+++ b/common/dataStructures/Dedication.hpp
@@ -62,15 +62,15 @@ public:
void setLastModificationLog(const cta::common::dataStructures::EntryLog &lastModificationLog);
cta::common::dataStructures::EntryLog getLastModificationLog() const;
+ void setMountGroup(const std::string &mountGroup);
+ std::string getMountGroup() const;
+
void setTag(const std::string &tag);
std::string getTag() const;
void setUntilTimestamp(const uint64_t untilTimestamp);
uint64_t getUntilTimestamp() const;
- void setMountGroup(const std::string &mountGroup);
- std::string getMountGroup() const;
-
void setVid(const std::string &vid);
std::string getVid() const;
@@ -100,15 +100,15 @@ private:
cta::common::dataStructures::EntryLog m_lastModificationLog;
bool m_lastModificationLogSet;
+ std::string m_mountGroup;
+ bool m_mountGroupSet;
+
std::string m_tag;
bool m_tagSet;
uint64_t m_untilTimestamp;
bool m_untilTimestampSet;
- std::string m_mountGroup;
- bool m_mountGroupSet;
-
std::string m_vid;
bool m_vidSet;
diff --git a/common/dataStructures/DeleteArchiveRequest.cpp b/common/dataStructures/DeleteArchiveRequest.cpp
index eb044ed20f..5b8bfc687d 100644
--- a/common/dataStructures/DeleteArchiveRequest.cpp
+++ b/common/dataStructures/DeleteArchiveRequest.cpp
@@ -25,7 +25,6 @@
cta::common::dataStructures::DeleteArchiveRequest::DeleteArchiveRequest() {
m_archiveFileIDSet = false;
m_requesterSet = false;
- m_creationLogSet = false;
}
//------------------------------------------------------------------------------
@@ -39,7 +38,6 @@ cta::common::dataStructures::DeleteArchiveRequest::~DeleteArchiveRequest() throw
//------------------------------------------------------------------------------
bool cta::common::dataStructures::DeleteArchiveRequest::allFieldsSet() const {
return m_archiveFileIDSet
- && m_creationLogSet
&& m_requesterSet;
}
@@ -78,21 +76,3 @@ cta::common::dataStructures::Requester cta::common::dataStructures::DeleteArchiv
}
return m_requester;
}
-
-//------------------------------------------------------------------------------
-// setCreationLog
-//------------------------------------------------------------------------------
-void cta::common::dataStructures::DeleteArchiveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
- m_creationLog = creationLog;
- m_creationLogSet = true;
-}
-
-//------------------------------------------------------------------------------
-// getCreationLog
-//------------------------------------------------------------------------------
-cta::common::dataStructures::EntryLog cta::common::dataStructures::DeleteArchiveRequest::getCreationLog() const {
- if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
- }
- return m_creationLog;
-}
diff --git a/common/dataStructures/DeleteArchiveRequest.hpp b/common/dataStructures/DeleteArchiveRequest.hpp
index 33d61e8ad5..19c02b5c8c 100644
--- a/common/dataStructures/DeleteArchiveRequest.hpp
+++ b/common/dataStructures/DeleteArchiveRequest.hpp
@@ -23,7 +23,6 @@
#include <stdint.h>
#include <string>
-#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
@@ -49,9 +48,6 @@ public:
void setRequester(const cta::common::dataStructures::Requester &requester);
cta::common::dataStructures::Requester getRequester() const;
-
- void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
- cta::common::dataStructures::EntryLog getCreationLog() const;
private:
@@ -67,9 +63,6 @@ private:
cta::common::dataStructures::Requester m_requester;
bool m_requesterSet;
- cta::common::dataStructures::EntryLog m_creationLog;
- bool m_creationLogSet;
-
}; // class DeleteArchiveRequest
} // namespace dataStructures
diff --git a/common/dataStructures/DriveState.cpp b/common/dataStructures/DriveState.cpp
index 56f0d08419..e63c821940 100644
--- a/common/dataStructures/DriveState.cpp
+++ b/common/dataStructures/DriveState.cpp
@@ -28,11 +28,11 @@ cta::common::dataStructures::DriveState::DriveState() {
m_currentTapePoolSet = false;
m_currentVidSet = false;
m_filesTransferedInSessionSet = false;
+ m_hostSet = false;
m_latestBandwidthSet = false;
m_logicalLibrarySet = false;
m_mountTypeSet = false;
m_nameSet = false;
- m_hostSet = false;
m_sessionIdSet = false;
m_sessionStartTimeSet = false;
m_statusSet = false;
@@ -53,11 +53,11 @@ bool cta::common::dataStructures::DriveState::allFieldsSet() const {
&& m_currentTapePoolSet
&& m_currentVidSet
&& m_filesTransferedInSessionSet
+ && m_hostSet
&& m_latestBandwidthSet
&& m_logicalLibrarySet
&& m_mountTypeSet
&& m_nameSet
- && m_hostSet
&& m_sessionIdSet
&& m_sessionStartTimeSet
&& m_statusSet;
@@ -153,10 +153,28 @@ uint64_t cta::common::dataStructures::DriveState::getFilesTransferedInSession()
return m_filesTransferedInSession;
}
+//------------------------------------------------------------------------------
+// setHost
+//------------------------------------------------------------------------------
+void cta::common::dataStructures::DriveState::setHost(const std::string &host) {
+ m_host = host;
+ m_hostSet = true;
+}
+
+//------------------------------------------------------------------------------
+// getHost
+//------------------------------------------------------------------------------
+std::string cta::common::dataStructures::DriveState::getHost() const {
+ if(!allFieldsSet()) {
+ throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the DriveState have been set!");
+ }
+ return m_host;
+}
+
//------------------------------------------------------------------------------
// setLatestBandwidth
//------------------------------------------------------------------------------
-void cta::common::dataStructures::DriveState::setLatestBandwidth(const double &latestBandwidth) {
+void cta::common::dataStructures::DriveState::setLatestBandwidth(const uint64_t latestBandwidth) {
m_latestBandwidth = latestBandwidth;
m_latestBandwidthSet = true;
}
@@ -164,7 +182,7 @@ void cta::common::dataStructures::DriveState::setLatestBandwidth(const double &l
//------------------------------------------------------------------------------
// getLatestBandwidth
//------------------------------------------------------------------------------
-double cta::common::dataStructures::DriveState::getLatestBandwidth() const {
+uint64_t cta::common::dataStructures::DriveState::getLatestBandwidth() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the DriveState have been set!");
}
@@ -225,24 +243,6 @@ std::string cta::common::dataStructures::DriveState::getName() const {
return m_name;
}
-//------------------------------------------------------------------------------
-// setHost
-//------------------------------------------------------------------------------
-void cta::common::dataStructures::DriveState::setHost(const std::string &host) {
- m_host = host;
- m_hostSet = true;
-}
-
-//------------------------------------------------------------------------------
-// getHost
-//------------------------------------------------------------------------------
-std::string cta::common::dataStructures::DriveState::getHost() const {
- if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the DriveState have been set!");
- }
- return m_host;
-}
-
//------------------------------------------------------------------------------
// setSessionId
//------------------------------------------------------------------------------
diff --git a/common/dataStructures/DriveState.hpp b/common/dataStructures/DriveState.hpp
index 1477b517dc..5700487b95 100644
--- a/common/dataStructures/DriveState.hpp
+++ b/common/dataStructures/DriveState.hpp
@@ -59,8 +59,11 @@ public:
void setFilesTransferedInSession(const uint64_t filesTransferedInSession);
uint64_t getFilesTransferedInSession() const;
- void setLatestBandwidth(const double &latestBandwidth);
- double getLatestBandwidth() const;
+ void setHost(const std::string &host);
+ std::string getHost() const;
+
+ void setLatestBandwidth(const uint64_t latestBandwidth);
+ uint64_t getLatestBandwidth() const;
void setLogicalLibrary(const std::string &logicalLibrary);
std::string getLogicalLibrary() const;
@@ -71,9 +74,6 @@ public:
void setName(const std::string &name);
std::string getName() const;
- void setHost(const std::string &host);
- std::string getHost() const;
-
void setSessionId(const uint64_t sessionId);
uint64_t getSessionId() const;
@@ -106,7 +106,10 @@ private:
uint64_t m_filesTransferedInSession;
bool m_filesTransferedInSessionSet;
- double m_latestBandwidth;
+ std::string m_host;
+ bool m_hostSet;
+
+ uint64_t m_latestBandwidth;
bool m_latestBandwidthSet;
std::string m_logicalLibrary;
@@ -118,9 +121,6 @@ private:
std::string m_name;
bool m_nameSet;
- std::string m_host;
- bool m_hostSet;
-
uint64_t m_sessionId;
bool m_sessionIdSet;
diff --git a/common/dataStructures/EntryLog.cpp b/common/dataStructures/EntryLog.cpp
index 3cb8e61355..a2b818663b 100644
--- a/common/dataStructures/EntryLog.cpp
+++ b/common/dataStructures/EntryLog.cpp
@@ -34,22 +34,6 @@ cta::common::dataStructures::EntryLog::EntryLog() {
cta::common::dataStructures::EntryLog::~EntryLog() throw() {
}
-//------------------------------------------------------------------------------
-// operator==
-//------------------------------------------------------------------------------
-bool cta::common::dataStructures::EntryLog::operator==(const EntryLog &rhs)
- const {
- if(!allFieldsSet()) {
- throw exception::Exception(
- "Not all of fields of EntryLog on LHS of == are set");
- }
- if(!rhs.allFieldsSet()) {
- throw exception::Exception(
- "Not all of fields of EntryLog on RHS of == are set");
- }
- return m_host == rhs.m_host && m_time == rhs.m_time && m_user == rhs.m_user;
-}
-
//------------------------------------------------------------------------------
// allFieldsSet
//------------------------------------------------------------------------------
@@ -112,19 +96,3 @@ cta::common::dataStructures::UserIdentity cta::common::dataStructures::EntryLog:
}
return m_user;
}
-
-//------------------------------------------------------------------------------
-// operator<<
-//------------------------------------------------------------------------------
-std::ostream &cta::common::dataStructures::operator<<(std::ostream &os,
- const cta::common::dataStructures::EntryLog &entryLog) {
- if(!entryLog.allFieldsSet()) {
- throw exception::Exception(
- "operator<<( for EntryLog failed: Not all fields are set");
- }
- os << "{"
- "host=" << entryLog.getHost() << " " <<
- "time=" << entryLog.getTime() << " " <<
- "user=" << entryLog.getUser() << "}";
- return os;
-}
diff --git a/common/dataStructures/EntryLog.hpp b/common/dataStructures/EntryLog.hpp
index 3b95ec5f32..96372c8bf3 100644
--- a/common/dataStructures/EntryLog.hpp
+++ b/common/dataStructures/EntryLog.hpp
@@ -18,14 +18,13 @@
#pragma once
-#include "common/dataStructures/UserIdentity.hpp"
-
#include <list>
#include <map>
-#include <ostream>
#include <stdint.h>
#include <string>
+#include "common/dataStructures/UserIdentity.hpp"
+
namespace cta {
namespace common {
namespace dataStructures {
@@ -44,13 +43,6 @@ public:
*/
~EntryLog() throw();
- /**
- * Equality operator.
- *
- * @param rhs The right hand side of the operator.
- */
- bool operator==(const EntryLog &rhs) const;
-
void setHost(const std::string &host);
std::string getHost() const;
@@ -59,6 +51,7 @@ public:
void setUser(const cta::common::dataStructures::UserIdentity &user);
cta::common::dataStructures::UserIdentity getUser() const;
+
private:
@@ -76,19 +69,8 @@ private:
cta::common::dataStructures::UserIdentity m_user;
bool m_userSet;
- friend std::ostream &operator<<(std::ostream &, const EntryLog &);
-
}; // class EntryLog
-/**
- * Output stream operator for EntryLog.
- *
- * @param os The output stream.
- * @param entryLog The entry log.
- * @return The output stream.
- */
-std::ostream &operator<<(std::ostream &os, const EntryLog &entryLog);
-
} // namespace dataStructures
} // namespace common
} // namespace cta
diff --git a/common/dataStructures/ListStorageClassRequest.cpp b/common/dataStructures/ListStorageClassRequest.cpp
index b3c2392a1f..4d7309fda5 100644
--- a/common/dataStructures/ListStorageClassRequest.cpp
+++ b/common/dataStructures/ListStorageClassRequest.cpp
@@ -24,7 +24,6 @@
//------------------------------------------------------------------------------
cta::common::dataStructures::ListStorageClassRequest::ListStorageClassRequest() {
m_requesterSet = false;
- m_creationLogSet = false;
}
//------------------------------------------------------------------------------
@@ -37,8 +36,7 @@ cta::common::dataStructures::ListStorageClassRequest::~ListStorageClassRequest()
// allFieldsSet
//------------------------------------------------------------------------------
bool cta::common::dataStructures::ListStorageClassRequest::allFieldsSet() const {
- return m_requesterSet
- && m_creationLogSet;
+ return m_requesterSet;
}
//------------------------------------------------------------------------------
@@ -58,21 +56,3 @@ cta::common::dataStructures::Requester cta::common::dataStructures::ListStorageC
}
return m_requester;
}
-
-//------------------------------------------------------------------------------
-// setCreationLog
-//------------------------------------------------------------------------------
-void cta::common::dataStructures::ListStorageClassRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
- m_creationLog = creationLog;
- m_creationLogSet = true;
-}
-
-//------------------------------------------------------------------------------
-// getCreationLog
-//------------------------------------------------------------------------------
-cta::common::dataStructures::EntryLog cta::common::dataStructures::ListStorageClassRequest::getCreationLog() const {
- if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
- }
- return m_creationLog;
-}
diff --git a/common/dataStructures/ListStorageClassRequest.hpp b/common/dataStructures/ListStorageClassRequest.hpp
index c1b08baf64..d8948ed2c8 100644
--- a/common/dataStructures/ListStorageClassRequest.hpp
+++ b/common/dataStructures/ListStorageClassRequest.hpp
@@ -23,7 +23,6 @@
#include <stdint.h>
#include <string>
-#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
@@ -46,9 +45,6 @@ public:
void setRequester(const cta::common::dataStructures::Requester &requester);
cta::common::dataStructures::Requester getRequester() const;
-
- void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
- cta::common::dataStructures::EntryLog getCreationLog() const;
private:
@@ -61,9 +57,6 @@ private:
cta::common::dataStructures::Requester m_requester;
bool m_requesterSet;
- cta::common::dataStructures::EntryLog m_creationLog;
- bool m_creationLogSet;
-
}; // class ListStorageClassRequest
} // namespace dataStructures
diff --git a/common/dataStructures/ReadTestResult.cpp b/common/dataStructures/ReadTestResult.cpp
index b3a48561a4..32e1e59908 100644
--- a/common/dataStructures/ReadTestResult.cpp
+++ b/common/dataStructures/ReadTestResult.cpp
@@ -26,6 +26,7 @@ cta::common::dataStructures::ReadTestResult::ReadTestResult() {
m_checksumsSet = false;
m_driveNameSet = false;
m_errorsSet = false;
+ m_noOfFilesReadSet = false;
m_totalBytesReadSet = false;
m_totalFilesReadSet = false;
m_totalTimeInSecondsSet = false;
@@ -45,6 +46,7 @@ bool cta::common::dataStructures::ReadTestResult::allFieldsSet() const {
return m_checksumsSet
&& m_driveNameSet
&& m_errorsSet
+ && m_noOfFilesReadSet
&& m_totalBytesReadSet
&& m_totalFilesReadSet
&& m_totalTimeInSecondsSet
@@ -54,7 +56,7 @@ bool cta::common::dataStructures::ReadTestResult::allFieldsSet() const {
//------------------------------------------------------------------------------
// setChecksums
//------------------------------------------------------------------------------
-void cta::common::dataStructures::ReadTestResult::setChecksums(const std::map<int,std::pair<std::string,std::string>> &checksums) {
+void cta::common::dataStructures::ReadTestResult::setChecksums(const std::map<uint64_t,std::pair<std::string,std::string>> &checksums) {
m_checksums = checksums;
m_checksumsSet = true;
}
@@ -62,7 +64,7 @@ void cta::common::dataStructures::ReadTestResult::setChecksums(const std::map<in
//------------------------------------------------------------------------------
// getChecksums
//------------------------------------------------------------------------------
-std::map<int,std::pair<std::string,std::string>> cta::common::dataStructures::ReadTestResult::getChecksums() const {
+std::map<uint64_t,std::pair<std::string,std::string>> cta::common::dataStructures::ReadTestResult::getChecksums() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the ReadTestResult have been set!");
}
@@ -90,7 +92,7 @@ std::string cta::common::dataStructures::ReadTestResult::getDriveName() const {
//------------------------------------------------------------------------------
// setErrors
//------------------------------------------------------------------------------
-void cta::common::dataStructures::ReadTestResult::setErrors(const std::map<int,std::string> &errors) {
+void cta::common::dataStructures::ReadTestResult::setErrors(const std::map<uint64_t,std::string> &errors) {
m_errors = errors;
m_errorsSet = true;
}
@@ -98,13 +100,31 @@ void cta::common::dataStructures::ReadTestResult::setErrors(const std::map<int,s
//------------------------------------------------------------------------------
// getErrors
//------------------------------------------------------------------------------
-std::map<int,std::string> cta::common::dataStructures::ReadTestResult::getErrors() const {
+std::map<uint64_t,std::string> cta::common::dataStructures::ReadTestResult::getErrors() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the ReadTestResult have been set!");
}
return m_errors;
}
+//------------------------------------------------------------------------------
+// setNoOfFilesRead
+//------------------------------------------------------------------------------
+void cta::common::dataStructures::ReadTestResult::setNoOfFilesRead(const uint64_t noOfFilesRead) {
+ m_noOfFilesRead = noOfFilesRead;
+ m_noOfFilesReadSet = true;
+}
+
+//------------------------------------------------------------------------------
+// getNoOfFilesRead
+//------------------------------------------------------------------------------
+uint64_t cta::common::dataStructures::ReadTestResult::getNoOfFilesRead() const {
+ if(!allFieldsSet()) {
+ throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the ReadTestResult have been set!");
+ }
+ return m_noOfFilesRead;
+}
+
//------------------------------------------------------------------------------
// setTotalBytesRead
//------------------------------------------------------------------------------
diff --git a/common/dataStructures/ReadTestResult.hpp b/common/dataStructures/ReadTestResult.hpp
index f338398a0c..4e1b55d3a5 100644
--- a/common/dataStructures/ReadTestResult.hpp
+++ b/common/dataStructures/ReadTestResult.hpp
@@ -42,14 +42,17 @@ public:
*/
~ReadTestResult() throw();
- void setChecksums(const std::map<int,std::pair<std::string,std::string>> &checksums);
- std::map<int,std::pair<std::string,std::string>> getChecksums() const;
+ void setChecksums(const std::map<uint64_t,std::pair<std::string,std::string>> &checksums);
+ std::map<uint64_t,std::pair<std::string,std::string>> getChecksums() const;
void setDriveName(const std::string &driveName);
std::string getDriveName() const;
- void setErrors(const std::map<int,std::string> &errors);
- std::map<int,std::string> getErrors() const;
+ void setErrors(const std::map<uint64_t,std::string> &errors);
+ std::map<uint64_t,std::string> getErrors() const;
+
+ void setNoOfFilesRead(const uint64_t noOfFilesRead);
+ uint64_t getNoOfFilesRead() const;
void setTotalBytesRead(const uint64_t totalBytesRead);
uint64_t getTotalBytesRead() const;
@@ -71,15 +74,18 @@ private:
*/
bool allFieldsSet() const;
- std::map<int,std::pair<std::string,std::string>> m_checksums;
+ std::map<uint64_t,std::pair<std::string,std::string>> m_checksums;
bool m_checksumsSet;
std::string m_driveName;
bool m_driveNameSet;
- std::map<int,std::string> m_errors;
+ std::map<uint64_t,std::string> m_errors;
bool m_errorsSet;
+ uint64_t m_noOfFilesRead;
+ bool m_noOfFilesReadSet;
+
uint64_t m_totalBytesRead;
bool m_totalBytesReadSet;
diff --git a/common/dataStructures/RepackInfo.cpp b/common/dataStructures/RepackInfo.cpp
index 5d97f6bfe1..b57d984dc9 100644
--- a/common/dataStructures/RepackInfo.cpp
+++ b/common/dataStructures/RepackInfo.cpp
@@ -25,8 +25,8 @@
cta::common::dataStructures::RepackInfo::RepackInfo() {
m_creationLogSet = false;
m_errorsSet = false;
- m_filesFailedSet = false;
m_filesArchivedSet = false;
+ m_filesFailedSet = false;
m_filesToArchiveSet = false;
m_filesToRetrieveSet = false;
m_repackStatusSet = false;
@@ -49,8 +49,8 @@ cta::common::dataStructures::RepackInfo::~RepackInfo() throw() {
bool cta::common::dataStructures::RepackInfo::allFieldsSet() const {
return m_creationLogSet
&& m_errorsSet
- && m_filesFailedSet
&& m_filesArchivedSet
+ && m_filesFailedSet
&& m_filesToArchiveSet
&& m_filesToRetrieveSet
&& m_repackStatusSet
@@ -98,43 +98,43 @@ std::map<uint64_t,std::string> cta::common::dataStructures::RepackInfo::getError
}
//------------------------------------------------------------------------------
-// setFilesFailed
+// setFilesArchived
//------------------------------------------------------------------------------
-void cta::common::dataStructures::RepackInfo::setFilesFailed(const uint64_t filesFailed) {
- m_filesFailed = filesFailed;
- m_filesFailedSet = true;
+void cta::common::dataStructures::RepackInfo::setFilesArchived(const uint64_t filesArchived) {
+ m_filesArchived = filesArchived;
+ m_filesArchivedSet = true;
}
//------------------------------------------------------------------------------
-// getFilesFailed
+// getFilesArchived
//------------------------------------------------------------------------------
-uint64_t cta::common::dataStructures::RepackInfo::getFilesFailed() const {
+uint64_t cta::common::dataStructures::RepackInfo::getFilesArchived() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the RepackInfo have been set!");
}
- return m_filesFailed;
+ return m_filesArchived;
}
//------------------------------------------------------------------------------
-// setFilesMigrated
+// setFilesFailed
//------------------------------------------------------------------------------
-void cta::common::dataStructures::RepackInfo::setFilesArchived(const uint64_t filesArchived) {
- m_filesArchived = filesArchived;
- m_filesArchivedSet = true;
+void cta::common::dataStructures::RepackInfo::setFilesFailed(const uint64_t filesFailed) {
+ m_filesFailed = filesFailed;
+ m_filesFailedSet = true;
}
//------------------------------------------------------------------------------
-// getFilesMigrated
+// getFilesFailed
//------------------------------------------------------------------------------
-uint64_t cta::common::dataStructures::RepackInfo::getFilesArchived() const {
+uint64_t cta::common::dataStructures::RepackInfo::getFilesFailed() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the RepackInfo have been set!");
}
- return m_filesArchived;
+ return m_filesFailed;
}
//------------------------------------------------------------------------------
-// setFilesToMigr
+// setFilesToArchive
//------------------------------------------------------------------------------
void cta::common::dataStructures::RepackInfo::setFilesToArchive(const uint64_t filesToArchive) {
m_filesToArchive = filesToArchive;
@@ -142,7 +142,7 @@ void cta::common::dataStructures::RepackInfo::setFilesToArchive(const uint64_t f
}
//------------------------------------------------------------------------------
-// getFilesToMigr
+// getFilesToArchive
//------------------------------------------------------------------------------
uint64_t cta::common::dataStructures::RepackInfo::getFilesToArchive() const {
if(!allFieldsSet()) {
@@ -152,7 +152,7 @@ uint64_t cta::common::dataStructures::RepackInfo::getFilesToArchive() const {
}
//------------------------------------------------------------------------------
-// setFilesToRecall
+// setFilesToRetrieve
//------------------------------------------------------------------------------
void cta::common::dataStructures::RepackInfo::setFilesToRetrieve(const uint64_t filesToRetrieve) {
m_filesToRetrieve = filesToRetrieve;
@@ -160,7 +160,7 @@ void cta::common::dataStructures::RepackInfo::setFilesToRetrieve(const uint64_t
}
//------------------------------------------------------------------------------
-// getFilesToRecall
+// getFilesToRetrieve
//------------------------------------------------------------------------------
uint64_t cta::common::dataStructures::RepackInfo::getFilesToRetrieve() const {
if(!allFieldsSet()) {
diff --git a/common/dataStructures/RepackInfo.hpp b/common/dataStructures/RepackInfo.hpp
index 8f89122d7b..be596d50a6 100644
--- a/common/dataStructures/RepackInfo.hpp
+++ b/common/dataStructures/RepackInfo.hpp
@@ -50,12 +50,12 @@ public:
void setErrors(const std::map<uint64_t,std::string> &errors);
std::map<uint64_t,std::string> getErrors() const;
- void setFilesFailed(const uint64_t filesFailed);
- uint64_t getFilesFailed() const;
-
void setFilesArchived(const uint64_t filesArchived);
uint64_t getFilesArchived() const;
+ void setFilesFailed(const uint64_t filesFailed);
+ uint64_t getFilesFailed() const;
+
void setFilesToArchive(const uint64_t filesToArchive);
uint64_t getFilesToArchive() const;
@@ -94,12 +94,12 @@ private:
std::map<uint64_t,std::string> m_errors;
bool m_errorsSet;
- uint64_t m_filesFailed;
- bool m_filesFailedSet;
-
uint64_t m_filesArchived;
bool m_filesArchivedSet;
+ uint64_t m_filesFailed;
+ bool m_filesFailedSet;
+
uint64_t m_filesToArchive;
bool m_filesToArchiveSet;
diff --git a/common/dataStructures/RetrieveJob.cpp b/common/dataStructures/RetrieveJob.cpp
index 99f291ac1e..c13fbf1518 100644
--- a/common/dataStructures/RetrieveJob.cpp
+++ b/common/dataStructures/RetrieveJob.cpp
@@ -62,7 +62,7 @@ cta::common::dataStructures::RetrieveRequest cta::common::dataStructures::Retrie
//------------------------------------------------------------------------------
// setTapeCopies
//------------------------------------------------------------------------------
-void cta::common::dataStructures::RetrieveJob::setTapeCopies(const std::map<std::string,std::pair<int,cta::common::dataStructures::TapeFileLocation>> &tapeCopies) {
+void cta::common::dataStructures::RetrieveJob::setTapeCopies(const std::map<std::string,std::pair<uint64_t,cta::common::dataStructures::TapeFileLocation>> &tapeCopies) {
m_tapeCopies = tapeCopies;
m_tapeCopiesSet = true;
}
@@ -70,7 +70,7 @@ void cta::common::dataStructures::RetrieveJob::setTapeCopies(const std::map<std:
//------------------------------------------------------------------------------
// getTapeCopies
//------------------------------------------------------------------------------
-std::map<std::string,std::pair<int,cta::common::dataStructures::TapeFileLocation>> cta::common::dataStructures::RetrieveJob::getTapeCopies() const {
+std::map<std::string,std::pair<uint64_t,cta::common::dataStructures::TapeFileLocation>> cta::common::dataStructures::RetrieveJob::getTapeCopies() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the RetrieveJob have been set!");
}
diff --git a/common/dataStructures/RetrieveJob.hpp b/common/dataStructures/RetrieveJob.hpp
index 61722c6fbc..1edfedefd4 100644
--- a/common/dataStructures/RetrieveJob.hpp
+++ b/common/dataStructures/RetrieveJob.hpp
@@ -47,8 +47,8 @@ public:
void setRequest(const cta::common::dataStructures::RetrieveRequest &request);
cta::common::dataStructures::RetrieveRequest getRequest() const;
- void setTapeCopies(const std::map<std::string,std::pair<int,cta::common::dataStructures::TapeFileLocation>> &tapeCopies);
- std::map<std::string,std::pair<int,cta::common::dataStructures::TapeFileLocation>> getTapeCopies() const;
+ void setTapeCopies(const std::map<std::string,std::pair<uint64_t,cta::common::dataStructures::TapeFileLocation>> &tapeCopies);
+ std::map<std::string,std::pair<uint64_t,cta::common::dataStructures::TapeFileLocation>> getTapeCopies() const;
private:
@@ -61,7 +61,7 @@ private:
cta::common::dataStructures::RetrieveRequest m_request;
bool m_requestSet;
- std::map<std::string,std::pair<int,cta::common::dataStructures::TapeFileLocation>> m_tapeCopies;
+ std::map<std::string,std::pair<uint64_t,cta::common::dataStructures::TapeFileLocation>> m_tapeCopies;
bool m_tapeCopiesSet;
}; // class RetrieveJob
diff --git a/common/dataStructures/RetrieveRequest.cpp b/common/dataStructures/RetrieveRequest.cpp
index 75c25aa595..32c405ef84 100644
--- a/common/dataStructures/RetrieveRequest.cpp
+++ b/common/dataStructures/RetrieveRequest.cpp
@@ -24,12 +24,12 @@
//------------------------------------------------------------------------------
cta::common::dataStructures::RetrieveRequest::RetrieveRequest() {
m_archiveFileIDSet = false;
+ m_creationLogSet = false;
m_diskpoolNameSet = false;
m_diskpoolThroughputSet = false;
m_drDataSet = false;
m_dstURLSet = false;
m_requesterSet = false;
- m_creationLogSet = false;
}
//------------------------------------------------------------------------------
@@ -69,6 +69,24 @@ uint64_t cta::common::dataStructures::RetrieveRequest::getArchiveFileID() const
return m_archiveFileID;
}
+//------------------------------------------------------------------------------
+// setCreationLog
+//------------------------------------------------------------------------------
+void cta::common::dataStructures::RetrieveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
+ m_creationLog = creationLog;
+ m_creationLogSet = true;
+}
+
+//------------------------------------------------------------------------------
+// getCreationLog
+//------------------------------------------------------------------------------
+cta::common::dataStructures::EntryLog cta::common::dataStructures::RetrieveRequest::getCreationLog() const {
+ if(!allFieldsSet()) {
+ throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the RetrieveRequest have been set!");
+ }
+ return m_creationLog;
+}
+
//------------------------------------------------------------------------------
// setDiskpoolName
//------------------------------------------------------------------------------
@@ -158,21 +176,3 @@ cta::common::dataStructures::Requester cta::common::dataStructures::RetrieveRequ
}
return m_requester;
}
-
-//------------------------------------------------------------------------------
-// setCreationLog
-//------------------------------------------------------------------------------
-void cta::common::dataStructures::RetrieveRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
- m_creationLog = creationLog;
- m_creationLogSet = true;
-}
-
-//------------------------------------------------------------------------------
-// getCreationLog
-//------------------------------------------------------------------------------
-cta::common::dataStructures::EntryLog cta::common::dataStructures::RetrieveRequest::getCreationLog() const {
- if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
- }
- return m_creationLog;
-}
diff --git a/common/dataStructures/RetrieveRequest.hpp b/common/dataStructures/RetrieveRequest.hpp
index d025121f0a..e40fe6988c 100644
--- a/common/dataStructures/RetrieveRequest.hpp
+++ b/common/dataStructures/RetrieveRequest.hpp
@@ -48,6 +48,9 @@ public:
void setArchiveFileID(const uint64_t archiveFileID);
uint64_t getArchiveFileID() const;
+ void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
+ cta::common::dataStructures::EntryLog getCreationLog() const;
+
void setDiskpoolName(const std::string &diskpoolName);
std::string getDiskpoolName() const;
@@ -62,9 +65,6 @@ public:
void setRequester(const cta::common::dataStructures::Requester &requester);
cta::common::dataStructures::Requester getRequester() const;
-
- void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
- cta::common::dataStructures::EntryLog getCreationLog() const;
private:
@@ -77,6 +77,9 @@ private:
uint64_t m_archiveFileID;
bool m_archiveFileIDSet;
+ cta::common::dataStructures::EntryLog m_creationLog;
+ bool m_creationLogSet;
+
std::string m_diskpoolName;
bool m_diskpoolNameSet;
@@ -92,9 +95,6 @@ private:
cta::common::dataStructures::Requester m_requester;
bool m_requesterSet;
- cta::common::dataStructures::EntryLog m_creationLog;
- bool m_creationLogSet;
-
}; // class RetrieveRequest
} // namespace dataStructures
diff --git a/common/dataStructures/UpdateFileInfoRequest.cpp b/common/dataStructures/UpdateFileInfoRequest.cpp
index c12fa3f610..f37171ccf8 100644
--- a/common/dataStructures/UpdateFileInfoRequest.cpp
+++ b/common/dataStructures/UpdateFileInfoRequest.cpp
@@ -27,7 +27,6 @@ cta::common::dataStructures::UpdateFileInfoRequest::UpdateFileInfoRequest() {
m_drDataSet = false;
m_requesterSet = false;
m_storageClassSet = false;
- m_creationLogSet = false;
}
//------------------------------------------------------------------------------
@@ -41,7 +40,6 @@ cta::common::dataStructures::UpdateFileInfoRequest::~UpdateFileInfoRequest() thr
//------------------------------------------------------------------------------
bool cta::common::dataStructures::UpdateFileInfoRequest::allFieldsSet() const {
return m_archiveFileIDSet
- && m_creationLogSet
&& m_drDataSet
&& m_requesterSet
&& m_storageClassSet;
@@ -118,21 +116,3 @@ std::string cta::common::dataStructures::UpdateFileInfoRequest::getStorageClass(
}
return m_storageClass;
}
-
-//------------------------------------------------------------------------------
-// setCreationLog
-//------------------------------------------------------------------------------
-void cta::common::dataStructures::UpdateFileInfoRequest::setCreationLog(const cta::common::dataStructures::EntryLog &creationLog) {
- m_creationLog = creationLog;
- m_creationLogSet = true;
-}
-
-//------------------------------------------------------------------------------
-// getCreationLog
-//------------------------------------------------------------------------------
-cta::common::dataStructures::EntryLog cta::common::dataStructures::UpdateFileInfoRequest::getCreationLog() const {
- if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the AdminHost have been set!");
- }
- return m_creationLog;
-}
diff --git a/common/dataStructures/UpdateFileInfoRequest.hpp b/common/dataStructures/UpdateFileInfoRequest.hpp
index a4adb8db3c..5d0d676df9 100644
--- a/common/dataStructures/UpdateFileInfoRequest.hpp
+++ b/common/dataStructures/UpdateFileInfoRequest.hpp
@@ -24,7 +24,6 @@
#include <string>
#include "common/dataStructures/DRData.hpp"
-#include "common/dataStructures/EntryLog.hpp"
#include "common/dataStructures/Requester.hpp"
namespace cta {
@@ -56,9 +55,6 @@ public:
void setStorageClass(const std::string &storageClass);
std::string getStorageClass() const;
-
- void setCreationLog(const cta::common::dataStructures::EntryLog &creationLog);
- cta::common::dataStructures::EntryLog getCreationLog() const;
private:
@@ -80,9 +76,6 @@ private:
std::string m_storageClass;
bool m_storageClassSet;
- cta::common::dataStructures::EntryLog m_creationLog;
- bool m_creationLogSet;
-
}; // class UpdateFileInfoRequest
} // namespace dataStructures
diff --git a/common/dataStructures/User.cpp b/common/dataStructures/User.cpp
index 26be5ebc8d..9926eadc89 100644
--- a/common/dataStructures/User.cpp
+++ b/common/dataStructures/User.cpp
@@ -27,8 +27,8 @@ cta::common::dataStructures::User::User() {
m_creationLogSet = false;
m_groupSet = false;
m_lastModificationLogSet = false;
- m_nameSet = false;
m_mountGroupNameSet = false;
+ m_nameSet = false;
}
//------------------------------------------------------------------------------
@@ -45,8 +45,8 @@ bool cta::common::dataStructures::User::allFieldsSet() const {
&& m_creationLogSet
&& m_groupSet
&& m_lastModificationLogSet
- && m_nameSet
- && m_mountGroupNameSet;
+ && m_mountGroupNameSet
+ && m_nameSet;
}
//------------------------------------------------------------------------------
@@ -122,37 +122,37 @@ cta::common::dataStructures::EntryLog cta::common::dataStructures::User::getLast
}
//------------------------------------------------------------------------------
-// setName
+// setMountGroupName
//------------------------------------------------------------------------------
-void cta::common::dataStructures::User::setName(const std::string &name) {
- m_name = name;
- m_nameSet = true;
+void cta::common::dataStructures::User::setMountGroupName(const std::string &mountGroupName) {
+ m_mountGroupName = mountGroupName;
+ m_mountGroupNameSet = true;
}
//------------------------------------------------------------------------------
-// getName
+// getMountGroupName
//------------------------------------------------------------------------------
-std::string cta::common::dataStructures::User::getName() const {
+std::string cta::common::dataStructures::User::getMountGroupName() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the User have been set!");
}
- return m_name;
+ return m_mountGroupName;
}
//------------------------------------------------------------------------------
-// setMountGroupName
+// setName
//------------------------------------------------------------------------------
-void cta::common::dataStructures::User::setMountGroupName(const std::string &mountGroupName) {
- m_mountGroupName = mountGroupName;
- m_mountGroupNameSet = true;
+void cta::common::dataStructures::User::setName(const std::string &name) {
+ m_name = name;
+ m_nameSet = true;
}
//------------------------------------------------------------------------------
-// getMountGroupName
+// getName
//------------------------------------------------------------------------------
-std::string cta::common::dataStructures::User::getMountGroupName() const {
+std::string cta::common::dataStructures::User::getName() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the User have been set!");
}
- return m_mountGroupName;
+ return m_name;
}
diff --git a/common/dataStructures/User.hpp b/common/dataStructures/User.hpp
index 991decbd63..3b80424487 100644
--- a/common/dataStructures/User.hpp
+++ b/common/dataStructures/User.hpp
@@ -55,11 +55,11 @@ public:
void setLastModificationLog(const cta::common::dataStructures::EntryLog &lastModificationLog);
cta::common::dataStructures::EntryLog getLastModificationLog() const;
- void setName(const std::string &name);
- std::string getName() const;
-
void setMountGroupName(const std::string &mountGroupName);
std::string getMountGroupName() const;
+
+ void setName(const std::string &name);
+ std::string getName() const;
private:
@@ -81,12 +81,12 @@ private:
cta::common::dataStructures::EntryLog m_lastModificationLog;
bool m_lastModificationLogSet;
- std::string m_name;
- bool m_nameSet;
-
std::string m_mountGroupName;
bool m_mountGroupNameSet;
+ std::string m_name;
+ bool m_nameSet;
+
}; // class User
} // namespace dataStructures
diff --git a/common/dataStructures/UserIdentity.cpp b/common/dataStructures/UserIdentity.cpp
index 7221827542..715e0b3828 100644
--- a/common/dataStructures/UserIdentity.cpp
+++ b/common/dataStructures/UserIdentity.cpp
@@ -23,8 +23,8 @@
// constructor
//------------------------------------------------------------------------------
cta::common::dataStructures::UserIdentity::UserIdentity() {
- m_gidSet = false;
- m_uidSet = false;
+ m_groupSet = false;
+ m_nameSet = false;
}
//------------------------------------------------------------------------------
@@ -33,75 +33,46 @@ cta::common::dataStructures::UserIdentity::UserIdentity() {
cta::common::dataStructures::UserIdentity::~UserIdentity() throw() {
}
-//------------------------------------------------------------------------------
-// operator==
-//------------------------------------------------------------------------------
-bool cta::common::dataStructures::UserIdentity::operator==(
- const UserIdentity &rhs) const {
- if(!allFieldsSet()) {
- throw exception::Exception(
- "Not all of fields of UserIdentity on LHS of == are set");
- }
- if(!rhs.allFieldsSet()) {
- throw exception::Exception(
- "Not all of fields of UserIdentity on RHS of == are set");
- }
- return m_gid == rhs.m_gid && m_uidSet == rhs.m_uidSet;
-}
-
//------------------------------------------------------------------------------
// allFieldsSet
//------------------------------------------------------------------------------
bool cta::common::dataStructures::UserIdentity::allFieldsSet() const {
- return m_gidSet
- && m_uidSet;
+ return m_groupSet
+ && m_nameSet;
}
//------------------------------------------------------------------------------
-// setGid
+// setGroup
//------------------------------------------------------------------------------
-void cta::common::dataStructures::UserIdentity::setGid(const uint64_t gid) {
- m_gid = gid;
- m_gidSet = true;
+void cta::common::dataStructures::UserIdentity::setGroup(const std::string &group) {
+ m_group = group;
+ m_groupSet = true;
}
//------------------------------------------------------------------------------
-// getGid
+// getGroup
//------------------------------------------------------------------------------
-uint64_t cta::common::dataStructures::UserIdentity::getGid() const {
+std::string cta::common::dataStructures::UserIdentity::getGroup() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserIdentity have been set!");
}
- return m_gid;
+ return m_group;
}
//------------------------------------------------------------------------------
-// setUid
+// setName
//------------------------------------------------------------------------------
-void cta::common::dataStructures::UserIdentity::setUid(const uint64_t uid) {
- m_uid = uid;
- m_uidSet = true;
+void cta::common::dataStructures::UserIdentity::setName(const std::string &name) {
+ m_name = name;
+ m_nameSet = true;
}
//------------------------------------------------------------------------------
-// getUid
+// getName
//------------------------------------------------------------------------------
-uint64_t cta::common::dataStructures::UserIdentity::getUid() const {
+std::string cta::common::dataStructures::UserIdentity::getName() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the UserIdentity have been set!");
}
- return m_uid;
-}
-
-//------------------------------------------------------------------------------
-// operator<<
-//------------------------------------------------------------------------------
-std::ostream &cta::common::dataStructures::operator<<(std::ostream &os,
- const UserIdentity &userIdentity) {
- if(!userIdentity.allFieldsSet()) {
- throw exception::Exception(
- "operator<< for UserIdentity failed: Not all fields are set");
- }
- os << "{gid=" << userIdentity.m_gid << " uid=" << userIdentity.m_uid << "}";
- return os;
+ return m_name;
}
diff --git a/common/dataStructures/UserIdentity.hpp b/common/dataStructures/UserIdentity.hpp
index 6305a1e1c8..6fcdc5d4aa 100644
--- a/common/dataStructures/UserIdentity.hpp
+++ b/common/dataStructures/UserIdentity.hpp
@@ -42,18 +42,11 @@ public:
*/
~UserIdentity() throw();
- /**
- * Equality operator.
- *
- * @param rhs The right hand side of the operator.
- */
- bool operator==(const UserIdentity &rhs) const;
+ void setGroup(const std::string &group);
+ std::string getGroup() const;
- void setGid(const uint64_t gid);
- uint64_t getGid() const;
-
- void setUid(const uint64_t uid);
- uint64_t getUid() const;
+ void setName(const std::string &name);
+ std::string getName() const;
private:
@@ -63,25 +56,14 @@ private:
*/
bool allFieldsSet() const;
- uint64_t m_gid;
- bool m_gidSet;
-
- uint64_t m_uid;
- bool m_uidSet;
+ std::string m_group;
+ bool m_groupSet;
- friend std::ostream &operator<<(std::ostream &, const UserIdentity &);
+ std::string m_name;
+ bool m_nameSet;
}; // class UserIdentity
-/**
- * Output stream operator for UserIdentity.
- *
- * @param os The output stream.
- * @param entryLog The entry log.
- * @return The output stream.
- */
-std::ostream &operator<<(std::ostream &os, const UserIdentity &userIdentity);
-
} // namespace dataStructures
} // namespace common
} // namespace cta
diff --git a/common/dataStructures/VerifyInfo.cpp b/common/dataStructures/VerifyInfo.cpp
index 248d71f816..bdb3d35761 100644
--- a/common/dataStructures/VerifyInfo.cpp
+++ b/common/dataStructures/VerifyInfo.cpp
@@ -88,7 +88,7 @@ void cta::common::dataStructures::VerifyInfo::setErrors(const std::map<uint64_t,
//------------------------------------------------------------------------------
std::map<uint64_t,std::string> cta::common::dataStructures::VerifyInfo::getErrors() const {
if(!allFieldsSet()) {
- throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the RepackInfo have been set!");
+ throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the VerifyInfo have been set!");
}
return m_errors;
}
diff --git a/common/dataStructures/WriteTestResult.cpp b/common/dataStructures/WriteTestResult.cpp
index c698279de8..5f135b718b 100644
--- a/common/dataStructures/WriteTestResult.cpp
+++ b/common/dataStructures/WriteTestResult.cpp
@@ -26,6 +26,7 @@ cta::common::dataStructures::WriteTestResult::WriteTestResult() {
m_checksumsSet = false;
m_driveNameSet = false;
m_errorsSet = false;
+ m_noOfFilesWrittenSet = false;
m_totalBytesWrittenSet = false;
m_totalFilesWrittenSet = false;
m_totalTimeInSecondsSet = false;
@@ -45,6 +46,7 @@ bool cta::common::dataStructures::WriteTestResult::allFieldsSet() const {
return m_checksumsSet
&& m_driveNameSet
&& m_errorsSet
+ && m_noOfFilesWrittenSet
&& m_totalBytesWrittenSet
&& m_totalFilesWrittenSet
&& m_totalTimeInSecondsSet
@@ -54,7 +56,7 @@ bool cta::common::dataStructures::WriteTestResult::allFieldsSet() const {
//------------------------------------------------------------------------------
// setChecksums
//------------------------------------------------------------------------------
-void cta::common::dataStructures::WriteTestResult::setChecksums(const std::map<int,std::pair<std::string,std::string>> &checksums) {
+void cta::common::dataStructures::WriteTestResult::setChecksums(const std::map<uint64_t,std::pair<std::string,std::string>> &checksums) {
m_checksums = checksums;
m_checksumsSet = true;
}
@@ -62,7 +64,7 @@ void cta::common::dataStructures::WriteTestResult::setChecksums(const std::map<i
//------------------------------------------------------------------------------
// getChecksums
//------------------------------------------------------------------------------
-std::map<int,std::pair<std::string,std::string>> cta::common::dataStructures::WriteTestResult::getChecksums() const {
+std::map<uint64_t,std::pair<std::string,std::string>> cta::common::dataStructures::WriteTestResult::getChecksums() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the WriteTestResult have been set!");
}
@@ -90,7 +92,7 @@ std::string cta::common::dataStructures::WriteTestResult::getDriveName() const {
//------------------------------------------------------------------------------
// setErrors
//------------------------------------------------------------------------------
-void cta::common::dataStructures::WriteTestResult::setErrors(const std::map<int,std::string> &errors) {
+void cta::common::dataStructures::WriteTestResult::setErrors(const std::map<uint64_t,std::string> &errors) {
m_errors = errors;
m_errorsSet = true;
}
@@ -98,13 +100,31 @@ void cta::common::dataStructures::WriteTestResult::setErrors(const std::map<int,
//------------------------------------------------------------------------------
// getErrors
//------------------------------------------------------------------------------
-std::map<int,std::string> cta::common::dataStructures::WriteTestResult::getErrors() const {
+std::map<uint64_t,std::string> cta::common::dataStructures::WriteTestResult::getErrors() const {
if(!allFieldsSet()) {
throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the WriteTestResult have been set!");
}
return m_errors;
}
+//------------------------------------------------------------------------------
+// setNoOfFilesWritten
+//------------------------------------------------------------------------------
+void cta::common::dataStructures::WriteTestResult::setNoOfFilesWritten(const uint64_t noOfFilesWritten) {
+ m_noOfFilesWritten = noOfFilesWritten;
+ m_noOfFilesWrittenSet = true;
+}
+
+//------------------------------------------------------------------------------
+// getNoOfFilesWritten
+//------------------------------------------------------------------------------
+uint64_t cta::common::dataStructures::WriteTestResult::getNoOfFilesWritten() const {
+ if(!allFieldsSet()) {
+ throw cta::exception::Exception(std::string(__FUNCTION__)+" Error: not all fields of the WriteTestResult have been set!");
+ }
+ return m_noOfFilesWritten;
+}
+
//------------------------------------------------------------------------------
// setTotalBytesWritten
//------------------------------------------------------------------------------
diff --git a/common/dataStructures/WriteTestResult.hpp b/common/dataStructures/WriteTestResult.hpp
index 178b767073..7bfc6d2a9e 100644
--- a/common/dataStructures/WriteTestResult.hpp
+++ b/common/dataStructures/WriteTestResult.hpp
@@ -42,14 +42,17 @@ public:
*/
~WriteTestResult() throw();
- void setChecksums(const std::map<int,std::pair<std::string,std::string>> &checksums);
- std::map<int,std::pair<std::string,std::string>> getChecksums() const;
+ void setChecksums(const std::map<uint64_t,std::pair<std::string,std::string>> &checksums);
+ std::map<uint64_t,std::pair<std::string,std::string>> getChecksums() const;
void setDriveName(const std::string &driveName);
std::string getDriveName() const;
- void setErrors(const std::map<int,std::string> &errors);
- std::map<int,std::string> getErrors() const;
+ void setErrors(const std::map<uint64_t,std::string> &errors);
+ std::map<uint64_t,std::string> getErrors() const;
+
+ void setNoOfFilesWritten(const uint64_t noOfFilesWritten);
+ uint64_t getNoOfFilesWritten() const;
void setTotalBytesWritten(const uint64_t totalBytesWritten);
uint64_t getTotalBytesWritten() const;
@@ -71,15 +74,18 @@ private:
*/
bool allFieldsSet() const;
- std::map<int,std::pair<std::string,std::string>> m_checksums;
+ std::map<uint64_t,std::pair<std::string,std::string>> m_checksums;
bool m_checksumsSet;
std::string m_driveName;
bool m_driveNameSet;
- std::map<int,std::string> m_errors;
+ std::map<uint64_t,std::string> m_errors;
bool m_errorsSet;
+ uint64_t m_noOfFilesWritten;
+ bool m_noOfFilesWrittenSet;
+
uint64_t m_totalBytesWritten;
bool m_totalBytesWrittenSet;
diff --git a/objectstore/ArchiveRequest.cpp b/objectstore/ArchiveRequest.cpp
index 58d25ecff1..3ba3dd68d8 100644
--- a/objectstore/ArchiveRequest.cpp
+++ b/objectstore/ArchiveRequest.cpp
@@ -375,8 +375,8 @@ void cta::objectstore::ArchiveRequest::setCreationLog(const cta::common::dataStr
auto payloadCreationLog = m_payload.mutable_creationlog();
payloadCreationLog->set_time(creationLog.getTime());
payloadCreationLog->set_host(creationLog.getHost());
- payloadCreationLog->set_uid(creationLog.getUser().getUid());
- payloadCreationLog->set_gid(creationLog.getUser().getGid());
+ payloadCreationLog->set_name(creationLog.getUser().getName());
+ payloadCreationLog->set_group(creationLog.getUser().getGroup());
}
//------------------------------------------------------------------------------
@@ -387,8 +387,8 @@ cta::common::dataStructures::EntryLog cta::objectstore::ArchiveRequest::getCreat
cta::common::dataStructures::EntryLog creationLog;
cta::common::dataStructures::UserIdentity user;
auto payloadCreationLog = m_payload.creationlog();
- user.setUid(payloadCreationLog.uid());
- user.setGid(payloadCreationLog.gid());
+ user.setName(payloadCreationLog.name());
+ user.setGroup(payloadCreationLog.group());
creationLog.setUser(user);
creationLog.setHost(payloadCreationLog.host());
creationLog.setTime(payloadCreationLog.time());
@@ -547,8 +547,8 @@ std::string cta::objectstore::ArchiveRequest::dump() {
json_object * jaf = json_object_new_object();
json_object_object_add(jaf, "host", json_object_new_string(m_payload.creationlog().host().c_str()));
json_object_object_add(jaf, "time", json_object_new_int64(m_payload.creationlog().time()));
- json_object_object_add(jaf, "uid", json_object_new_int64(m_payload.creationlog().uid()));
- json_object_object_add(jaf, "gid", json_object_new_int64(m_payload.creationlog().gid()));
+ json_object_object_add(jaf, "name", json_object_new_string(m_payload.creationlog().name().c_str()));
+ json_object_object_add(jaf, "group", json_object_new_string(m_payload.creationlog().group().c_str()));
json_object_object_add(jo, "creationlog", jaf);
// Array for jobs
json_object * jja = json_object_new_array();
diff --git a/objectstore/RetrieveRequest.cpp b/objectstore/RetrieveRequest.cpp
index 1ab99f26ce..8c63348eff 100644
--- a/objectstore/RetrieveRequest.cpp
+++ b/objectstore/RetrieveRequest.cpp
@@ -195,8 +195,8 @@ void cta::objectstore::RetrieveRequest::setCreationLog(const cta::common::dataSt
auto payloadCreationLog = m_payload.mutable_creationlog();
payloadCreationLog->set_time(creationLog.getTime());
payloadCreationLog->set_host(creationLog.getHost());
- payloadCreationLog->set_uid(creationLog.getUser().getUid());
- payloadCreationLog->set_gid(creationLog.getUser().getGid());
+ payloadCreationLog->set_name(creationLog.getUser().getName());
+ payloadCreationLog->set_group(creationLog.getUser().getGroup());
}
//------------------------------------------------------------------------------
@@ -207,8 +207,8 @@ cta::common::dataStructures::EntryLog cta::objectstore::RetrieveRequest::getCrea
cta::common::dataStructures::EntryLog creationLog;
cta::common::dataStructures::UserIdentity user;
auto payloadCreationLog = m_payload.creationlog();
- user.setUid(payloadCreationLog.uid());
- user.setGid(payloadCreationLog.gid());
+ user.setName(payloadCreationLog.name());
+ user.setGroup(payloadCreationLog.group());
creationLog.setUser(user);
creationLog.setHost(payloadCreationLog.host());
creationLog.setTime(payloadCreationLog.time());
@@ -259,8 +259,8 @@ std::string cta::objectstore::RetrieveRequest::dump() {
json_object * jaf = json_object_new_object();
json_object_object_add(jaf, "host", json_object_new_string(m_payload.creationlog().host().c_str()));
json_object_object_add(jaf, "time", json_object_new_int64(m_payload.creationlog().time()));
- json_object_object_add(jaf, "uid", json_object_new_int64(m_payload.creationlog().uid()));
- json_object_object_add(jaf, "gid", json_object_new_int64(m_payload.creationlog().gid()));
+ json_object_object_add(jaf, "name", json_object_new_string(m_payload.creationlog().name().c_str()));
+ json_object_object_add(jaf, "group", json_object_new_string(m_payload.creationlog().group().c_str()));
json_object_object_add(jo, "creationlog", jaf);
// Array for jobs
json_object * jja = json_object_new_array();
diff --git a/objectstore/cta.proto b/objectstore/cta.proto
index 18c9324ec2..287dd242be 100644
--- a/objectstore/cta.proto
+++ b/objectstore/cta.proto
@@ -422,8 +422,8 @@ message DRData {
}
message EntryLog {
- required uint64 uid = 8950;
- required uint64 gid = 8955;
+ required string name = 8950;
+ required string group = 8955;
required string host = 8960;
required uint64 time = 8970;
}
diff --git a/xroot_plugins/XrdCtaFile.cpp b/xroot_plugins/XrdCtaFile.cpp
index deb61df4f7..bdee0beacb 100644
--- a/xroot_plugins/XrdCtaFile.cpp
+++ b/xroot_plugins/XrdCtaFile.cpp
@@ -391,12 +391,12 @@ std::string XrdProFile::formatResponse(const std::vector<std::vector<std::string
// addLogInfoToResponseRow
//------------------------------------------------------------------------------
void XrdProFile::addLogInfoToResponseRow(std::vector<std::string> &responseRow, const cta::common::dataStructures::EntryLog &creationLog, const cta::common::dataStructures::EntryLog &lastModificationLog) {
- responseRow.push_back(std::to_string((unsigned long long)creationLog.getUser().getUid()));
- responseRow.push_back(std::to_string((unsigned long long)creationLog.getUser().getGid()));
+ responseRow.push_back(creationLog.getUser().getName());
+ responseRow.push_back(creationLog.getUser().getGroup());
responseRow.push_back(creationLog.getHost());
responseRow.push_back(timeToString(creationLog.getTime()));
- responseRow.push_back(std::to_string((unsigned long long)lastModificationLog.getUser().getUid()));
- responseRow.push_back(std::to_string((unsigned long long)lastModificationLog.getUser().getGid()));
+ responseRow.push_back(lastModificationLog.getUser().getName());
+ responseRow.push_back(lastModificationLog.getUser().getGroup());
responseRow.push_back(lastModificationLog.getHost());
responseRow.push_back(timeToString(lastModificationLog.getTime()));
}
@@ -406,24 +406,18 @@ void XrdProFile::addLogInfoToResponseRow(std::vector<std::string> &responseRow,
//------------------------------------------------------------------------------
void XrdProFile::xCom_bootstrap(const std::vector<std::string> &tokens, const cta::common::dataStructures::SecurityIdentity &cliIdentity) {
std::stringstream help;
- help << tokens[0] << " bs/bootstrap --uid/-u <uid> --gid/-g <gid> --hostname/-h <host_name> --comment/-m <\"comment\">" << std::endl;
- std::string uid_s = getOptionValue(tokens, "-u", "--uid", false);
- std::string gid_s = getOptionValue(tokens, "-g", "--gid", false);
+ help << tokens[0] << " bs/bootstrap --user/-u <user> --group/-g <group> --hostname/-h <host_name> --comment/-m <\"comment\">" << std::endl;
+ std::string user = getOptionValue(tokens, "-u", "--user", false);
+ std::string group = getOptionValue(tokens, "-g", "--group", false);
std::string hostname = getOptionValue(tokens, "-h", "--hostname", false);
std::string comment = getOptionValue(tokens, "-m", "--comment", false);
- if(uid_s.empty()||gid_s.empty()||hostname.empty()||comment.empty()) {
+ if(user.empty()||group.empty()||hostname.empty()||comment.empty()) {
m_data = help.str();
return;
}
cta::common::dataStructures::UserIdentity adminUser;
- std::stringstream uid_ss(uid_s);
- int uid = 0;
- uid_ss >> uid;
- adminUser.setUid(uid);
- std::stringstream gid_ss(gid_s);
- int gid = 0;
- gid_ss >> gid;
- adminUser.setGid(gid);
+ adminUser.setName(user);
+ adminUser.setGroup(group);
m_scheduler->createBootstrapAdminAndHostNoAuth(cliIdentity, adminUser, hostname, comment);
}
@@ -433,26 +427,20 @@ void XrdProFile::xCom_bootstrap(const std::vector<std::string> &tokens, const ct
void XrdProFile::xCom_admin(const std::vector<std::string> &tokens, const cta::common::dataStructures::SecurityIdentity &cliIdentity) {
std::stringstream help;
help << tokens[0] << " ad/admin add/ch/rm/ls:" << std::endl
- << "\tadd --uid/-u <uid> --gid/-g <gid> --comment/-m <\"comment\">" << std::endl
- << "\tch --uid/-u <uid> --gid/-g <gid> --comment/-m <\"comment\">" << std::endl
- << "\trm --uid/-u <uid> --gid/-g <gid>" << std::endl
+ << "\tadd --user/-u <user> --group/-g <group> --comment/-m <\"comment\">" << std::endl
+ << "\tch --user/-u <user> --group/-g <group> --comment/-m <\"comment\">" << std::endl
+ << "\trm --user/-u <user> --group/-g <group>" << std::endl
<< "\tls [--header/-h]" << std::endl;
if("add" == tokens[2] || "ch" == tokens[2] || "rm" == tokens[2]) {
- std::string uid_s = getOptionValue(tokens, "-u", "--uid", false);
- std::string gid_s = getOptionValue(tokens, "-g", "--gid", false);
- if(uid_s.empty()||gid_s.empty()) {
+ std::string user = getOptionValue(tokens, "-u", "--user", false);
+ std::string group = getOptionValue(tokens, "-g", "--group", false);
+ if(user.empty()||group.empty()) {
m_data = help.str();
return;
}
cta::common::dataStructures::UserIdentity adminUser;
- std::stringstream uid_ss(uid_s);
- int uid = 0;
- uid_ss >> uid;
- adminUser.setUid(uid);
- std::stringstream gid_ss(gid_s);
- int gid = 0;
- gid_ss >> gid;
- adminUser.setGid(gid);
+ adminUser.setName(user);
+ adminUser.setGroup(group);
if("add" == tokens[2] || "ch" == tokens[2]) {
std::string comment = getOptionValue(tokens, "-m", "--comment", false);
if(comment.empty()) {
@@ -474,12 +462,12 @@ void XrdProFile::xCom_admin(const std::vector<std::string> &tokens, const cta::c
std::list<cta::common::dataStructures::AdminUser> list= m_scheduler->getAdminUsers(cliIdentity);
if(list.size()>0) {
std::vector<std::vector<std::string>> responseTable;
- std::vector<std::string> header = {"uid","gid","c.uid","c.gid","c.host","c.time","m.uid","m.gid","m.host","m.time","comment"};
+ std::vector<std::string> header = {"user","group","c.user","c.group","c.host","c.time","m.user","m.group","m.host","m.time","comment"};
if(hasOption(tokens, "-h", "--header")) responseTable.push_back(header);
for(auto it = list.cbegin(); it != list.cend(); it++) {
std::vector<std::string> currentRow;
- currentRow.push_back(std::to_string((unsigned long long)it->getUser().getUid()));
- currentRow.push_back(std::to_string((unsigned long long)it->getUser().getGid()));
+ currentRow.push_back(it->getUser().getName());
+ currentRow.push_back(it->getUser().getGroup());
addLogInfoToResponseRow(currentRow, it->getCreationLog(), it->getLastModificationLog());
currentRow.push_back(it->getComment());
responseTable.push_back(currentRow);
@@ -1385,8 +1373,8 @@ void XrdProFile::xCom_repack(const std::vector<std::string> &tokens, const cta::
currentRow.push_back(std::to_string((unsigned long long)it->getFilesFailed()));
currentRow.push_back(std::to_string((unsigned long long)it->getFilesArchived()));
currentRow.push_back(it->getRepackStatus());
- currentRow.push_back(std::to_string((unsigned long long)it->getCreationLog().getUser().getUid()));
- currentRow.push_back(std::to_string((unsigned long long)it->getCreationLog().getUser().getGid()));
+ currentRow.push_back(it->getCreationLog().getUser().getName());
+ currentRow.push_back(it->getCreationLog().getUser().getGroup());
currentRow.push_back(it->getCreationLog().getHost());
currentRow.push_back(timeToString(it->getCreationLog().getTime()));
responseTable.push_back(currentRow);
@@ -1487,8 +1475,8 @@ void XrdProFile::xCom_verify(const std::vector<std::string> &tokens, const cta::
currentRow.push_back(std::to_string((unsigned long long)it->getFilesFailed()));
currentRow.push_back(std::to_string((unsigned long long)it->getFilesVerified()));
currentRow.push_back(it->getVerifyStatus());
- currentRow.push_back(std::to_string((unsigned long long)it->getCreationLog().getUser().getUid()));
- currentRow.push_back(std::to_string((unsigned long long)it->getCreationLog().getUser().getGid()));
+ currentRow.push_back(it->getCreationLog().getUser().getName());
+ currentRow.push_back(it->getCreationLog().getUser().getGroup());
currentRow.push_back(it->getCreationLog().getHost());
currentRow.push_back(timeToString(it->getCreationLog().getTime()));
responseTable.push_back(currentRow);
@@ -1534,7 +1522,7 @@ void XrdProFile::xCom_archivefile(const std::vector<std::string> &tokens, const
for(auto it = list.cbegin(); it != list.cend(); it++) {
for(auto jt = it->getTapeCopies().cbegin(); jt != it->getTapeCopies().cend(); jt++) {
std::vector<std::string> currentRow;
- currentRow.push_back(it->getArchiveFileID());
+ currentRow.push_back(std::to_string((unsigned long long)it->getArchiveFileID()));
currentRow.push_back(std::to_string((unsigned long long)jt->first));
currentRow.push_back(jt->second.getVid());
currentRow.push_back(std::to_string((unsigned long long)jt->second.getFSeq()));
@@ -1712,7 +1700,7 @@ void XrdProFile::xCom_reconcile(const std::vector<std::string> &tokens, const ct
for(auto it = list.cbegin(); it != list.cend(); it++) {
for(auto jt = it->getTapeCopies().cbegin(); jt != it->getTapeCopies().cend(); jt++) {
std::vector<std::string> currentRow;
- currentRow.push_back(it->getArchiveFileID());
+ currentRow.push_back(std::to_string((unsigned long long)it->getArchiveFileID()));
currentRow.push_back(std::to_string((unsigned long long)jt->first));
currentRow.push_back(jt->second.getVid());
currentRow.push_back(std::to_string((unsigned long long)jt->second.getFSeq()));
--
GitLab