summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2022-02-14 14:56:00 +0100
committerTor Egge <Tor.Egge@online.no>2022-02-14 14:56:00 +0100
commitd0372772f0889e9193a4d22a75da391ee2147ec1 (patch)
tree7de5ece3c27dfe74706315bd7ab7a5dbc520ba31
parent17c9131293f781ca68a77013f1d425a3453bfdf2 (diff)
Remove unused member variable.
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp9
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h5
3 files changed, 7 insertions, 9 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp
index 380d29ef4b8..f55a13a9604 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp
@@ -72,7 +72,7 @@ DynamicDocsumConfig::createFieldWriter(const string & fieldName, const string &
} else if (overrideName == "absdist") {
if (getEnvironment()) {
IAttributeManager *am = getEnvironment()->getAttributeManager();
- fieldWriter = AbsDistanceDFW::create(argument.c_str(), am, resultConfig.useV8geoPositions());
+ fieldWriter = AbsDistanceDFW::create(argument.c_str(), am);
rc = fieldWriter.get();
}
} else if (overrideName == "positions") {
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
index c46988de0d2..1a2cf24a18d 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
@@ -61,9 +61,8 @@ LocationAttrDFW::getAllLocations(GetDocsumsState *state)
return retval;
}
-AbsDistanceDFW::AbsDistanceDFW(const vespalib::string & attrName, bool useV8geoPositions) :
- LocationAttrDFW(attrName),
- _useV8geoPositions(useV8geoPositions)
+AbsDistanceDFW::AbsDistanceDFW(const vespalib::string & attrName)
+ : LocationAttrDFW(attrName)
{ }
double
@@ -300,7 +299,7 @@ PositionsDFW::UP PositionsDFW::create(const char *attribute_name, IAttributeMana
return std::make_unique<PositionsDFW>(attribute_name, useV8geoPositions);
}
-AbsDistanceDFW::UP AbsDistanceDFW::create(const char *attribute_name, IAttributeManager *attribute_manager, bool useV8geoPositions) {
+AbsDistanceDFW::UP AbsDistanceDFW::create(const char *attribute_name, IAttributeManager *attribute_manager) {
AbsDistanceDFW::UP ret;
if (attribute_manager != nullptr) {
if (!attribute_name) {
@@ -318,7 +317,7 @@ AbsDistanceDFW::UP AbsDistanceDFW::create(const char *attribute_name, IAttribute
return ret;
}
}
- return std::make_unique<AbsDistanceDFW>(attribute_name, useV8geoPositions);
+ return std::make_unique<AbsDistanceDFW>(attribute_name);
}
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h
index 727f6393e2e..7f6bfe22816 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h
@@ -36,19 +36,18 @@ public:
class AbsDistanceDFW : public LocationAttrDFW
{
private:
- bool _useV8geoPositions;
double kmMinDistance(uint32_t docid, GetDocsumsState *state,
const std::vector<const GeoLoc *> &locations);
uint64_t findMinDistance(uint32_t docid, GetDocsumsState *state,
const std::vector<const GeoLoc *> &locations);
public:
- AbsDistanceDFW(const vespalib::string & attrName, bool useV8geoPositions);
+ AbsDistanceDFW(const vespalib::string & attrName);
bool IsGenerated() const override { return true; }
void insertField(uint32_t docid, GetDocsumsState *state,
ResType type, vespalib::slime::Inserter &target) override;
- static UP create(const char *attribute_name, IAttributeManager *index_man, bool useV8geoPositions);
+ static UP create(const char *attribute_name, IAttributeManager *index_man);
};