diff options
Diffstat (limited to 'searchlib/src/tests/queryeval')
12 files changed, 30 insertions, 30 deletions
diff --git a/searchlib/src/tests/queryeval/blueprint/mysearch.h b/searchlib/src/tests/queryeval/blueprint/mysearch.h index 23cfc8583cd..6c91a23e80b 100644 --- a/searchlib/src/tests/queryeval/blueprint/mysearch.h +++ b/searchlib/src/tests/queryeval/blueprint/mysearch.h @@ -12,8 +12,8 @@ namespace search::queryeval { class MySearch : public MultiSearch { public: - typedef search::fef::TermFieldMatchDataArray TFMDA; - typedef search::fef::MatchData MatchData; + using TFMDA = search::fef::TermFieldMatchDataArray; + using MatchData = search::fef::MatchData; private: vespalib::string _tag; @@ -103,7 +103,7 @@ public: class MyLeaf : public SimpleLeafBlueprint { - typedef search::fef::TermFieldMatchDataArray TFMDA; + using TFMDA = search::fef::TermFieldMatchDataArray; bool _got_global_filter; public: diff --git a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp index b5d4ec71a3b..397014f498f 100644 --- a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp +++ b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp @@ -53,7 +53,7 @@ void Test::setup() } } -typedef std::vector<uint32_t> H; +using H = std::vector<uint32_t>; H seek(SearchIterator & s, uint32_t docIdLimit) diff --git a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_test.cpp b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_test.cpp index 01175608bc5..d0ccbaeb180 100644 --- a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_test.cpp +++ b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_test.cpp @@ -90,7 +90,7 @@ void Test::setup() } } -typedef std::vector<uint32_t> H; +using H = std::vector<uint32_t>; H seekNoReset(SearchIterator & s, uint32_t start, uint32_t docIdLimit) @@ -565,7 +565,7 @@ Test::testOptimizeAndOr(bool invert) void Test::testEndGuard(bool invert) { - typedef AndSearch T; + using T = AndSearch; TermFieldMatchData tfmd; MultiSearch::Children children; diff --git a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp index 55ca42f7369..83ffae0524c 100644 --- a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp +++ b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp @@ -18,10 +18,10 @@ using namespace search::query; using namespace search::queryeval; using namespace search::queryeval::test; -typedef search::feature_t feature_t; -typedef wand::score_t score_t; -typedef ParallelWeakAndSearch::MatchParams MatchParams; -typedef ParallelWeakAndSearch::RankParams RankParams; +using feature_t = search::feature_t; +using score_t = wand::score_t; +using MatchParams = ParallelWeakAndSearch::MatchParams; +using RankParams = ParallelWeakAndSearch::RankParams; using search::test::DocumentWeightAttributeHelper; using search::IDocumentWeightAttribute; using search::fef::TermFieldMatchData; @@ -115,8 +115,8 @@ WandTestSpec<HeapType>::WandTestSpec(uint32_t scoresToTrack, uint32_t scoresAdju template <typename HeapType> WandTestSpec<HeapType>::~WandTestSpec() {} -typedef WandTestSpec<TestHeap> WandSpecWithTestHeap; -typedef WandTestSpec<SharedWeakAndPriorityQueue> WandSpecWithRealHeap; +using WandSpecWithTestHeap = WandTestSpec<TestHeap>; +using WandSpecWithRealHeap = WandTestSpec<SharedWeakAndPriorityQueue>; FakeResult doSearch(SearchIterator &sb, const TermFieldMatchData &tfmd) diff --git a/searchlib/src/tests/queryeval/predicate/predicate_search_test.cpp b/searchlib/src/tests/queryeval/predicate/predicate_search_test.cpp index 890c73ce17c..d15175ba5d1 100644 --- a/searchlib/src/tests/queryeval/predicate/predicate_search_test.cpp +++ b/searchlib/src/tests/queryeval/predicate/predicate_search_test.cpp @@ -85,9 +85,9 @@ make_posting_lists_vector(MyPostingList (&plists)[N]) { } TermFieldMatchDataArray tfmda; -typedef std::vector<uint8_t> CV; -typedef std::vector<uint8_t> MF; -typedef std::vector<uint16_t> IR; +using CV = std::vector<uint8_t>; +using MF = std::vector<uint8_t>; +using IR = std::vector<uint16_t>; TEST("Require that the skipping is efficient") { const uint8_t min_feature[] = { 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, diff --git a/searchlib/src/tests/queryeval/queryeval.cpp b/searchlib/src/tests/queryeval/queryeval.cpp index 5d34e491708..62815f285c4 100644 --- a/searchlib/src/tests/queryeval/queryeval.cpp +++ b/searchlib/src/tests/queryeval/queryeval.cpp @@ -605,7 +605,7 @@ TEST("testDump") { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wshadow" #endif - typedef SourceBlenderSearch::Child Source; + using Source = SourceBlenderSearch::Child; #ifdef __clang__ #pragma clang diagnostic pop #endif diff --git a/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp b/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp index df01744d619..ac7dabd786b 100644 --- a/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp +++ b/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp @@ -84,7 +84,7 @@ private: Writer _writer; public: - typedef std::unique_ptr<Graph> UP; + using UP = std::unique_ptr<Graph>; Graph(const std::string &file) : _writer(file) {} void addValue(double x, double y) { _writer.fmt("%g %g\n", x, y); } }; @@ -99,7 +99,7 @@ private: static int _plots; public: - typedef std::unique_ptr<Plot> UP; + using UP = std::unique_ptr<Plot>; Plot(const std::string &title) : _name(vespalib::make_string("plot.%d", _plots++)), _graphs(0), _writer(vespalib::make_string("%s.gnuplot", _name.c_str())) { diff --git a/searchlib/src/tests/queryeval/weak_and/rise_wand.h b/searchlib/src/tests/queryeval/weak_and/rise_wand.h index 7a5e46c05ea..250993bf139 100644 --- a/searchlib/src/tests/queryeval/weak_and/rise_wand.h +++ b/searchlib/src/tests/queryeval/weak_and/rise_wand.h @@ -28,10 +28,10 @@ template <typename Scorer, typename Cmp> class RiseWand : public search::queryeval::SearchIterator { public: - typedef uint32_t docid_t; - typedef uint64_t score_t; - typedef search::queryeval::wand::Terms Terms; - typedef search::queryeval::SearchIterator *PostingStreamPtr; + using docid_t = uint32_t; + using score_t = uint64_t; + using Terms = search::queryeval::wand::Terms; + using PostingStreamPtr = search::queryeval::SearchIterator*; private: // comparator class that compares two streams. The variables a and b are @@ -125,8 +125,8 @@ public: void doUnpack(uint32_t docid) override; }; -typedef RiseWand<TermFreqScorer, std::greater_equal<uint64_t> > TermFrequencyRiseWand; -typedef RiseWand<DotProductScorer, std::greater<uint64_t> > DotProductRiseWand; +using TermFrequencyRiseWand = RiseWand<TermFreqScorer, std::greater_equal<uint64_t> >; +using DotProductRiseWand = RiseWand<DotProductScorer, std::greater<uint64_t> >; } // namespacve rise diff --git a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp index 87eec226221..fd73243b4fa 100644 --- a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp +++ b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp @@ -18,8 +18,8 @@ using namespace search::fef; using namespace search::queryeval; using namespace vespalib; -typedef ParallelWeakAndSearch::MatchParams PWMatchParams; -typedef ParallelWeakAndSearch::RankParams PWRankParams; +using PWMatchParams = ParallelWeakAndSearch::MatchParams; +using PWRankParams = ParallelWeakAndSearch::RankParams; namespace { diff --git a/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp b/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp index 828538b5e8e..e1593f7ad1d 100644 --- a/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp +++ b/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp @@ -13,7 +13,7 @@ using namespace search::fef; using namespace search::queryeval; using namespace search::queryeval::test; -typedef SearchHistory History; +using History = SearchHistory; namespace { diff --git a/searchlib/src/tests/queryeval/weak_and_heap/weak_and_heap_test.cpp b/searchlib/src/tests/queryeval/weak_and_heap/weak_and_heap_test.cpp index 42d40367b03..1304168b179 100644 --- a/searchlib/src/tests/queryeval/weak_and_heap/weak_and_heap_test.cpp +++ b/searchlib/src/tests/queryeval/weak_and_heap/weak_and_heap_test.cpp @@ -3,7 +3,7 @@ #include <vespa/searchlib/queryeval/wand/weak_and_heap.h> using namespace search::queryeval; -typedef wand::score_t score_t; +using score_t = wand::score_t; struct Scores : public std::vector<score_t> { Scores &s(score_t val) { diff --git a/searchlib/src/tests/queryeval/weak_and_scorers/weak_and_scorers_test.cpp b/searchlib/src/tests/queryeval/weak_and_scorers/weak_and_scorers_test.cpp index d94fd12e532..c5c0ea9a528 100644 --- a/searchlib/src/tests/queryeval/weak_and_scorers/weak_and_scorers_test.cpp +++ b/searchlib/src/tests/queryeval/weak_and_scorers/weak_and_scorers_test.cpp @@ -8,7 +8,7 @@ using namespace search::queryeval; using search::fef::TermFieldMatchData; using search::fef::TermFieldMatchDataPosition; -typedef wand::Term Term; +using Term = wand::Term; struct TestIterator : public SearchIterator { @@ -18,7 +18,7 @@ struct TestIterator : public SearchIterator TermFieldMatchData _tfmd; uint32_t _unpackDocId; - typedef std::unique_ptr<TestIterator> UP; + using UP = std::unique_ptr<TestIterator>; TestIterator(int32_t maxWeight, int32_t termWeight, bool useInfo) : _info(0, maxWeight), _termWeight(termWeight), |