wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MVC2.0: Refactoring - hide global variables for client lib status and platform names

This commit is contained in:
Vaidas Gasiunas 2021-10-07 11:01:06 +02:00
parent 114d8438fa
commit a150018dc6
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fdbclient/ClientLibManagement.actor.cpp
View File

@ -46,47 +46,47 @@ struct ClientLibBinaryInfo {
ClientLibBinaryInfo() : totalBytes(0), chunkCnt(0), chunkSize(0) {} ClientLibBinaryInfo() : totalBytes(0), chunkCnt(0), chunkSize(0) {}
}; };
static const char* g_statusNames[] = { "disabled", "available", "uploading", "deleting" }; const std::string& getStatusName(ClientLibStatus status) {
static std::map<std::string, ClientLibStatus> g_statusByName; static const std::string statusNames[] = { "disabled", "available", "uploading", "deleting" };
return statusNames[status];
const char* getStatusName(ClientLibStatus status) {
return g_statusNames[status];
} }
ClientLibStatus getStatusByName(const std::string& statusName) { ClientLibStatus getStatusByName(std::string_view statusName) {
static std::map<std::string_view, ClientLibStatus> statusByName;
// initialize the map on demand // initialize the map on demand
if (g_statusByName.empty()) { if (statusByName.empty()) {
for (int i = 0; i < CLIENTLIB_STATUS_COUNT; i++) { for (int i = 0; i < CLIENTLIB_STATUS_COUNT; i++) {
g_statusByName[g_statusNames[i]] = static_cast<ClientLibStatus>(i); ClientLibStatus status = static_cast<ClientLibStatus>(i);
statusByName[getStatusName(status)] = status;
} }
} }
auto statusIter = g_statusByName.find(statusName); auto statusIter = statusByName.find(statusName);
if (statusIter == g_statusByName.cend()) { if (statusIter == statusByName.cend()) {
TraceEvent(SevWarnAlways, "ClientLibraryInvalidMetadata") TraceEvent(SevWarnAlways, "ClientLibraryInvalidMetadata")
.detail("Error", format("Unknown status value %s", statusName.c_str())); .detail("Error", format("Unknown status value %s", std::string(statusName).c_str()));
throw client_lib_invalid_metadata(); throw client_lib_invalid_metadata();
} }
return statusIter->second; return statusIter->second;
} }
static const char* g_platformNames[] = { "unknown", "x84_64-linux", "x86_64-windows", "x86_64-macos" }; const std::string& getPlatformName(ClientLibPlatform platform) {
static std::map<std::string, ClientLibPlatform> g_platformByName; static const std::string platformNames[] = { "unknown", "x84_64-linux", "x86_64-windows", "x86_64-macos" };
return platformNames[platform];
const char* getPlatformName(ClientLibPlatform platform) {
return g_platformNames[platform];
} }
ClientLibPlatform getPlatformByName(const std::string& statusName) { ClientLibPlatform getPlatformByName(std::string_view platformName) {
static std::map<std::string_view, ClientLibPlatform> platformByName;
// initialize the map on demand // initialize the map on demand
if (g_platformByName.empty()) { if (platformByName.empty()) {
for (int i = 0; i < CLIENTLIB_PLATFORM_COUNT; i++) { for (int i = 0; i < CLIENTLIB_PLATFORM_COUNT; i++) {
g_platformByName[g_platformNames[i]] = static_cast<ClientLibPlatform>(i); ClientLibPlatform platform = static_cast<ClientLibPlatform>(i);
platformByName[getPlatformName(platform)] = platform;
} }
} }
auto platfIter = g_platformByName.find(statusName); auto platfIter = platformByName.find(platformName);
if (platfIter == g_platformByName.cend()) { if (platfIter == platformByName.cend()) {
TraceEvent(SevWarnAlways, "ClientLibraryInvalidMetadata") TraceEvent(SevWarnAlways, "ClientLibraryInvalidMetadata")
.detail("Error", format("Unknown platform value %s", statusName.c_str())); .detail("Error", format("Unknown platform value %s", std::string(platformName).c_str()));
throw client_lib_invalid_metadata(); throw client_lib_invalid_metadata();
} }
return platfIter->second; return platfIter->second;

8
fdbclient/ClientLibManagement.actor.h
View File

@ -95,11 +95,11 @@ struct ClientLibFilter {
ClientLibFilter& filterNewerPackageVersion(const std::string& versionStr); ClientLibFilter& filterNewerPackageVersion(const std::string& versionStr);
}; };
const char* getStatusName(ClientLibStatus status); const std::string& getStatusName(ClientLibStatus status);
ClientLibStatus getStatusByName(const std::string& statusName); ClientLibStatus getStatusByName(std::string_view statusName);
const char* getPlatformName(ClientLibPlatform platform); const std::string& getPlatformName(ClientLibPlatform platform);
ClientLibPlatform getPlatformByName(const std::string& statusName); ClientLibPlatform getPlatformByName(std::string_view platformName);
// Upload a client library binary from a file and associated metadata JSON // Upload a client library binary from a file and associated metadata JSON
// to the system keyspace of the database // to the system keyspace of the database