From a5047d4feb019839fb6cb812ff97d177c3c52fa0 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 12 Jan 2024 09:59:27 +0000 Subject: Just use normalize_mode directly from searcher. --- streamingvisitors/src/tests/searcher/searcher_test.cpp | 4 ++-- .../src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'streamingvisitors') diff --git a/streamingvisitors/src/tests/searcher/searcher_test.cpp b/streamingvisitors/src/tests/searcher/searcher_test.cpp index 6ed9ee9dace..7f89071868a 100644 --- a/streamingvisitors/src/tests/searcher/searcher_test.cpp +++ b/streamingvisitors/src/tests/searcher/searcher_test.cpp @@ -313,7 +313,7 @@ assertNumeric(FieldSearcher & fs, const StringList & query, const FieldValue & f std::vector performSearch(FieldSearcher & fs, const StringList & query, const FieldValue & fv) { - Query q(query, fs.exact() ? Normalizing::LOWERCASE : Normalizing::LOWERCASE_AND_FOLD); + Query q(query, fs.normalize_mode()); // prepare field searcher test::MockFieldSearcherEnv env; @@ -347,7 +347,7 @@ assertSearch(FieldSearcher & fs, const StringList & query, const FieldValue & fv bool assertFieldInfo(FieldSearcher & fs, const StringList & query, - const FieldValue & fv, const FieldInfoList & exp) + const FieldValue & fv, const FieldInfoList & exp) { auto qtv = performSearch(fs, query, fv); if (!EXPECT_EQUAL(qtv.size(), exp.size())) return false; diff --git a/streamingvisitors/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h index 48480fac684..9f590156a96 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h +++ b/streamingvisitors/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h @@ -3,8 +3,7 @@ #include "utf8stringfieldsearcherbase.h" -namespace vsm -{ +namespace vsm { /** * This class does suffix utf8 searches. @@ -21,4 +20,3 @@ public: }; } - -- cgit v1.2.3