Commit f11575de authored by Michael Davis's avatar Michael Davis
Browse files

[schema] Updates to track code changes in master

parent eb6afcc9
......@@ -480,7 +480,7 @@ void MysqlCatalogue::deleteArchiveFile(const std::string &diskInstanceName, cons
<< " blockId: " << it->blockId
<< " creationTime: " << it->creationTime
<< " fileSize: " << it->fileSize
<< " checksumBlob: " << it->second.checksumBlob //this shouldn't be here: repeated field
<< " checksumBlob: " << it->checksumBlob //this shouldn't be here: repeated field
<< " copyNb: " << it->copyNb //this shouldn't be here: repeated field
<< " supersededByVid: " << it->supersededByVid
<< " supersededByFSeq: " << it->supersededByFSeq;
......@@ -546,7 +546,7 @@ void MysqlCatalogue::deleteArchiveFile(const std::string &diskInstanceName, cons
<< " blockId: " << it->blockId
<< " creationTime: " << it->creationTime
<< " fileSize: " << it->fileSize
<< " checksumBlob: " << it->second.checksumBlob //this shouldn't be here: repeated field
<< " checksumBlob: " << it->checksumBlob //this shouldn't be here: repeated field
<< " copyNb: " << it->copyNb //this shouldn't be here: repeated field
<< " supersededByVid: " << it->supersededByVid
<< " supersededByFSeq: " << it->supersededByFSeq;
......
......@@ -922,7 +922,7 @@ void OracleCatalogue::deleteArchiveFile(const std::string &diskInstanceName, con
<< " fSeq: " << it->fSeq
<< " blockId: " << it->blockId
<< " creationTime: " << it->creationTime
<< " fileSize: " << it->compressedSize
<< " fileSize: " << it->fileSize
<< " checksumBlob: " << it->checksumBlob //this shouldn't be here: repeated field
<< " copyNb: " << it->copyNb //this shouldn't be here: repeated field
<< " supersededByVid: " << it->supersededByVid
......
......@@ -412,7 +412,6 @@ void PostgresCatalogue::filesWrittenToTape(const std::set<TapeItemWrittenPointer
}
const char *const sql =
<<<<<<< HEAD
"CREATE TEMPORARY TABLE TEMP_TAPE_FILE_INSERTION_BATCH (" "\n"
"LIKE TAPE_FILE) " "\n"
"ON COMMIT DROP;" "\n"
......
......@@ -5221,7 +5221,7 @@ void RdbmsCatalogue::insertTapeFile(
stmt.bindString(":VID", tapeFile.vid);
stmt.bindUint64(":FSEQ", tapeFile.fSeq);
stmt.bindUint64(":BLOCK_ID", tapeFile.blockId);
stmt.bindUint64(":LOGICAL_SIZE_IN_BYTES", tapeFile.compressedSize);
stmt.bindUint64(":LOGICAL_SIZE_IN_BYTES", tapeFile.fileSize);
stmt.bindUint64(":COPY_NB", tapeFile.copyNb);
stmt.bindUint64(":CREATION_TIME", now);
stmt.bindUint64(":ARCHIVE_FILE_ID", archiveFileId);
......
......@@ -73,7 +73,6 @@ set (COMMON_LIB_SRC_FILES
dataStructures/TestSourceType.cpp
dataStructures/UpdateFileInfoRequest.cpp
dataStructures/UpdateFileStorageClassRequest.cpp
dataStructures/VerifyInfo.cpp
dataStructures/WriteTestResult.cpp
dataStructures/utils.cpp
checksum/ChecksumBlob.cpp
......
......@@ -2608,19 +2608,18 @@ TEST_P(SchedulerTest, archiveReportMultipleAndQueueRetrievesWithActivities) {
creationLog.time=0;
creationLog.username="admin1";
cta::common::dataStructures::DiskFileInfo diskFileInfo;
diskFileInfo.group="group2";
diskFileInfo.owner="cms_user";
diskFileInfo.gid=GROUP_2;
diskFileInfo.owner_uid=CMS_USER;
diskFileInfo.path="path/to/file";
diskFileInfo.path += std::to_string(i);
cta::common::dataStructures::ArchiveRequest request;
request.checksumType="ADLER32";
request.checksumValue="1234abcd";
request.checksumBlob.insert(cta::checksum::ADLER32, 0x1234abcd);
request.creationLog=creationLog;
request.diskFileInfo=diskFileInfo;
request.diskFileID="diskFileID";
request.diskFileID += std::to_string(i);
request.fileSize=100*1000*1000;
cta::common::dataStructures::UserIdentity requester;
cta::common::dataStructures::RequesterIdentity requester;
requester.name = s_userName;
requester.group = "userGroup";
request.requester = requester;
......@@ -2696,9 +2695,8 @@ TEST_P(SchedulerTest, archiveReportMultipleAndQueueRetrievesWithActivities) {
std::unique_ptr<ArchiveJob> archiveJob = std::move(archiveJobBatch.front());
archiveJob->tapeFile.blockId = 1;
archiveJob->tapeFile.fSeq = 1;
archiveJob->tapeFile.checksumType = "ADLER32";
archiveJob->tapeFile.checksumValue = "1234abcd";
archiveJob->tapeFile.compressedSize = archiveJob->archiveFile.fileSize;
archiveJob->tapeFile.checksumBlob.insert(cta::checksum::ADLER32, 0x1234abcd);
archiveJob->tapeFile.fileSize = archiveJob->archiveFile.fileSize;
archiveJob->tapeFile.copyNb = 1;
archiveJob->validate();
std::queue<std::unique_ptr <cta::ArchiveJob >> sDBarchiveJobBatch;
......@@ -2747,8 +2745,8 @@ TEST_P(SchedulerTest, archiveReportMultipleAndQueueRetrievesWithActivities) {
creationLog.time=0;
creationLog.username="admin1";
cta::common::dataStructures::DiskFileInfo diskFileInfo;
diskFileInfo.group="group2";
diskFileInfo.owner="cms_user";
diskFileInfo.gid=GROUP_2;
diskFileInfo.owner_uid=CMS_USER;
diskFileInfo.path="path/to/file";
for (auto i:fileRange) {
cta::common::dataStructures::RetrieveRequest request;
......
......@@ -20,6 +20,7 @@
#include <xroot_plugins/XrdCtaStream.hpp>
#include <xroot_plugins/XrdSsiCtaRequestMessage.hpp>
#include <common/checksum/ChecksumBlobSerDeser.hpp>
namespace cta { namespace xrd {
......@@ -119,11 +120,10 @@ int ArchiveFileLsStream::fillBuffer(XrdSsiPb::OStreamBuffer<Data> *streambuf) {
af->set_disk_instance(archiveFile.diskInstance);
af->set_disk_id(archiveFile.diskFileId);
af->set_size(archiveFile.fileSize);
af->mutable_cs()->set_type(archiveFile.checksumType);
af->mutable_cs()->set_value(archiveFile.checksumValue);
checksum::ChecksumBlobToProtobuf(archiveFile.checksumBlob, *(af->mutable_csb()));
af->set_storage_class(archiveFile.storageClass);
af->mutable_df()->set_owner(archiveFile.diskFileInfo.owner);
af->mutable_df()->set_group(archiveFile.diskFileInfo.group);
af->mutable_df()->mutable_owner_id()->set_uid(archiveFile.diskFileInfo.owner_uid);
af->mutable_df()->mutable_owner_id()->set_gid(archiveFile.diskFileInfo.gid);
af->mutable_df()->set_path(archiveFile.diskFileInfo.path);
af->set_creation_time(archiveFile.creationTime);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment