Merge pull request #26842 from vespa-engine/toregge/move-featurevalues-to-vespalib

Move search::FeatureValues to vespalib::FeatureValues in preparation for

7 files changed, 15 insertions, 15 deletions

diff --git a/streamingvisitors/src/tests/hitcollector/hitcollector_test.cpp b/streamingvisitors/src/tests/hitcollector/hitcollector_test.cpp
index 6950c90f097..791ec01162f 100644
--- a/streamingvisitors/src/tests/hitcollector/hitcollector_test.cpp
+++ b/streamingvisitors/src/tests/hitcollector/hitcollector_test.cpp
@@ -285,7 +285,7 @@ HitCollectorTest::testFeatureSet()
     FeatureResolver resolver(rankProgram.get_resolver());
     search::StringStringMap renames;
     renames["bar"] = "qux";
-    search::FeatureSet::SP sf = hc.getFeatureSet(rankProgram, resolver, renames);
+    vespalib::FeatureSet::SP sf = hc.getFeatureSet(rankProgram, resolver, renames);
 
     EXPECT_EQUAL(sf->getNames().size(), 3u);
     EXPECT_EQUAL(sf->getNames()[0], "foo");
diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
index 10e6c6aa68a..7b4e3cb0208 100644
--- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
@@ -10,8 +10,8 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".searchvisitor.hitcollector");
 
-using search::FeatureSet;
 using search::fef::MatchData;
+using vespalib::FeatureSet;
 using vdslib::SearchResult;
 
 namespace streaming {
diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.h b/streamingvisitors/src/vespa/searchvisitor/hitcollector.h
index 6ce7459adfd..2918f815811 100644
--- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.h
+++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.h
@@ -2,13 +2,13 @@
 
 #pragma once
 
-#include <vespa/searchlib/common/featureset.h>
 #include <vespa/searchlib/common/stringmap.h>
 #include <vespa/searchlib/fef/matchdata.h>
 #include <vespa/vdslib/container/searchresult.h>
 #include <vespa/vsm/common/docsum.h>
 #include <vespa/vsm/common/storagedocument.h>
 #include <vespa/vespalib/stllike/string.h>
+#include <vespa/vespalib/util/featureset.h>
 
 namespace search { namespace fef { class FeatureResolver; } }
 
@@ -132,9 +132,9 @@ public:
      * @param rankProgram the rank program used to calculate all features.
      * @param resolver   feature resolver, gives feature names and values
      **/
-    search::FeatureSet::SP getFeatureSet(IRankProgram &rankProgram,
-                                         const search::fef::FeatureResolver &resolver,
-                                         const search::StringStringMap &feature_rename_map);
+    vespalib::FeatureSet::SP getFeatureSet(IRankProgram &rankProgram,
+                                           const search::fef::FeatureResolver &resolver,
+                                           const search::StringStringMap &feature_rename_map);
 
 };
 
diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
index ba97a708cc5..01b21edc1ba 100644
--- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
@@ -10,7 +10,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".searchvisitor.rankprocessor");
 
-using search::FeatureSet;
+using vespalib::FeatureSet;
 using search::fef::FeatureHandle;
 using search::fef::ITermData;
 using search::fef::ITermFieldData;
diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h
index c541f62646e..c74a2d1e3ee 100644
--- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h
+++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h
@@ -65,7 +65,7 @@ public:
     void unpackMatchData(uint32_t docId);
     static void unpack_match_data(uint32_t docid, search::fef::MatchData& matchData, QueryWrapper& query);
     void runRankProgram(uint32_t docId);
-    search::FeatureSet::SP calculateFeatureSet();
+    vespalib::FeatureSet::SP calculateFeatureSet();
     void fillSearchResult(vdslib::SearchResult & searchResult);
     const search::fef::MatchData &getMatchData() const { return *_match_data; }
     void setRankScore(double score) { _score = score; } 
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 7dc0c05cfaa..8980bc1f54d 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -664,14 +664,14 @@ SearchVisitor::RankController::onCompletedVisiting(vsm::GetDocsumsStateCallback
         // calculate summary features and set them on the callback object
         if (!_rankSetup->getSummaryFeatures().empty()) {
             LOG(debug, "Calculate summary features");
-            search::FeatureSet::SP sf = _rankProcessor->calculateFeatureSet();
+            vespalib::FeatureSet::SP sf = _rankProcessor->calculateFeatureSet();
             docsumsStateCallback.setSummaryFeatures(sf);
         }
 
         // calculate rank features and set them on the callback object
         if (_dumpFeatures) {
             LOG(debug, "Calculate rank features");
-            search::FeatureSet::SP rf = _dumpProcessor->calculateFeatureSet();
+            vespalib::FeatureSet::SP rf = _dumpProcessor->calculateFeatureSet();
             docsumsStateCallback.setRankFeatures(rf);
         }
     }
diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
index 77ed9573e54..ba87ccfef05 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
@@ -5,11 +5,11 @@
 #include <vespa/searchlib/query/base.h>
 #include <vespa/vsm/config/vsm-cfif.h>
 #include <vespa/config-summary.h>
-#include <vespa/searchlib/common/featureset.h>
 #include <vespa/searchsummary/docsummary/docsumwriter.h>
 #include <vespa/searchsummary/docsummary/docsumstate.h>
 #include <vespa/searchsummary/docsummary/idocsumenvironment.h>
 #include <vespa/juniper/rpinterface.h>
+#include <vespa/vespalib/util/featureset.h>
 
 using search::docsummary::ResultConfig;
 using search::docsummary::ResultClass;
@@ -28,8 +28,8 @@ class IMatchingElementsFiller;
 class GetDocsumsStateCallback : public search::docsummary::GetDocsumsStateCallback
 {
 private:
-    search::FeatureSet::SP _summaryFeatures;
-    search::FeatureSet::SP _rankFeatures;
+    vespalib::FeatureSet::SP _summaryFeatures;
+    vespalib::FeatureSet::SP _rankFeatures;
     std::unique_ptr<IMatchingElementsFiller> _matching_elements_filler;
 
 public:
@@ -37,8 +37,8 @@ public:
     void fillSummaryFeatures(GetDocsumsState& state) override;
     void fillRankFeatures(GetDocsumsState& state) override;
     std::unique_ptr<search::MatchingElements> fill_matching_elements(const search::MatchingElementsFields& fields) override;
-    void setSummaryFeatures(const search::FeatureSet::SP & sf) { _summaryFeatures = sf; }
-    void setRankFeatures(const search::FeatureSet::SP & rf) { _rankFeatures = rf; }
+    void setSummaryFeatures(const vespalib::FeatureSet::SP & sf) { _summaryFeatures = sf; }
+    void setRankFeatures(const vespalib::FeatureSet::SP & rf) { _rankFeatures = rf; }
     void set_matching_elements_filler(std::unique_ptr<IMatchingElementsFiller> matching_elements_filler);
     ~GetDocsumsStateCallback() override;
 };