diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-03-08 22:57:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-08 22:57:39 +0100 |
commit | 97c338a8d5422fc6fc64ff4f1433104c694b6a84 (patch) | |
tree | bf480def128948db8232b258f616c574b41c617c /searchlib | |
parent | c097f2f22e032aba47e80e5588f24c4da2a14fcc (diff) | |
parent | b20e63f9506c37e73e46e8e879078ed69c639a5e (diff) |
Merge pull request #21586 from vespa-engine/balder/gc-unused-threadpool
Balder/gc unused threadpool
Diffstat (limited to 'searchlib')
21 files changed, 30 insertions, 66 deletions
diff --git a/searchlib/src/vespa/searchlib/aggregation/group.h b/searchlib/src/vespa/searchlib/aggregation/group.h index 202c5085133..53061b1447b 100644 --- a/searchlib/src/vespa/searchlib/aggregation/group.h +++ b/searchlib/src/vespa/searchlib/aggregation/group.h @@ -5,7 +5,6 @@ #include "aggregationresult.h" #include <vespa/searchlib/common/hitrank.h> #include <vespa/vespalib/stllike/hash_set.h> -#include <vespa/fastos/dynamiclibrary.h> #include <vector> namespace search::aggregation { diff --git a/searchlib/src/vespa/searchlib/common/bitvector.h b/searchlib/src/vespa/searchlib/common/bitvector.h index c1d447047d1..02f51fe8758 100644 --- a/searchlib/src/vespa/searchlib/common/bitvector.h +++ b/searchlib/src/vespa/searchlib/common/bitvector.h @@ -6,7 +6,7 @@ #include <memory> #include <vespa/vespalib/util/alloc.h> #include <vespa/vespalib/util/generationholder.h> -#include <vespa/fastos/dynamiclibrary.h> +#include <vespa/fastos/types.h> namespace vespalib { class nbostream; diff --git a/searchlib/src/vespa/searchlib/common/bitvectorcache.h b/searchlib/src/vespa/searchlib/common/bitvectorcache.h index 33610afc108..5f8edf29854 100644 --- a/searchlib/src/vespa/searchlib/common/bitvectorcache.h +++ b/searchlib/src/vespa/searchlib/common/bitvectorcache.h @@ -4,7 +4,6 @@ #include "condensedbitvectors.h" #include <vespa/vespalib/stllike/hash_set.h> #include <vespa/vespalib/stllike/hash_map.h> -#include <vespa/fastos/dynamiclibrary.h> #include <mutex> namespace search { diff --git a/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h b/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h index e91e06bdf7a..07467e28229 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h +++ b/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h @@ -5,7 +5,6 @@ #include <vespa/searchlib/index/postinglistfile.h> #include <vespa/searchlib/bitcompression/compression.h> #include <vespa/searchlib/queryeval/iterators.h> -#include <vespa/fastos/dynamiclibrary.h> namespace search::diskindex { diff --git a/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h b/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h index d9375f12d54..1d5ac98a74d 100644 --- a/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h +++ b/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h @@ -4,7 +4,6 @@ #include "nativerankfeature.h" #include "queryterm.h" -#include <vespa/fastos/dynamiclibrary.h> namespace search::features { diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_posting_list.h b/searchlib/src/vespa/searchlib/predicate/predicate_posting_list.h index 6ac41c62305..0bf33f1d0e5 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_posting_list.h +++ b/searchlib/src/vespa/searchlib/predicate/predicate_posting_list.h @@ -3,7 +3,7 @@ #include <memory> #include <cstdint> -#include <vespa/fastos/dynamiclibrary.h> +#include <vespa/fastos/types.h> /** * Interface for posting lists used by PredicateSearch. diff --git a/searchlib/src/vespa/searchlib/queryeval/andsearchnostrict.h b/searchlib/src/vespa/searchlib/queryeval/andsearchnostrict.h index 9707b02ae58..f809d9028c0 100644 --- a/searchlib/src/vespa/searchlib/queryeval/andsearchnostrict.h +++ b/searchlib/src/vespa/searchlib/queryeval/andsearchnostrict.h @@ -4,8 +4,7 @@ #include "andsearch.h" -namespace search { -namespace queryeval { +namespace search::queryeval { /** * A simple implementation of the And search operation. @@ -56,6 +55,4 @@ private: Unpack _unpacker; }; -} // namespace queryeval -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/queryeval/andsearchstrict.h b/searchlib/src/vespa/searchlib/queryeval/andsearchstrict.h index 63cbb77dbc8..96fb706f50c 100644 --- a/searchlib/src/vespa/searchlib/queryeval/andsearchstrict.h +++ b/searchlib/src/vespa/searchlib/queryeval/andsearchstrict.h @@ -3,10 +3,8 @@ #pragma once #include "andsearchnostrict.h" -#include <vespa/fastos/dynamiclibrary.h> -namespace search { -namespace queryeval { +namespace search::queryeval { /** * A simple strict implementation of the And search operation. @@ -105,6 +103,4 @@ AndSearchStrict<Unpack>::andWith(SearchIterator::UP filter, uint32_t estimate_) return filter; // Should always be empty, returning it incase logic changes. } -} // namespace queryeval -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/queryeval/booleanmatchiteratorwrapper.cpp b/searchlib/src/vespa/searchlib/queryeval/booleanmatchiteratorwrapper.cpp index f259bb3d242..8061160cb5e 100644 --- a/searchlib/src/vespa/searchlib/queryeval/booleanmatchiteratorwrapper.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/booleanmatchiteratorwrapper.cpp @@ -5,8 +5,7 @@ #include <vespa/searchlib/fef/termfieldmatchdataarray.h> #include <vespa/vespalib/objects/visit.hpp> -namespace search { -namespace queryeval { +namespace search::queryeval { void BooleanMatchIteratorWrapper::doSeek(uint32_t docid) @@ -41,5 +40,4 @@ BooleanMatchIteratorWrapper::visitMembers(vespalib::ObjectVisitor &visitor) cons // _match not visited } -} // namespace queryeval -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/queryeval/elementiterator.h b/searchlib/src/vespa/searchlib/queryeval/elementiterator.h index 2f46baf087a..aff0fe29779 100644 --- a/searchlib/src/vespa/searchlib/queryeval/elementiterator.h +++ b/searchlib/src/vespa/searchlib/queryeval/elementiterator.h @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/searchlib/queryeval/searchiterator.h> +#include "searchiterator.h" namespace search::fef { class TermFieldMatchData; } diff --git a/searchlib/src/vespa/searchlib/queryeval/emptysearch.h b/searchlib/src/vespa/searchlib/queryeval/emptysearch.h index dfb294c6e0c..897decb456b 100644 --- a/searchlib/src/vespa/searchlib/queryeval/emptysearch.h +++ b/searchlib/src/vespa/searchlib/queryeval/emptysearch.h @@ -5,8 +5,7 @@ #include "searchiterator.h" #include <vespa/searchlib/common/bitvector.h> -namespace search { -namespace queryeval { +namespace search::queryeval { /** Search iterator that never yields any hits. */ class EmptySearch : public SearchIterator @@ -28,5 +27,4 @@ public: ~EmptySearch(); }; -} // namespace queryeval -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.h b/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.h index 126d395ddb2..706e05f0156 100644 --- a/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.h +++ b/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.h @@ -5,8 +5,7 @@ #include "blueprint.h" #include <vespa/searchlib/fef/matchdatalayout.h> -namespace search { -namespace queryeval { +namespace search::queryeval { class EquivBlueprint : public ComplexLeafBlueprint { @@ -32,5 +31,4 @@ public: bool isEquiv() const override { return true; } }; -} // namespace queryeval -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/queryeval/fake_result.cpp b/searchlib/src/vespa/searchlib/queryeval/fake_result.cpp index 8b02dd1d6c9..47e53253210 100644 --- a/searchlib/src/vespa/searchlib/queryeval/fake_result.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/fake_result.cpp @@ -3,8 +3,7 @@ #include "fake_result.h" #include <ostream> -namespace search { -namespace queryeval { +namespace search::queryeval { FakeResult::FakeResult() : _documents(), @@ -46,5 +45,4 @@ std::ostream &operator << (std::ostream &out, const FakeResult &result) { return out; } -} // namespace queryeval -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/queryeval/hitcollector.h b/searchlib/src/vespa/searchlib/queryeval/hitcollector.h index 85bbe5ee950..54a48e9ce49 100644 --- a/searchlib/src/vespa/searchlib/queryeval/hitcollector.h +++ b/searchlib/src/vespa/searchlib/queryeval/hitcollector.h @@ -3,13 +3,13 @@ #pragma once #include "scores.h" +#include "sorted_hit_sequence.h" #include <vespa/searchlib/common/hitrank.h> #include <vespa/searchlib/common/resultset.h> +#include <vespa/vespalib/util/sort.h> #include <algorithm> #include <vector> -#include <vespa/vespalib/util/sort.h> -#include <vespa/fastos/dynamiclibrary.h> -#include "sorted_hit_sequence.h" +#include <vespa/fastos/types.h> namespace search::queryeval { diff --git a/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.cpp b/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.cpp index efbc9d96cc6..a4a72807c0c 100644 --- a/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.cpp @@ -3,8 +3,7 @@ #include <vespa/log/log.h> LOG_SETUP(".queryeval.monitoring_dump_iterator"); -namespace search { -namespace queryeval { +namespace search::queryeval { MonitoringDumpIterator::MonitoringDumpIterator(MonitoringSearchIterator::UP iterator) : _search(std::move(iterator)) @@ -31,6 +30,4 @@ MonitoringDumpIterator::doUnpack(uint32_t docId) _search->unpack(docId); } -} // namespace queryeval -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.h b/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.h index 93229d74a39..7dbe04ac860 100644 --- a/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.h +++ b/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.h @@ -3,8 +3,7 @@ #include "monitoring_search_iterator.h" -namespace search { -namespace queryeval { +namespace search::queryeval { /** * Search iterator that dumps the search stats of the underlying @@ -29,6 +28,4 @@ public: } }; -} // namespace queryeval -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.cpp b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.cpp index d086d7b2ca5..cff62ea7117 100644 --- a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.cpp @@ -8,8 +8,7 @@ LOG_SETUP(".queryeval.monitoring_search_iterator"); using vespalib::make_string; -namespace search { -namespace queryeval { +namespace search::queryeval { MonitoringSearchIterator::Stats::Stats() : _numSeeks(0), @@ -237,5 +236,4 @@ MonitoringSearchIterator::visitMembers(vespalib::ObjectVisitor &visitor) const _search->visitMembers(visitor); } -} // namespace queryeval -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h index 6345d203f9e..3d20b79a81d 100644 --- a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h +++ b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h @@ -5,8 +5,7 @@ #include <vespa/vespalib/objects/objectvisitor.h> #include <stack> -namespace search { -namespace queryeval { +namespace search::queryeval { /** * Search iterator that monitors an underlying search iterator @@ -122,6 +121,4 @@ public: const Stats &getStats() const { return _stats; } }; -} // namespace queryeval -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/queryeval/nearsearch.cpp b/searchlib/src/vespa/searchlib/queryeval/nearsearch.cpp index 2966ac06dcc..5297646d7f8 100644 --- a/searchlib/src/vespa/searchlib/queryeval/nearsearch.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/nearsearch.cpp @@ -8,8 +8,7 @@ #include <vespa/log/log.h> LOG_SETUP(".nearsearch"); -namespace search { -namespace queryeval { +namespace search::queryeval { namespace { @@ -307,5 +306,4 @@ ONearSearch::match(uint32_t docId) return false; } -} // queryeval -} // search +} diff --git a/searchlib/src/vespa/searchlib/queryeval/nearsearch.h b/searchlib/src/vespa/searchlib/queryeval/nearsearch.h index e2a93171001..bf3fded2717 100644 --- a/searchlib/src/vespa/searchlib/queryeval/nearsearch.h +++ b/searchlib/src/vespa/searchlib/queryeval/nearsearch.h @@ -5,8 +5,7 @@ #include <vespa/searchlib/fef/termfieldmatchdataarray.h> #include "andsearch.h" -namespace search { -namespace queryeval { +namespace search::queryeval { /** * The near search base implements the common logic of the near and o-near search. @@ -145,6 +144,4 @@ public: }; -} // queryeval -} // search - +} diff --git a/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp b/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp index f6d20d88a6c..8357d403000 100644 --- a/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp @@ -2,7 +2,6 @@ #include "sourceblendersearch.h" #include "isourceselector.h" -#include <vespa/fastos/dynamiclibrary.h> #include <vespa/vespalib/objects/visit.hpp> #include <vespa/vespalib/util/array.hpp> |