diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-05-09 21:14:19 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-05-09 21:18:12 +0000 |
| commit | 8c35625d8c6d65f42d392ec93721548bad606a8c (patch) | |
| tree | e53666fce81c3667d7f990fb2b662f1d525e5173 /searchcore | |
| parent | bb565352a9126272451b9b3cf5679d98b1f47536 (diff) | |
Wire the metastore read guard all the way and use it, if present.
Diffstat (limited to 'searchcore')
4 files changed, 5 insertions, 8 deletions
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp index bce9694cd58..130fb29c289 100644 --- a/searchcore/src/tests/proton/matching/matching_test.cpp +++ b/searchcore/src/tests/proton/matching/matching_test.cpp @@ -386,9 +386,8 @@ struct MyWorld { Matcher::SP matcher = createMatcher(); SearchRequest::SP request = createSimpleRequest("f1", "spread"); search::fef::Properties overrides; - MatchToolsFactory::UP match_tools_factory = matcher->create_match_tools_factory( - *request, searchContext, attributeContext, metaStore, overrides, ttb(), nullptr, true); - MatchTools::UP match_tools = match_tools_factory->createMatchTools(); + auto mtf = matcher->create_match_tools_factory(*request, searchContext, attributeContext, metaStore, overrides, ttb(), nullptr, true); + MatchTools::UP match_tools = mtf->createMatchTools(); match_tools->setup_first_phase(nullptr); return match_tools->match_data().get_termwise_limit(); } diff --git a/searchcore/src/vespa/searchcore/proton/attribute/imported_attributes_context.h b/searchcore/src/vespa/searchcore/proton/attribute/imported_attributes_context.h index 39fde4f5fb7..69f566b70a6 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/imported_attributes_context.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/imported_attributes_context.h @@ -2,7 +2,7 @@ #pragma once #include <vespa/searchcommon/attribute/iattributecontext.h> -#include <vespa/searchlib/common/i_document_meta_store_context.h> +#include <vespa/searchcommon/attribute/i_document_meta_store_context.h> #include <vespa/vespalib/stllike/hash_fun.h> #include <vespa/vespalib/stllike/hash_map.h> #include <mutex> diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store_context.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store_context.h index 9853c4af5b6..42c9ee26f35 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store_context.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store_context.h @@ -3,7 +3,7 @@ #pragma once #include "i_document_meta_store.h" -#include <vespa/searchlib/common/i_document_meta_store_context.h> +#include <vespa/searchcommon/attribute/i_document_meta_store_context.h> namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.h b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.h index dd0e462aa49..8a974b6d527 100644 --- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.h +++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.h @@ -2,13 +2,11 @@ #pragma once -#include <vespa/searchlib/common/i_document_meta_store_context.h> +#include <vespa/searchcommon/attribute/i_document_meta_store_context.h> #include <vespa/searchlib/common/i_gid_to_lid_mapper.h> namespace proton { -class DocumentMetaStore; - /* * Class for mapping from gid to lid. Instances should be short lived * due to read guards preventing resource reuse. |