apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-15 02:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make BackupContainer.actor.cpp less verbose

Browse Source
This commit is contained in:
sfc-gh-tclinkenbeard 2021-06-25 22:53:19 -07:00
parent 1afae7623b
commit d88f8f7653
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fdbclient/BackupContainer.actor.cpp
View File

@ -263,9 +263,9 @@ Reference<IBackupContainer> IBackupContainer::openContainer(const std::string& u
try { try {
StringRef u(url); StringRef u(url);
if (u.startsWith(LiteralStringRef("file://"))) { if (u.startsWith("file://"_sr)) {
r = makeReference<BackupContainerLocalDirectory>(url, encryptionKeyFileName); r = makeReference<BackupContainerLocalDirectory>(url, encryptionKeyFileName);
} else if (u.startsWith(LiteralStringRef("blobstore://"))) { } else if (u.startsWith("blobstore://"_sr)) {
std::string resource; std::string resource;
// The URL parameters contain blobstore endpoint tunables as well as possible backup-specific options. // The URL parameters contain blobstore endpoint tunables as well as possible backup-specific options.
@ -278,15 +278,15 @@ Reference<IBackupContainer> IBackupContainer::openContainer(const std::string& u
for (auto c : resource) for (auto c : resource)
if (!isalnum(c) && c != '_' && c != '-' && c != '.' && c != '/') if (!isalnum(c) && c != '_' && c != '-' && c != '.' && c != '/')
throw backup_invalid_url(); throw backup_invalid_url();
r = Reference<IBackupContainer>(new BackupContainerS3BlobStore(bstore, resource, backupParams)); r = makeReference<BackupContainerS3BlobStore>(bstore, resource, backupParams);
} }
#ifdef BUILD_AZURE_BACKUP #ifdef BUILD_AZURE_BACKUP
else if (u.startsWith(LiteralStringRef("azure://"))) { else if (u.startsWith("azure://"_sr)) {
u.eat(LiteralStringRef("azure://")); u.eat("azure://"_sr);
auto address = NetworkAddress::parse(u.eat(LiteralStringRef("/")).toString()); auto address = NetworkAddress::parse(u.eat("/"_sr).toString());
auto containerName = u.eat(LiteralStringRef("/")).toString(); auto containerName = u.eat("/"_sr).toString();
auto accountName = u.eat(LiteralStringRef("/")).toString(); auto accountName = u.eat("/"_sr).toString();
r = Reference<IBackupContainer>(new BackupContainerAzureBlobStore(address, containerName, accountName)); r = makeReference<BackupContainerAzureBlobStore>(address, containerName, accountName);
} }
#endif #endif
else { else {
@ -316,10 +316,10 @@ Reference<IBackupContainer> IBackupContainer::openContainer(const std::string& u
ACTOR Future<std::vector<std::string>> listContainers_impl(std::string baseURL) { ACTOR Future<std::vector<std::string>> listContainers_impl(std::string baseURL) {
try { try {
StringRef u(baseURL); StringRef u(baseURL);
if (u.startsWith(LiteralStringRef("file://"))) { if (u.startsWith("file://"_sr)) {
std::vector<std::string> results = wait(BackupContainerLocalDirectory::listURLs(baseURL)); std::vector<std::string> results = wait(BackupContainerLocalDirectory::listURLs(baseURL));
return results; return results;
} else if (u.startsWith(LiteralStringRef("blobstore://"))) { } else if (u.startsWith("blobstore://"_sr)) {
std::string resource; std::string resource;
S3BlobStoreEndpoint::ParametersT backupParams; S3BlobStoreEndpoint::ParametersT backupParams;
@ -341,7 +341,7 @@ ACTOR Future<std::vector<std::string>> listContainers_impl(std::string baseURL)
} }
// TODO: Enable this when Azure backups are ready // TODO: Enable this when Azure backups are ready
/* /*
else if (u.startsWith(LiteralStringRef("azure://"))) { else if (u.startsWith("azure://"_sr)) {
std::vector<std::string> results = wait(BackupContainerAzureBlobStore::listURLs(baseURL)); std::vector<std::string> results = wait(BackupContainerAzureBlobStore::listURLs(baseURL));
return results; return results;
} }