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

change shared state map and update locations

This commit is contained in:
Jon Fu 2022-01-28 16:56:14 -05:00
parent 9db49484d4
commit 91ecc4104d
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fdbclient/MultiVersionTransaction.actor.cpp
View File

@ -1191,7 +1191,14 @@ MultiVersionDatabase::MultiVersionDatabase(MultiVersionApi* api,
: dbState(new DatabaseState(clusterFilePath, versionMonitorDb)) {
dbState->db = db;
dbState->dbVar->set(db);
auto stateMapKey = std::make_pair(clusterFilePath, dbState->dbProtocolVersion.get());
if (api->clusterSharedStateMap.find(stateMapKey) == api->clusterSharedStateMap.end() ||
api->clusterSharedStateMap[stateMapKey] == nullptr) {
DatabaseSharedState* p = db->createSharedState();
api->clusterSharedStateMap[stateMapKey] = p;
} else {
db->setSharedState(api->clusterSharedStateMap[stateMapKey]);
}
if (openConnectors) {
if (!api->localClientDisabled) {
dbState->addClient(api->getLocalClient());
@ -1531,6 +1538,15 @@ void MultiVersionDatabase::DatabaseState::updateDatabase(Reference<IDatabase> ne
}
}
auto stateMapKey = std::make_pair(clusterFilePath, dbProtocolVersion.get());
if (MultiVersionApi::api->clusterSharedStateMap.find(stateMapKey) ==
MultiVersionApi::api->clusterSharedStateMap.end() ||
MultiVersionApi::api->clusterSharedStateMap[stateMapKey] == nullptr) {
DatabaseSharedState* p = db->createSharedState();
MultiVersionApi::api->clusterSharedStateMap[stateMapKey] = p;
} else {
db->setSharedState(MultiVersionApi::api->clusterSharedStateMap[stateMapKey]);
}
dbVar->set(db);
ASSERT(protocolVersionMonitor.isValid());
@ -2147,13 +2163,6 @@ Reference<IDatabase> MultiVersionApi::createDatabase(const char* clusterFilePath
lock.leave();
Reference<IDatabase> localDb = localClient->api->createDatabase(clusterFilePath);
if (clusterSharedStateMap.find(clusterFile) == clusterSharedStateMap.end() ||
clusterSharedStateMap[clusterFile] == nullptr) {
DatabaseSharedState* p = localDb->createSharedState();
clusterSharedStateMap[clusterFile] = p;
} else {
localDb->setSharedState(clusterSharedStateMap[clusterFile]);
}
return Reference<IDatabase>(
new MultiVersionDatabase(this, threadIdx, clusterFile, Reference<IDatabase>(), localDb));
}
@ -2163,13 +2172,6 @@ Reference<IDatabase> MultiVersionApi::createDatabase(const char* clusterFilePath
ASSERT_LE(threadCount, 1);
Reference<IDatabase> localDb = localClient->api->createDatabase(clusterFilePath);
if (clusterSharedStateMap.find(clusterFile) == clusterSharedStateMap.end() ||
clusterSharedStateMap[clusterFile] == nullptr) {
DatabaseSharedState* p = localDb->createSharedState();
clusterSharedStateMap[clusterFile] = p;
} else {
localDb->setSharedState(clusterSharedStateMap[clusterFile]);
}
if (bypassMultiClientApi) {
return localDb;
} else {

3
fdbclient/MultiVersionTransaction.h
View File

@ -718,6 +718,8 @@ public:
bool callbackOnMainThread;
bool localClientDisabled;
// Map of (clusterFilePath + protocolVersion) -> DatabaseSharedState pointer
std::map<std::pair<std::string, ProtocolVersion>, DatabaseSharedState*> clusterSharedStateMap;
static bool apiVersionAtLeast(int minVersion);
@ -741,7 +743,6 @@ private:
Reference<ClientInfo> localClient;
std::map<std::string, ClientDesc> externalClientDescriptions;
std::map<std::string, std::vector<Reference<ClientInfo>>> externalClients;
std::map<std::string, DatabaseSharedState*> clusterSharedStateMap;
bool networkStartSetup;
volatile bool networkSetup;