From 3a9f8a641d5312e83a34f6aa293f98182c90adfe Mon Sep 17 00:00:00 2001 From: Arnstein Ressem Date: Wed, 19 Aug 2020 17:54:54 +0200 Subject: Revert "Balder/use an actual fieldset repo" --- .../src/tests/searchvisitor/searchvisitor_test.cpp | 10 +++++----- streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'streamingvisitors') diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp index 216e02c5edd..18cd7fab2b8 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() override; + ~SearchVisitorTest(); int Main() override; }; @@ -46,9 +46,9 @@ SearchVisitorTest::SearchVisitorTest() : { _componentRegister.setNodeInfo("mycluster", lib::NodeType::STORAGE, 1); _componentRegister.setClock(_clock); - auto repo = std::make_shared(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg"))); + StorageComponent::DocumentTypeRepoSP repo(new DocumentTypeRepo(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg")))); _componentRegister.setDocumentTypeRepo(repo); - _component = std::make_unique(_componentRegister, "storage"); + _component.reset(new 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") != nullptr); - EXPECT_TRUE(_env.getRankManager("simple") != nullptr); + EXPECT_TRUE(_env.getVSMAdapter("simple") != NULL); + EXPECT_TRUE(_env.getRankManager("simple") != NULL); } void diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index cc28c76acce..76ef0f23dd2 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()->documentTypeRepo); + _fieldsUnion, *_component.getTypeRepo()); _docTypeMapping.prepareBaseDoc(_fieldPathMap); } -- cgit v1.2.3