Merge pull request #27979 from vespa-engine/balder/ranking-has-side-effects

GC unused code.

2 files changed, 0 insertions, 18 deletions

diff --git a/searchlib/src/vespa/searchlib/fef/ranksetup.cpp b/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
index 4c676d5ba5c..823e39199df 100644
--- a/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
+++ b/searchlib/src/vespa/searchlib/fef/ranksetup.cpp
@@ -66,7 +66,6 @@ RankSetup::RankSetup(const BlueprintFactory &factory, const IIndexEnvironment &i
       _diversityCutoffStrategy("loose"),
       _softTimeoutEnabled(false),
       _softTimeoutTailCost(0.1),
-      _softTimeoutFactor(0.5),
       _global_filter_lower_limit(0.0),
       _global_filter_upper_limit(1.0),
       _mutateOnMatch(),
@@ -120,7 +119,6 @@ RankSetup::configure()
     setRankScoreDropLimit(hitcollector::RankScoreDropLimit::lookup(_indexEnv.getProperties()));
     setSoftTimeoutEnabled(softtimeout::Enabled::lookup(_indexEnv.getProperties()));
     setSoftTimeoutTailCost(softtimeout::TailCost::lookup(_indexEnv.getProperties()));
-    setSoftTimeoutFactor(softtimeout::Factor::lookup(_indexEnv.getProperties()));
     set_global_filter_lower_limit(matching::GlobalFilterLowerLimit::lookup(_indexEnv.getProperties()));
     set_global_filter_upper_limit(matching::GlobalFilterUpperLimit::lookup(_indexEnv.getProperties()));
     _mutateOnMatch._attribute = mutate::on_match::Attribute::lookup(_indexEnv.getProperties());
diff --git a/searchlib/src/vespa/searchlib/fef/ranksetup.h b/searchlib/src/vespa/searchlib/fef/ranksetup.h
index 783c1506ff0..832b86d042a 100644
--- a/searchlib/src/vespa/searchlib/fef/ranksetup.h
+++ b/searchlib/src/vespa/searchlib/fef/ranksetup.h
@@ -74,7 +74,6 @@ private:
     vespalib::string         _diversityCutoffStrategy;
     bool                     _softTimeoutEnabled;
     double                   _softTimeoutTailCost;
-    double                   _softTimeoutFactor;
     double                   _global_filter_lower_limit;
     double                   _global_filter_upper_limit;
     MutateOperation          _mutateOnMatch;
@@ -211,11 +210,6 @@ public:
      **/
     uint32_t getArraySize() const { return _arraySize; }
 
-    /** whether match phase should do graceful degradation */
-    bool hasMatchPhaseDegradation() const {
-        return (_degradationAttribute.size() > 0);
-    }
-
     /** get name of attribute to use for graceful degradation in match phase */
     vespalib::string getDegradationAttribute() const {
         return _degradationAttribute;
@@ -390,20 +384,10 @@ public:
      **/
     void setIgnoreDefaultRankFeatures(bool flag) { _ignoreDefaultRankFeatures = flag; }
 
-    /**
-     * Get the flag indicating whether we should ignore the default
-     * rank features (the ones specified by the plugins themselves)
-     *
-     * @return true means ignore default rank features
-     **/
-    bool getIgnoreDefaultRankFeatures() { return _ignoreDefaultRankFeatures; }
-
     void setSoftTimeoutEnabled(bool v) { _softTimeoutEnabled = v; }
     bool getSoftTimeoutEnabled() const { return _softTimeoutEnabled; }
     void setSoftTimeoutTailCost(double v) { _softTimeoutTailCost = v; }
     double getSoftTimeoutTailCost() const { return _softTimeoutTailCost; }
-    void setSoftTimeoutFactor(double v) { _softTimeoutFactor = v; }
-    double getSoftTimeoutFactor() const { return _softTimeoutFactor; }
 
     void set_global_filter_lower_limit(double v) { _global_filter_lower_limit = v; }
     double get_global_filter_lower_limit() const { return _global_filter_lower_limit; }