summaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/proton/proton_configurer
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-03-23 16:01:22 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-03-23 16:13:09 +0000
commit36b3be76ae151682295faa04de17989f3600c29b (patch)
treefbe5156d396bfa694f9acd932b466088c20d2e63 /searchcore/src/tests/proton/proton_configurer
parent23dcf1db150a66ec66cf746d4234982fdbb0e6e2 (diff)
Add shutdown to thread interface.
Let the optimize config control index and summary executor too.
Diffstat (limited to 'searchcore/src/tests/proton/proton_configurer')
-rw-r--r--searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
index dfb1268aaa6..c26b008f769 100644
--- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
+++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
@@ -243,7 +243,6 @@ struct MyLog
struct MyProtonConfigurerOwner : public IProtonConfigurerOwner,
public MyLog
{
- using InitializeThreads = std::shared_ptr<vespalib::ThreadStackExecutorBase>;
vespalib::ThreadStackExecutor _executor;
std::map<DocTypeName, std::shared_ptr<MyDocumentDBConfigOwner>> _dbs;
@@ -254,9 +253,9 @@ struct MyProtonConfigurerOwner : public IProtonConfigurerOwner,
_dbs()
{
}
- virtual ~MyProtonConfigurerOwner() { }
+ ~MyProtonConfigurerOwner() { }
- virtual std::shared_ptr<DocumentDBConfigOwner> addDocumentDB(const DocTypeName &docTypeName,
+ std::shared_ptr<DocumentDBConfigOwner> addDocumentDB(const DocTypeName &docTypeName,
document::BucketSpace bucketSpace,
const vespalib::string &configId,
const std::shared_ptr<BootstrapConfig> &bootstrapConfig,
@@ -275,14 +274,14 @@ struct MyProtonConfigurerOwner : public IProtonConfigurerOwner,
_log.push_back(os.str());
return db;
}
- virtual void removeDocumentDB(const DocTypeName &docTypeName) override {
+ void removeDocumentDB(const DocTypeName &docTypeName) override {
ASSERT_FALSE(_dbs.find(docTypeName) == _dbs.end());
_dbs.erase(docTypeName);
std::ostringstream os;
os << "remove db " << docTypeName.getName();
_log.push_back(os.str());
}
- virtual void applyConfig(const std::shared_ptr<BootstrapConfig> &bootstrapConfig) override {
+ void applyConfig(const std::shared_ptr<BootstrapConfig> &bootstrapConfig) override {
std::ostringstream os;
os << "apply config " << bootstrapConfig->getGeneration();
_log.push_back(os.str());