Changed C++ data type of copy_nb from uint32_t to uint8_t

catalogue/OracleCatalogue.cpp

@@ -801,7 +801,7 @@ void OracleCatalogue::deleteArchiveFile(const std::string &diskInstanceName, con
         tapeFile.fSeq = selectRset.columnUint64("FSEQ");
         tapeFile.blockId = selectRset.columnUint64("BLOCK_ID");
         tapeFile.fileSize = selectRset.columnUint64("LOGICAL_SIZE_IN_BYTES");
-        tapeFile.copyNb = selectRset.columnUint64("COPY_NB");
+        tapeFile.copyNb = selectRset.columnUint8("COPY_NB");
         tapeFile.creationTime = selectRset.columnUint64("TAPE_FILE_CREATION_TIME");
         tapeFile.checksumBlob = archiveFile->checksumBlob; // Duplicated for convenience
         if (!selectRset.columnIsNull("SSBY_VID")) {

catalogue/TapeFileWritten.hpp

@@ -102,7 +102,7 @@ struct TapeFileWritten: public TapeItemWritten {
   /**
    * The copy number of the tape file.
    */
-  uint32_t copyNb;
+  uint8_t copyNb;
 
 }; // struct TapeFileWritten
 

common/dataStructures/ArchiveFile.cpp

@@ -60,7 +60,7 @@ bool ArchiveFile::operator!=(const ArchiveFile &rhs) const {
 //------------------------------------------------------------------------------
 // ArchiveFile::TapeFilesList::at()
 //------------------------------------------------------------------------------
-TapeFile& ArchiveFile::TapeFilesList::at(uint32_t copyNb) {
+TapeFile& ArchiveFile::TapeFilesList::at(uint8_t copyNb) {
   auto ret = std::find_if(begin(), end(), [=](TapeFile& tf){ return tf.isActiveCopyNb(copyNb);});
   if (ret == end()) throw cta::exception::Exception("In ArchiveFile::TapeFilesList::at(): not found.");
   return *ret;
@@ -69,7 +69,7 @@ TapeFile& ArchiveFile::TapeFilesList::at(uint32_t copyNb) {
 //------------------------------------------------------------------------------
 // ArchiveFile::TapeFilesList::at() const
 //------------------------------------------------------------------------------
-const TapeFile& ArchiveFile::TapeFilesList::at(uint32_t copyNb) const {
+const TapeFile& ArchiveFile::TapeFilesList::at(uint8_t copyNb) const {
   auto ret = std::find_if(cbegin(), cend(), [=](const TapeFile& tf){ return tf.isActiveCopyNb(copyNb);});
   if (ret == end()) throw cta::exception::Exception("In ArchiveFile::TapeFilesList::at(): not found.");
   return *ret;
@@ -78,14 +78,14 @@ const TapeFile& ArchiveFile::TapeFilesList::at(uint32_t copyNb) const {
 //------------------------------------------------------------------------------
 // ArchiveFile::TapeFilesList::find() 
 //------------------------------------------------------------------------------
-ArchiveFile::TapeFilesList::iterator ArchiveFile::TapeFilesList::find(uint32_t copyNb) {
+ArchiveFile::TapeFilesList::iterator ArchiveFile::TapeFilesList::find(uint8_t copyNb) {
   return std::find_if(begin(), end(), [=](TapeFile& tf){ return tf.isActiveCopyNb(copyNb);});
 }
 
 //------------------------------------------------------------------------------
 // ArchiveFile::TapeFilesList::find() const
 //------------------------------------------------------------------------------
-ArchiveFile::TapeFilesList::const_iterator ArchiveFile::TapeFilesList::find(uint32_t copyNb) const {
+ArchiveFile::TapeFilesList::const_iterator ArchiveFile::TapeFilesList::find(uint8_t copyNb) const {
   return std::find_if(cbegin(), cend(), [=](const TapeFile& tf){ return tf.isActiveCopyNb(copyNb);});
 }
 

common/dataStructures/ArchiveFile.hpp

@@ -64,10 +64,10 @@ struct ArchiveFile {
   class TapeFilesList: public std::list<TapeFile> {
   public:
     using std::list<TapeFile>::list;
-    TapeFile & at(uint32_t copyNb);
-    const TapeFile & at(uint32_t copyNb) const;
-    TapeFilesList::iterator find(uint32_t copyNb);
-    TapeFilesList::const_iterator find(uint32_t copyNb) const;
+    TapeFile & at(uint8_t copyNb);
+    const TapeFile & at(uint8_t copyNb) const;
+    TapeFilesList::iterator find(uint8_t copyNb);
+    TapeFilesList::const_iterator find(uint8_t copyNb) const;
   };
   TapeFilesList tapeFiles;
   time_t creationTime;

common/dataStructures/ArchiveRoute.hpp

@@ -55,7 +55,7 @@ struct ArchiveRoute {
   /**
    * The cipy number of the tape file.
    */
-  uint32_t copyNb;
+  uint8_t copyNb;
 
   std::string tapePoolName;
   EntryLog creationLog;

common/dataStructures/TapeFile.cpp

@@ -56,7 +56,7 @@ bool TapeFile::operator!=(const TapeFile &rhs) const {
 //------------------------------------------------------------------------------
 // TapeFile::isActiveCopyNb
 //------------------------------------------------------------------------------
-bool TapeFile::isActiveCopyNb(uint32_t cnb) const {
+bool TapeFile::isActiveCopyNb(uint8_t cnb) const {
   return (cnb == copyNb) && supersededByVid.empty();
 }
 

common/dataStructures/TapeFile.hpp

@@ -64,7 +64,7 @@ struct TapeFile {
    * The copy number of the file. Copy numbers start from 1. Copy number 0 
    * is an invalid copy number. 
    */
-  uint32_t copyNb;
+  uint8_t copyNb;
   /**
    * The time the file recorded in the catalogue. 
    */
@@ -88,7 +88,7 @@ struct TapeFile {
   /**
    * Returns true if this tape file is both an active (not superseded) tape file and matches the copy number.
    */
-  bool isActiveCopyNb(uint32_t copyNb) const;
+  bool isActiveCopyNb(uint8_t copyNb) const;
 
 }; // struct TapeFile