diff options
author | Tor Egge <Tor.Egge@online.no> | 2023-04-25 11:09:40 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2023-04-25 11:09:40 +0200 |
commit | fbe9c1f4dddb9f7ca25964691c669f037d791df0 (patch) | |
tree | 1c613add846918a04a471164493779b0e91a5ffa /searchsummary/src | |
parent | f3ac0e360e47778eb51e3619825f09e52d3b6082 (diff) |
Move search::FeatureValues to vespalib::FeatureValues in preparation for
extending vdslib::SearchResult.
Diffstat (limited to 'searchsummary/src')
3 files changed, 5 insertions, 3 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h index 2c644a243c8..a765208cb9e 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h @@ -3,9 +3,9 @@ #pragma once #include "getdocsumargs.h" -#include <vespa/searchlib/common/featureset.h> #include <vespa/searchlib/common/geo_location_spec.h> #include <vespa/vespalib/stllike/hash_map.h> +#include <vespa/vespalib/util/featureset.h> #include <vespa/vespalib/util/stash.h> namespace juniper { @@ -48,6 +48,7 @@ protected: class GetDocsumsState { public: + using FeatureSet = vespalib::FeatureSet; const search::attribute::IAttributeVector * getAttribute(size_t index) const { return _attributes[index]; } GetDocsumArgs _args; // from getdocsums request diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp index bad1ad5a6f3..c5e823bf9f4 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp @@ -5,6 +5,8 @@ #include <vespa/vespalib/data/slime/cursor.h> #include <vespa/vespalib/data/slime/inserter.h> +using vespalib::FeatureSet; + namespace search::docsummary { RankFeaturesDFW::RankFeaturesDFW() = default; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp index a680b01d887..a1b2d6b3af6 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp @@ -5,8 +5,7 @@ #include <vespa/vespalib/data/slime/cursor.h> #include <vespa/vespalib/data/slime/inserter.h> -#include <vespa/log/log.h> -LOG_SETUP(".searchlib.docsummary.summaryfeaturesdfw"); +using vespalib::FeatureSet; namespace search::docsummary { |