aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/proton/docsummary/docsummary.cpp
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-09-30 18:23:29 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-09-30 18:23:29 +0200
commit0b557c51c7e06a4786366b3e97c24dd19df10221 (patch)
tree36619987d17ec1a2ee6f601c3542598b60cc5e39 /searchcore/src/tests/proton/docsummary/docsummary.cpp
parent7a74c1caf57ca0ac1801e91580acd35bea52d970 (diff)
Update so that the tls direct writer is not optional.
Diffstat (limited to 'searchcore/src/tests/proton/docsummary/docsummary.cpp')
-rw-r--r--searchcore/src/tests/proton/docsummary/docsummary.cpp30
1 files changed, 6 insertions, 24 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index f492dc44fc6..97a96c4bac6 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -201,38 +201,20 @@ public:
_sa()
{
assert(_mkdirOk);
- auto b = std::make_shared<BootstrapConfig>(1,
- _documenttypesConfig,
- _repo,
+ auto b = std::make_shared<BootstrapConfig>(1, _documenttypesConfig, _repo,
std::make_shared<ProtonConfig>(),
std::make_shared<FiledistributorrpcConfig>(),
_tuneFileDocumentDB);
_configMgr.forwardConfig(b);
_configMgr.nextGeneration(0);
if (! FastOS_File::MakeDirectory((std::string("tmpdb/") + docTypeName).c_str())) { abort(); }
- _ddb.reset(new DocumentDB("tmpdb",
- _configMgr.getConfig(),
- "tcp/localhost:9013",
- _queryLimiter,
- _clock,
- DocTypeName(docTypeName),
- ProtonConfig(),
- *this,
- _summaryExecutor,
- _summaryExecutor,
- NULL,
- _dummy,
- _fileHeaderContext,
- ConfigStore::UP(new MemoryConfigStore),
- std::make_shared<vespalib::
- ThreadStackExecutor>
- (16, 128 * 1024),
- _hwInfo)),
+ _ddb.reset(new DocumentDB("tmpdb", _configMgr.getConfig(), "tcp/localhost:9013", _queryLimiter, _clock,
+ DocTypeName(docTypeName), ProtonConfig(), *this, _summaryExecutor, _summaryExecutor,
+ _tls, _dummy, _fileHeaderContext, ConfigStore::UP(new MemoryConfigStore),
+ std::make_shared<vespalib::ThreadStackExecutor>(16, 128 * 1024), _hwInfo)),
_ddb->start();
_ddb->waitForOnlineState();
- _aw = AttributeWriter::UP(new AttributeWriter(_ddb->
- getReadySubDB()->
- getAttributeManager()));
+ _aw = AttributeWriter::UP(new AttributeWriter(_ddb->getReadySubDB()->getAttributeManager()));
_sa = _ddb->getReadySubDB()->getSummaryAdapter();
}
~DBContext()