Page MenuHomePhabricator
Differential D9019

[backup] Update db constants
ClosedPublic
Actions

Authored by michal on Aug 30 2023, 2:46 AM.
Tags
None
Referenced Files
F5891942: D9019.id.diff
Thu, Apr 17, 7:52 AM
F5875676: D9019.id30539.diff
Thu, Apr 17, 12:39 AM
Unknown Object (File)
Wed, Apr 16, 6:59 PM
Unknown Object (File)
Wed, Apr 16, 10:01 AM
Unknown Object (File)
Mon, Apr 14, 7:05 PM
Unknown Object (File)
Sun, Apr 6, 5:44 PM
Unknown Object (File)
Fri, Apr 4, 6:23 PM
Unknown Object (File)
Fri, Apr 4, 6:23 PM
View All 93 Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
• patryk
kamil
• jon
Commits
rCOMMa3361bf3c0d7: [backup] Update db constants
Summary

Update constants so instead of using prefixes we use nested modules

Depends on D9016

Test Plan

cargo run in backup, run backup tests

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

michal created this revision.Aug 30 2023, 2:46 AM
Herald added a reviewer: • jon. · View Herald TranscriptAug 30 2023, 2:46 AM
Herald added subscribers: tomek, ashoat. · View Herald Transcript
Harbormaster completed remote builds in B22242: Diff 30539.Aug 30 2023, 3:02 AM
michal requested review of this revision.Aug 30 2023, 3:02 AM
• jon accepted this revision.Aug 30 2023, 8:22 AM
• jon added inline comments.
services/backup/src/constants.rs
15–20 ↗(On Diff #30539)

I like having attr under another mod.

This revision is now accepted and ready to land.Aug 30 2023, 8:22 AM
Closed by commit rCOMMa3361bf3c0d7: [backup] Update db constants (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhySep 5 2023, 7:33 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMMa3361bf3c0d7: [backup] Update db constants.

Revision Contents
Changeset List

PathSize
services/
backup/
src/
20 lines
database/
58 lines
26 lines

Diff 30778

View Options

services/backup/src/constants.rs

#include "BlobItem.h" #include "BlobItem.h"
#include "Constants.h" #include "Constants.h"
#include <glog/logging.h>
namespace comm { namespace comm {
namespace network { namespace network {
namespace database { namespace database {
const std::string BlobItem::FIELD_BLOB_HASH = "blobHash"; const std::string BlobItem::FIELD_BLOB_HASH = "blobHash";
const std::string BlobItem::FIELD_S3_PATH = "s3Path"; const std::string BlobItem::FIELD_S3_PATH = "s3Path";
const std::string BlobItem::FIELD_CREATED = "created"; const std::string BlobItem::FIELD_CREATED = "created";
std::string BlobItem::tableName = BLOB_TABLE_NAME; std::string BlobItem::tableName = BLOB_TABLE_NAME;
BlobItem::BlobItem( BlobItem::BlobItem(
const std::string blobHash, const std::string blobHash,
const S3Path s3Path, const S3Path s3Path,
uint64_t created) uint64_t created)
: blobHash(blobHash), s3Path(s3Path), created(created) { : blobHash(blobHash), s3Path(s3Path), created(created) {
this->validate(); this->validate();
} }
BlobItem::BlobItem(const AttributeValues &itemFromDB) { BlobItem::BlobItem(const AttributeValues &itemFromDB) {
this->assignItemFromDatabase(itemFromDB); this->assignItemFromDatabase(itemFromDB);
} }
void BlobItem::validate() const { void BlobItem::validate() const {
LOG(INFO) << "[BlobItem::validate]";
if (!this->blobHash.size()) { if (!this->blobHash.size()) {
throw std::runtime_error("blobHash empty"); throw std::runtime_error("blobHash empty");
} }
this->s3Path.validate(); this->s3Path.validate();
} }
void BlobItem::assignItemFromDatabase(const AttributeValues &itemFromDB) { void BlobItem::assignItemFromDatabase(const AttributeValues &itemFromDB) {
LOG(INFO) << "[BlobItem::assignItemFromDatabase]";
try { try {
this->blobHash = itemFromDB.at(BlobItem::FIELD_BLOB_HASH).GetS(); this->blobHash = itemFromDB.at(BlobItem::FIELD_BLOB_HASH).GetS();
LOG(INFO) << "[BlobItem::assignItemFromDatabase] blob hash "
<< this->blobHash;
this->s3Path = S3Path(itemFromDB.at(BlobItem::FIELD_S3_PATH).GetS()); this->s3Path = S3Path(itemFromDB.at(BlobItem::FIELD_S3_PATH).GetS());
this->created = std::stoll( this->created = std::stoll(
std::string(itemFromDB.at(BlobItem::FIELD_CREATED).GetS()).c_str()); std::string(itemFromDB.at(BlobItem::FIELD_CREATED).GetS()).c_str());
} catch (std::logic_error &e) { } catch (std::logic_error &e) {
throw std::runtime_error( throw std::runtime_error(
"invalid blob item provided, " + std::string(e.what())); "invalid blob item provided, " + std::string(e.what()));
} }
this->validate(); this->validate();
Show All 29 Lines
View Options

services/backup/src/database/backup_item.rs

#include "BlobItem.h" #include "BlobItem.h"
#include "Constants.h" #include "Constants.h"
#include <glog/logging.h>
namespace comm { namespace comm {
namespace network { namespace network {
namespace database { namespace database {
const std::string BlobItem::FIELD_BLOB_HASH = "blobHash"; const std::string BlobItem::FIELD_BLOB_HASH = "blobHash";
const std::string BlobItem::FIELD_S3_PATH = "s3Path"; const std::string BlobItem::FIELD_S3_PATH = "s3Path";
const std::string BlobItem::FIELD_CREATED = "created"; const std::string BlobItem::FIELD_CREATED = "created";
std::string BlobItem::tableName = BLOB_TABLE_NAME; std::string BlobItem::tableName = BLOB_TABLE_NAME;
BlobItem::BlobItem( BlobItem::BlobItem(
const std::string blobHash, const std::string blobHash,
const S3Path s3Path, const S3Path s3Path,
uint64_t created) uint64_t created)
: blobHash(blobHash), s3Path(s3Path), created(created) { : blobHash(blobHash), s3Path(s3Path), created(created) {
this->validate(); this->validate();
} }
BlobItem::BlobItem(const AttributeValues &itemFromDB) { BlobItem::BlobItem(const AttributeValues &itemFromDB) {
this->assignItemFromDatabase(itemFromDB); this->assignItemFromDatabase(itemFromDB);
} }
void BlobItem::validate() const { void BlobItem::validate() const {
LOG(INFO) << "[BlobItem::validate]";
if (!this->blobHash.size()) { if (!this->blobHash.size()) {
throw std::runtime_error("blobHash empty"); throw std::runtime_error("blobHash empty");
} }
this->s3Path.validate(); this->s3Path.validate();
} }
void BlobItem::assignItemFromDatabase(const AttributeValues &itemFromDB) { void BlobItem::assignItemFromDatabase(const AttributeValues &itemFromDB) {
LOG(INFO) << "[BlobItem::assignItemFromDatabase]";
try { try {
this->blobHash = itemFromDB.at(BlobItem::FIELD_BLOB_HASH).GetS(); this->blobHash = itemFromDB.at(BlobItem::FIELD_BLOB_HASH).GetS();
LOG(INFO) << "[BlobItem::assignItemFromDatabase] blob hash "
<< this->blobHash;
this->s3Path = S3Path(itemFromDB.at(BlobItem::FIELD_S3_PATH).GetS()); this->s3Path = S3Path(itemFromDB.at(BlobItem::FIELD_S3_PATH).GetS());
this->created = std::stoll( this->created = std::stoll(
std::string(itemFromDB.at(BlobItem::FIELD_CREATED).GetS()).c_str()); std::string(itemFromDB.at(BlobItem::FIELD_CREATED).GetS()).c_str());
} catch (std::logic_error &e) { } catch (std::logic_error &e) {
throw std::runtime_error( throw std::runtime_error(
"invalid blob item provided, " + std::string(e.what())); "invalid blob item provided, " + std::string(e.what()));
} }
this->validate(); this->validate();
Show All 29 Lines
View Options

services/backup/src/database/mod.rs

#include "BlobItem.h" #include "BlobItem.h"
#include "Constants.h" #include "Constants.h"
#include <glog/logging.h>
namespace comm { namespace comm {
namespace network { namespace network {
namespace database { namespace database {
const std::string BlobItem::FIELD_BLOB_HASH = "blobHash"; const std::string BlobItem::FIELD_BLOB_HASH = "blobHash";
const std::string BlobItem::FIELD_S3_PATH = "s3Path"; const std::string BlobItem::FIELD_S3_PATH = "s3Path";
const std::string BlobItem::FIELD_CREATED = "created"; const std::string BlobItem::FIELD_CREATED = "created";
std::string BlobItem::tableName = BLOB_TABLE_NAME; std::string BlobItem::tableName = BLOB_TABLE_NAME;
BlobItem::BlobItem( BlobItem::BlobItem(
const std::string blobHash, const std::string blobHash,
const S3Path s3Path, const S3Path s3Path,
uint64_t created) uint64_t created)
: blobHash(blobHash), s3Path(s3Path), created(created) { : blobHash(blobHash), s3Path(s3Path), created(created) {
this->validate(); this->validate();
} }
BlobItem::BlobItem(const AttributeValues &itemFromDB) { BlobItem::BlobItem(const AttributeValues &itemFromDB) {
this->assignItemFromDatabase(itemFromDB); this->assignItemFromDatabase(itemFromDB);
} }
void BlobItem::validate() const { void BlobItem::validate() const {
LOG(INFO) << "[BlobItem::validate]";
if (!this->blobHash.size()) { if (!this->blobHash.size()) {
throw std::runtime_error("blobHash empty"); throw std::runtime_error("blobHash empty");
} }
this->s3Path.validate(); this->s3Path.validate();
} }
void BlobItem::assignItemFromDatabase(const AttributeValues &itemFromDB) { void BlobItem::assignItemFromDatabase(const AttributeValues &itemFromDB) {
LOG(INFO) << "[BlobItem::assignItemFromDatabase]";
try { try {
this->blobHash = itemFromDB.at(BlobItem::FIELD_BLOB_HASH).GetS(); this->blobHash = itemFromDB.at(BlobItem::FIELD_BLOB_HASH).GetS();
LOG(INFO) << "[BlobItem::assignItemFromDatabase] blob hash "
<< this->blobHash;
this->s3Path = S3Path(itemFromDB.at(BlobItem::FIELD_S3_PATH).GetS()); this->s3Path = S3Path(itemFromDB.at(BlobItem::FIELD_S3_PATH).GetS());
this->created = std::stoll( this->created = std::stoll(
std::string(itemFromDB.at(BlobItem::FIELD_CREATED).GetS()).c_str()); std::string(itemFromDB.at(BlobItem::FIELD_CREATED).GetS()).c_str());
} catch (std::logic_error &e) { } catch (std::logic_error &e) {
throw std::runtime_error( throw std::runtime_error(
"invalid blob item provided, " + std::string(e.what())); "invalid blob item provided, " + std::string(e.what()));
} }
this->validate(); this->validate();
Show All 29 Lines