Merge pull request #29776 from vespa-engine/revert-29775-balder/only-rewrite-numeric-terms-for-text-fieldsv8.281.22

Revert "Balder/only rewrite numeric terms for text fields"

1 files changed, 2 insertions, 13 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h
index 36176f70d1d..8c1c3771917 100644
--- a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h
+++ b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h
@@ -17,26 +17,15 @@ private:
     search::fef::SimpleTermData   _termData;
 public:
     QueryTermData * clone() const override { return new QueryTermData(); }
-    search::fef::SimpleTermData &getTermData() noexcept { return _termData; }
-};
-
-class SearchMethodInfo {
-public:
-    virtual ~SearchMethodInfo() = default;
-    virtual bool is_text_matching(vespalib::stringref index) const noexcept = 0;
+    search::fef::SimpleTermData &getTermData() { return _termData; }
 };
 
 class QueryTermDataFactory final : public search::streaming::QueryNodeResultFactory {
 public:
-    QueryTermDataFactory(const SearchMethodInfo * searchMethodInfo) noexcept : _searchMethodInfo(searchMethodInfo) {}
     std::unique_ptr<search::streaming::QueryNodeResultBase> create() const override {
         return std::make_unique<QueryTermData>();
     }
-    bool getRewriteFloatTerms(vespalib::stringref index ) const noexcept override {
-        return _searchMethodInfo && _searchMethodInfo->is_text_matching(index);
-    }
-private:
-    const SearchMethodInfo * _searchMethodInfo;
+    bool getRewriteFloatTerms() const override { return true; }
 };