diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-12-12 16:57:12 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-12-12 16:57:12 +0000 |
| commit | a6827b11b0c79eb61a69b48a2cd2a313b31d590d (patch) | |
| tree | b07354bf543b93763e76c1f13824977b95689e6f /searchcore | |
| parent | 790d5c8961f7bc8037d9de31dcd80e03922bc1da (diff) | |
Follow config if using supplied thread bundle or not.
Diffstat (limited to 'searchcore')
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp | 3 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp b/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp index 51d96c5a843..a3d2a9b33d9 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp @@ -100,8 +100,9 @@ AttributeLimiter::create_match_data(size_t want_hits, size_t max_group_size, dou field.add(FieldSpec(_attribute_name, my_field_id, my_handle)); _blueprint = _searchable_attributes.createBlueprint(_requestContext, field, node); //TODO use_estimate must be switched to true quite soon + //TODO Use thread_bundle once verified(soon), _requestContext.thread_bundle() auto execInfo = ExecuteInfo::create(strictSearch, strictSearch ? 1.0 : hit_rate, &_requestContext.getDoom(), - _requestContext.thread_bundle(), true, false); + vespalib::ThreadBundle::trivial(), true, false); _blueprint->fetchPostings(execInfo); _estimatedHits.store(_blueprint->getState().estimate().estHits, std::memory_order_relaxed); _blueprint->freeze(); diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp index 527f7702a7c..920af030c74 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp @@ -208,7 +208,9 @@ MatchToolsFactory(QueryLimiter & queryLimiter, double hitRate = std::min(1.0, double(maxNumHits)/double(searchContext.getDocIdLimit())); bool create_postinglist_when_non_strict = CreatePostingListWhenNonStrict::check(_queryEnv.getProperties(), rankSetup.create_postinglist_when_non_strict()); bool use_estimate_for_fetch_postings = UseEstimateForFetchPostings::check(_queryEnv.getProperties(), rankSetup.use_estimate_for_fetch_postings()); - _query.fetchPostings(ExecuteInfo::create(is_search, hitRate, &_requestContext.getDoom(), thread_bundle, + bool use_thread_bundle_for_fetch_postings = UseThreadBundleForFetchPostings::check(_queryEnv.getProperties(), rankSetup.use_thread_bundle_for_fetch_postings()); + _query.fetchPostings(ExecuteInfo::create(is_search, hitRate, &_requestContext.getDoom(), + use_thread_bundle_for_fetch_postings ? thread_bundle : vespalib::ThreadBundle::trivial(), create_postinglist_when_non_strict, use_estimate_for_fetch_postings)); if (is_search) { _query.handle_global_filter(_requestContext, searchContext.getDocIdLimit(), |