Merge pull request #10804 from vespa-engine/balder/remove-leftover-fs4-code

Balder/remove leftover fs4 code

2 files changed, 4 insertions, 64 deletions

diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp
index 5856797831a..0cce64b458f 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp
@@ -13,13 +13,12 @@ GetDocsumArgs::GetDocsumArgs()
       _stackDump(),
       _location(),
       _timeout(30 * fastos::TimeStamp::SEC),
-      _flags(0u),
       _propertiesMap(),
       _isLocationSet(false)
 { }
 
 
-GetDocsumArgs::~GetDocsumArgs() { }
+GetDocsumArgs::~GetDocsumArgs() = default;
 
 void
 GetDocsumArgs::setTimeout(const fastos::TimeStamp & timeout)
@@ -33,35 +32,6 @@ GetDocsumArgs::getTimeout() const
     return _timeout;
 }
 
-
-void
-GetDocsumArgs::Reset()
-{
-    _ranking.clear();
-    _qflags             = 0;
-    _stackItems         = 0;
-    _timeout            = 30 * fastos::TimeStamp::SEC;
-    _flags = 0;
-    _resultClassName.clear();
-    _stackDump.clear();
-    _location.clear();
-    _isLocationSet = false;
-    {
-        PropsMap tmp;
-        std::swap(_propertiesMap, tmp);
-    }
-}
-
-
-void
-GetDocsumArgs::Copy(GetDocsumArgs *src)
-{
-    if (src == this) {
-        return;
-    }
-    *src = *this;
-}
-
 void
 GetDocsumArgs::initFromDocsumRequest(const search::engine::DocsumRequest &req)
 {
@@ -72,9 +42,7 @@ GetDocsumArgs::initFromDocsumRequest(const search::engine::DocsumRequest &req)
     _stackDump         = req.stackDump;
     _location          = req.location;
     _timeout           = req.getTimeLeft();
-    _flags             = req._flags;
     _propertiesMap     = req.propertiesMap;
-    _isLocationSet = (_location.size() > 0);
 }
 
 void
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h
index a5536a913e5..f0574e0d21c 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h
@@ -21,43 +21,24 @@ private:
     std::vector<char> _stackDump;
     vespalib::string  _location;
     fastos::TimeStamp _timeout;
-    uint32_t          _flags;
     PropsMap          _propertiesMap;
-
-    bool _isLocationSet;
-
 public:
     GetDocsumArgs();
     ~GetDocsumArgs();
 
-    void Reset();
-    void Copy(GetDocsumArgs *src);
     void initFromDocsumRequest(const search::engine::DocsumRequest &req);
 
     void SetRankProfile(const vespalib::string &ranking) { _ranking = ranking; }
     void SetQueryFlags(uint32_t qflags)         { _qflags = qflags; }
-    void SetResultClassName(uint32_t len, const char *name) {
-        _resultClassName.assign(name, len);
-    }
     void setResultClassName(vespalib::stringref name) { _resultClassName = name; }
-    void SetStackDump(uint32_t stackItems,
-                      uint32_t stackDumpLen, const char *stackDump);
-    void SetLocation(uint32_t locationLen, const char *location) {
-        if ((_isLocationSet = (location != NULL))) {
-            _location.assign(location, locationLen);
-        }
-    }
-
-    void
-    setFlags(uint32_t flags)
-    {
-        _flags = flags;
+    void SetStackDump(uint32_t stackItems, uint32_t stackDumpLen, const char *stackDump);
+    void setLocation(vespalib::stringref location) {
+        _location = location;
     }
 
     void setTimeout(const fastos::TimeStamp & timeout);
     fastos::TimeStamp getTimeout() const;
 
-    const vespalib::string & getRankProfile()          const { return _ranking; }
     const vespalib::string & getResultClassName()      const { return _resultClassName; }
     const vespalib::string & getLocation()             const { return _location; }
     const vespalib::stringref getStackDump()           const {
@@ -65,18 +46,9 @@ public:
     }
 
     uint32_t GetQueryFlags()                           const { return _qflags;       }
-    uint32_t GetStackItems()                           const { return _stackItems;   }
-    uint32_t GetLocationLen()                          const { return _location.size(); }
-    uint32_t getFlags()                                const { return _flags; }
 
     const PropsMap &propertiesMap() const { return _propertiesMap; }
 
-    const search::fef::Properties &rankProperties() const {
-        return _propertiesMap.rankProperties();
-    }
-    const search::fef::Properties &featureOverrides() const {
-        return _propertiesMap.featureOverrides();
-    }
     const search::fef::Properties &highlightTerms() const {
         return _propertiesMap.highlightTerms();
     }