From a71430109aa0310c1f97a0da68f8108cb6a101c4 Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Tue, 16 Jan 2024 13:16:29 +0000 Subject: Propagate normalizing mode and max field length to new searcher Needed to avoid default normalizing mode/max field length being used in the reconfigured searcher instance. --- .../searchlib/query/streaming/querynoderesultbase.cpp | 18 ++++++++++++++++++ .../searchlib/query/streaming/querynoderesultbase.h | 3 +++ 2 files changed, 21 insertions(+) (limited to 'searchlib/src') diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp index c58ec55de9f..d72a3371846 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp +++ b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp @@ -3,4 +3,22 @@ namespace search::streaming { +namespace { + +const char* to_str(Normalizing norm) noexcept { + switch (norm) { + case Normalizing::NONE: return "NONE"; + case Normalizing::LOWERCASE: return "LOWERCASE"; + case Normalizing::LOWERCASE_AND_FOLD: return "LOWERCASE_AND_FOLD"; + } + abort(); +} + +} + +std::ostream& operator<<(std::ostream& os, Normalizing n) { + os << to_str(n); + return os; +} + } diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h index 74f872ad187..83fb27794a3 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h +++ b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h @@ -2,6 +2,7 @@ #pragma once #include +#include #include namespace search::streaming { @@ -24,6 +25,8 @@ enum class Normalizing { LOWERCASE_AND_FOLD }; +std::ostream& operator<<(std::ostream&, Normalizing); + class QueryNodeResultFactory { public: virtual ~QueryNodeResultFactory() = default; -- cgit v1.2.3