diff options
Diffstat (limited to 'cpp/src/IceStorm/TopicManagerI.cpp')
| -rw-r--r-- | cpp/src/IceStorm/TopicManagerI.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 11d00224ff1..a1756deed63 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -290,7 +290,7 @@ nameToIdentity(const InstancePtr& instance, const string& name) TopicManagerImpl::TopicManagerImpl(const InstancePtr& instance) : _instance(instance), - _databaseCache(instance->databaseCache()) + _connectionPool(instance->connectionPool()) { try { @@ -312,15 +312,15 @@ TopicManagerImpl::TopicManagerImpl(const InstancePtr& instance) : _sync = _instance->nodeAdapter()->addWithUUID(_syncImpl); } - DatabaseConnectionPtr connection = _databaseCache->newConnection(); + DatabaseConnectionPtr connection = _connectionPool->newConnection(); // Ensure that the llu counter is present in the log. - LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection); + LLUWrapperPtr lluWrapper = _connectionPool->getLLU(connection); LogUpdate empty = {0, 0}; lluWrapper->put(empty); // Recreate each of the topics. - SubscribersWrapperPtr subscribersWrapper = _databaseCache->getSubscribers(connection); + SubscribersWrapperPtr subscribersWrapper = _connectionPool->getSubscribers(connection); map<SubscriberRecordKey, SubscriberRecord> subscriberMap = subscribersWrapper->getMap(); map<SubscriberRecordKey, SubscriberRecord>::const_iterator p = subscriberMap.begin(); @@ -381,7 +381,7 @@ TopicManagerImpl::create(const string& name) { try { - DatabaseConnectionPtr connection = _databaseCache->newConnection(); + DatabaseConnectionPtr connection = _connectionPool->newConnection(); TransactionHolder txn(connection); SubscriberRecordKey key; @@ -390,10 +390,10 @@ TopicManagerImpl::create(const string& name) rec.link = false; rec.cost = 0; - SubscribersWrapperPtr subscribersWrapper = _databaseCache->getSubscribers(connection); + SubscribersWrapperPtr subscribersWrapper = _connectionPool->getSubscribers(connection); subscribersWrapper->put(key, rec); - LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection); + LLUWrapperPtr lluWrapper = _connectionPool->getLLU(connection); llu = lluWrapper->get(); llu.iteration++; lluWrapper->put(llu); @@ -486,13 +486,13 @@ TopicManagerImpl::observerInit(const LogUpdate& llu, const TopicContentSeq& cont { try { - DatabaseConnectionPtr connection = _databaseCache->newConnection(); + DatabaseConnectionPtr connection = _connectionPool->newConnection(); TransactionHolder txn(connection); - LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection); + LLUWrapperPtr lluWrapper = _connectionPool->getLLU(connection); lluWrapper->put(llu); - SubscribersWrapperPtr subscribersWrapper = _databaseCache->getSubscribers(connection); + SubscribersWrapperPtr subscribersWrapper = _connectionPool->getSubscribers(connection); subscribersWrapper->clear(); for(TopicContentSeq::const_iterator p = content.begin(); p != content.end(); ++p) @@ -590,7 +590,7 @@ TopicManagerImpl::observerCreateTopic(const LogUpdate& llu, const string& name) { try { - DatabaseConnectionPtr connection = _databaseCache->newConnection(); + DatabaseConnectionPtr connection = _connectionPool->newConnection(); TransactionHolder txn(connection); SubscriberRecordKey key; @@ -599,7 +599,7 @@ TopicManagerImpl::observerCreateTopic(const LogUpdate& llu, const string& name) rec.link = false; rec.cost = 0; - SubscribersWrapperPtr subscribersWrapper = _databaseCache->getSubscribers(connection); + SubscribersWrapperPtr subscribersWrapper = _connectionPool->getSubscribers(connection); try { subscribersWrapper->find(key); @@ -610,7 +610,7 @@ TopicManagerImpl::observerCreateTopic(const LogUpdate& llu, const string& name) } subscribersWrapper->put(key, rec); - LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection); + LLUWrapperPtr lluWrapper = _connectionPool->getLLU(connection); lluWrapper->put(llu); txn.commit(); @@ -687,7 +687,7 @@ TopicManagerImpl::getContent(LogUpdate& llu, TopicContentSeq& content) reap(); } - DatabaseConnectionPtr connection = _databaseCache->newConnection(); + DatabaseConnectionPtr connection = _connectionPool->newConnection(); for(;;) { @@ -700,7 +700,7 @@ TopicManagerImpl::getContent(LogUpdate& llu, TopicContentSeq& content) content.push_back(rec); } - LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection); + LLUWrapperPtr lluWrapper = _connectionPool->getLLU(connection); llu = lluWrapper->get(); break; } @@ -718,13 +718,13 @@ TopicManagerImpl::getContent(LogUpdate& llu, TopicContentSeq& content) LogUpdate TopicManagerImpl::getLastLogUpdate() const { - DatabaseConnectionPtr connection = _databaseCache->newConnection(); + DatabaseConnectionPtr connection = _connectionPool->newConnection(); for(;;) { try { - LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection); + LLUWrapperPtr lluWrapper = _connectionPool->getLLU(connection); return lluWrapper->get(); } catch(const DeadlockException&) @@ -776,7 +776,7 @@ TopicManagerImpl::initMaster(const set<GroupNodeInfo>& slaves, const LogUpdate& { content.clear(); - DatabaseConnectionPtr connection = _databaseCache->newConnection(); + DatabaseConnectionPtr connection = _connectionPool->newConnection(); TransactionHolder txn(connection); for(map<string, TopicImplPtr>::const_iterator p = _topics.begin(); p != _topics.end(); ++p) @@ -785,7 +785,7 @@ TopicManagerImpl::initMaster(const set<GroupNodeInfo>& slaves, const LogUpdate& content.push_back(rec); } - LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection); + LLUWrapperPtr lluWrapper = _connectionPool->getLLU(connection); lluWrapper->put(llu); txn.commit(); |