diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-18 22:28:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-18 22:28:23 +0200 |
commit | 2f0ccbe4e07afee74513e9e89a2a037db47fd542 (patch) | |
tree | a6eb15dc7d566151325d54ebb0222f1d8df8c22e /streamingvisitors/src | |
parent | 4a229ee61e8409a73722eb2820b5ed8a3e6b8f21 (diff) | |
parent | 623648364a8e32ff0ec811f2a8b0179bd13d5956 (diff) |
Merge pull request #14051 from vespa-engine/balder/use-an-actual-fieldset-repo
Balder/use an actual fieldset repo
Diffstat (limited to 'streamingvisitors/src')
-rw-r--r-- | streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp | 10 | ||||
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp index 18cd7fab2b8..216e02c5edd 100644 --- a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp +++ b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp @@ -35,7 +35,7 @@ private: public: SearchVisitorTest(); - ~SearchVisitorTest(); + ~SearchVisitorTest() override; int Main() override; }; @@ -46,9 +46,9 @@ SearchVisitorTest::SearchVisitorTest() : { _componentRegister.setNodeInfo("mycluster", lib::NodeType::STORAGE, 1); _componentRegister.setClock(_clock); - StorageComponent::DocumentTypeRepoSP repo(new DocumentTypeRepo(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg")))); + auto repo = std::make_shared<DocumentTypeRepo>(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg"))); _componentRegister.setDocumentTypeRepo(repo); - _component.reset(new StorageComponent(_componentRegister, "storage")); + _component = std::make_unique<StorageComponent>(_componentRegister, "storage"); } SearchVisitorTest::~SearchVisitorTest() = default; @@ -80,8 +80,8 @@ SearchVisitorTest::testCreateSearchVisitor(const vespalib::string & dir, const v void SearchVisitorTest::testSearchEnvironment() { - EXPECT_TRUE(_env.getVSMAdapter("simple") != NULL); - EXPECT_TRUE(_env.getRankManager("simple") != NULL); + EXPECT_TRUE(_env.getVSMAdapter("simple") != nullptr); + EXPECT_TRUE(_env.getRankManager("simple") != nullptr); } void diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index 76ef0f23dd2..cc28c76acce 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -677,7 +677,7 @@ SearchVisitor::setupScratchDocument(const StringFieldIdTMap & fieldsInQuery) } // Init based on default document type and mapping from field name to field id _docTypeMapping.init(_fieldSearchSpecMap.documentTypeMap().begin()->first, - _fieldsUnion, *_component.getTypeRepo()); + _fieldsUnion, *_component.getTypeRepo()->documentTypeRepo); _docTypeMapping.prepareBaseDoc(_fieldPathMap); } |