GC unused code

9 files changed, 19 insertions, 239 deletions

diff --git a/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt b/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt
index 8d79f2fac3c..9009f0bcbc7 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt
+++ b/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt
@@ -17,7 +17,6 @@ vespa_add_library(searchsummary_docsummary OBJECT
     summaryfeaturesdfw.cpp
     juniperproperties.cpp
     textextractordfw.cpp
-    docsumformat.cpp
     geoposdfw.cpp
     tokenizer.cpp
     positionsdfw.cpp
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp
index 131b3ce1e2e..90053406d9e 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp
@@ -2,7 +2,6 @@
 
 #include "docsumfieldwriter.h"
 #include "idocsumenvironment.h"
-#include "docsumformat.h"
 #include "docsumstate.h"
 #include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/searchlib/common/documentlocations.h>
@@ -12,8 +11,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.docsumfieldwriter");
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 using search::attribute::IAttributeContext;
 using search::attribute::IAttributeVector;
@@ -159,7 +157,4 @@ CopyDFW::insertField(uint32_t /*docid*/,
     }
 }
 
-//--------------------------------------------------------------------------
-
-}  // namespace docsummary
-}  // namespace search
+}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.cpp
deleted file mode 100644
index 89934ce8aec..00000000000
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "docsumformat.h"
-#include <cassert>
-
-namespace search::docsummary {
-
-size_t
-DocsumFormat::addByte(search::RawBuf &target, uint8_t value)
-
-{
-    target.append(&value, sizeof(value));
-    return sizeof(value);
-}
-
-size_t
-DocsumFormat::addShort(search::RawBuf &target, uint16_t value)
-{
-    target.append(&value, sizeof(value));
-    return sizeof(value);
-}
-
-size_t
-DocsumFormat::addInt32(search::RawBuf &target, uint32_t value)
-{
-    target.append(&value, sizeof(value));
-    return sizeof(value);
-}
-
-size_t
-DocsumFormat::addFloat(search::RawBuf &target, float value)
-{
-    target.append(&value, sizeof(value));
-    return sizeof(value);
-}
-
-size_t
-DocsumFormat::addDouble(search::RawBuf &target, double value)
-{
-    target.append(&value, sizeof(value));
-    return sizeof(value);
-}
-
-size_t
-DocsumFormat::addInt64(search::RawBuf &target, uint64_t value)
-{
-    target.append(&value, sizeof(value));
-    return sizeof(value);
-}
-
-size_t
-DocsumFormat::addShortData(search::RawBuf &target, const char *buf, uint32_t buflen)
-{
-    uint16_t len = (buflen > 0xffff ? 0xffff : buflen);
-    target.append(&len, sizeof(len));
-    target.append(buf, len);
-
-    return sizeof(len) + len;
-}
-
-size_t
-DocsumFormat::addLongData(search::RawBuf &target, const char *buf, uint32_t buflen)
-{
-    target.append(&buflen, sizeof(buflen));
-    target.append(buf, buflen);
-
-    return sizeof(buflen) + buflen;
-}
-
-size_t
-DocsumFormat::addEmpty(ResType type, search::RawBuf &target)
-{
-    switch (type) {
-    case RES_BYTE:
-        return addByte(target, 0);
-    case RES_SHORT:
-        return addShort(target, 0);
-    case RES_INT:
-        return addInt32(target, 0);
-    case RES_INT64:
-        return addInt64(target, 0L);
-    case RES_FLOAT:
-        return addFloat(target, 0.0f);
-    case RES_DOUBLE:
-        return addDouble(target, 0.0);
-    case RES_STRING:
-    case RES_DATA:
-        return addShortData(target, "", 0);
-    case RES_LONG_STRING:
-    case RES_LONG_DATA:
-    case RES_XMLSTRING:
-    case RES_JSONSTRING:
-    case RES_TENSOR:
-    case RES_FEATUREDATA:
-        return addLongData(target, "", 0);
-    }
-    assert(type <= RES_FEATUREDATA);
-    return 0;
-}
-
-}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.h
deleted file mode 100644
index 8aa12b4beb2..00000000000
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumformat.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-// Copyright (C) 1998-2003 Fast Search & Transfer ASA
-// Copyright (C) 2003 Overture Services Norway AS
-
-#pragma once
-
-#include <vespa/searchlib/util/rawbuf.h>
-#include <vespa/searchsummary/docsummary/resultclass.h>
-
-namespace search {
-namespace docsummary {
-
-class DocsumFormat
-{
-public:
-    static size_t addByte(search::RawBuf &target, uint8_t value);
-    static size_t addShort(search::RawBuf &target, uint16_t value);
-    static size_t addInt32(search::RawBuf &target, uint32_t value);
-    static size_t addFloat(search::RawBuf &target, float value);
-    static size_t addDouble(search::RawBuf &target, double value);
-    static size_t addInt64(search::RawBuf &target, uint64_t value);
-    static size_t addShortData(search::RawBuf &target, const char *buf, uint32_t buflen);
-    static size_t addLongData(search::RawBuf &target, const char *buf, uint32_t buflen);
-
-    static size_t addEmpty(ResType type, search::RawBuf &target);
-
-    class Appender {
-    private:
-        search::RawBuf &_target;
-    public:
-        Appender(search::RawBuf &target) : _target(target) {}
-
-        size_t addByte(uint8_t value) {
-            return DocsumFormat::addByte(_target, value);
-        }
-        size_t addShort(uint16_t value) {
-            return DocsumFormat::addShort(_target, value);
-        }
-        size_t addInt32(uint32_t value) {
-            return DocsumFormat::addInt32(_target, value);
-        }
-        size_t addFloat(float value) {
-            return DocsumFormat::addFloat(_target, value);
-        }
-        size_t addDouble(double value) {
-            return DocsumFormat::addDouble(_target, value);
-        }
-        size_t addInt64(uint64_t value) {
-            return DocsumFormat::addInt64(_target, value);
-        }
-        size_t addShortData(const char *buf, uint32_t buflen) {
-            return DocsumFormat::addShortData(_target, buf, buflen);
-        }
-        size_t addLongData(const char *buf, uint32_t buflen) {
-            return DocsumFormat::addLongData(_target, buf, buflen);
-        }
-         
-        size_t addEmpty(ResType type) {
-            return DocsumFormat::addEmpty(type, _target);
-        }
-    };
-
-};
-
-}
-}
-
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
index 2558418a229..5798636b1a8 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
@@ -1,21 +1,18 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "docsumwriter.h"
-#include "docsumformat.h"
 #include "docsumstate.h"
 #include <vespa/searchlib/common/transport.h>
 #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h>
 #include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/vespalib/data/slime/slime.h>
-#include <vespa/fastlib/text/normwordfolder.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.docsumwriter");
 
 using namespace vespalib::slime::convenience;
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 uint32_t
 IDocsumWriter::slime2RawBuf(const Slime & slime, RawBuf & buf)
@@ -316,6 +313,4 @@ DynamicDocsumWriter::WriteDocsum(uint32_t docid,
     return slime2RawBuf(slime, *target);
 }
 
-
-} // namespace search::docsummary
-} // namespace search
+}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
index 5d214d02455..89d7a80255e 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
@@ -1,15 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "rankfeaturesdfw.h"
-#include "docsumformat.h"
 #include "docsumstate.h"
 #include <vespa/searchlib/common/feature.h>
 #include <vespa/searchlib/common/featureset.h>
 #include <vespa/searchlib/common/packets.h>
 #include <vespa/vespalib/data/slime/cursor.h>
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 RankFeaturesDFW::RankFeaturesDFW() :
     _env(NULL)
@@ -24,11 +22,8 @@ RankFeaturesDFW::init(IDocsumEnvironment * env)
 }
 
 void
-RankFeaturesDFW::insertField(uint32_t docid,
-                             GeneralResult *,
-                             GetDocsumsState *state,
-                             ResType type,
-                             vespalib::slime::Inserter &target)
+RankFeaturesDFW::insertField(uint32_t docid, GeneralResult *, GetDocsumsState *state,
+                             ResType type, vespalib::slime::Inserter &target)
 {
     if (state->_rankFeatures.get() == NULL) {
         state->_callback.FillRankFeatures(state, _env);
@@ -67,4 +62,3 @@ RankFeaturesDFW::insertField(uint32_t docid,
 }
 
 }
-}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h
index fdb10f1b9eb..04ee14c79ca 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h
@@ -2,12 +2,9 @@
 
 #pragma once
 
-#include <map>
-#include <string>
-#include <vespa/searchsummary/docsummary/summaryfeaturesdfw.h>
+#include "summaryfeaturesdfw.h"
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 class RankFeaturesDFW : public FeaturesDFW
 {
@@ -19,16 +16,11 @@ private:
 
 public:
     RankFeaturesDFW();
-    virtual ~RankFeaturesDFW();
+    ~RankFeaturesDFW();
     void init(IDocsumEnvironment * env);
-    virtual bool IsGenerated() const override { return true; }
-    virtual void insertField(uint32_t docid,
-                             GeneralResult *gres,
-                             GetDocsumsState *state,
-                             ResType type,
-                             vespalib::slime::Inserter &target) override;
+    bool IsGenerated() const override { return true; }
+    void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state,
+                     ResType type, vespalib::slime::Inserter &target) override;
 };
 
 }
-}
-
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
index b4204ed8bb2..b91365c9f58 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
@@ -1,6 +1,5 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "docsumformat.h"
 #include "summaryfeaturesdfw.h"
 #include "docsumstate.h"
 #include <vespa/searchlib/common/packets.h>
@@ -31,11 +30,8 @@ static vespalib::string _G_cached("vespa.summaryFeatures.cached");
 static vespalib::Memory _M_cached("vespa.summaryFeatures.cached");
 
 void
-SummaryFeaturesDFW::insertField(uint32_t docid,
-                                GeneralResult *,
-                                GetDocsumsState *state,
-                                ResType type,
-                                vespalib::slime::Inserter &target)
+SummaryFeaturesDFW::insertField(uint32_t docid, GeneralResult *, GetDocsumsState *state,
+                                ResType type, vespalib::slime::Inserter &target)
 {
     if ( ! state->_summaryFeatures) {
         state->_callback.FillSummaryFeatures(state, _env);
@@ -94,22 +90,4 @@ void FeaturesDFW::featureDump(vespalib::JSONStringer & json, const vespalib::str
     }
 }
 
-
-uint32_t
-SummaryFeaturesDFW::writeString(const vespalib::stringref & str, ResType type, search::RawBuf * target)
-{
-    switch (type) {
-    case RES_STRING:
-    case RES_DATA:
-        return DocsumFormat::addShortData(*target, str.c_str(), str.size());
-    case RES_FEATUREDATA:
-    case RES_LONG_STRING:
-    case RES_LONG_DATA:
-        return DocsumFormat::addLongData(*target, str.c_str(), str.size());
-    default:
-        LOG(error, "unhandled type %u in writeString()", type);
-        return DocsumFormat::addEmpty(type, *target);
-    }
-}
-
 }
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
index 7f68abc6451..c406a9f9dee 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
@@ -26,16 +26,11 @@ private:
 
 public:
     SummaryFeaturesDFW();
-    virtual ~SummaryFeaturesDFW();
+    ~SummaryFeaturesDFW();
     void init(IDocsumEnvironment * env);
-    virtual bool IsGenerated() const override { return true; }
-    virtual void insertField(uint32_t docid,
-                             GeneralResult *gres,
-                             GetDocsumsState *state,
-                             ResType type,
-                             vespalib::slime::Inserter &target) override;
-
-    static uint32_t writeString(const vespalib::stringref & str, ResType type, search::RawBuf * target);
+    bool IsGenerated() const override { return true; }
+    void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state,
+                     ResType type, vespalib::slime::Inserter &target) override;
 };
 
 }