Merge pull request #24167 from vespa-engine/balder/gc-void-code

GC unused files and code.

searchlib/src/vespa/searchlib/aggregation/fs4hit.h

@@ -4,7 +4,6 @@
 #include "hit.h"
 #include "aggregationresult.h"
 #include <vespa/document/base/globalid.h>
-#include <vespa/searchlib/common/docstamp.h>
 
 namespace search::aggregation {
 

searchlib/src/vespa/searchlib/common/converters.h

@@ -5,8 +5,7 @@
 #include <vespa/searchcommon/common/iblobconverter.h>
 #include <vespa/vespalib/stllike/string.h>
 
-namespace search {
-namespace common {
+namespace search::common {
 
 class PassThroughConverter : public BlobConverter
 {
@@ -27,10 +26,8 @@ class ConverterFactory {
 protected:
     using stringref = vespalib::stringref;
 public:
-    virtual ~ConverterFactory() { }
+    virtual ~ConverterFactory() = default;
     virtual BlobConverter::UP create(stringref local, stringref strength) const = 0;
 };
 
 }
-}
-

searchlib/src/vespa/searchlib/common/documentlocations.cpp

@@ -4,19 +4,17 @@
 #include <vespa/searchlib/attribute/attributeguard.h>
 #include <vespa/searchlib/attribute/attributevector.h>
 
-namespace search {
-namespace common {
+namespace search::common {
 
 DocumentLocations::DocumentLocations()
-    : _vec(NULL)
+    : _vec(nullptr)
 {
 }
 
-DocumentLocations::~DocumentLocations() { }
+DocumentLocations::~DocumentLocations() = default;
 
 DocumentLocations::DocumentLocations(DocumentLocations &&) = default;
 DocumentLocations & DocumentLocations::operator = (DocumentLocations &&) = default;
 
 
-}  // namespace common
-}  // namespace search
+}

searchlib/src/vespa/searchlib/common/documentlocations.h

@@ -4,12 +4,10 @@
 
 #include <memory>
 
-namespace search {
+namespace search { class AttributeGuard; }
+namespace search::attribute { class IAttributeVector; }
 
-namespace attribute { class IAttributeVector; }
-class AttributeGuard;
-
-namespace common {
+namespace search::common {
 
 
 /**
@@ -37,7 +35,4 @@ class DocumentLocations
     }
 };
 
-
 }
-}
-

searchlib/src/vespa/searchlib/common/documentsummary.cpp

@@ -2,7 +2,6 @@
 
 #include "documentsummary.h"
 #include <vespa/fastlib/io/bufferedfile.h>
-#include <vespa/searchlib/util/filekit.h>
 #include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/error.h>
 
@@ -11,8 +10,7 @@ LOG_SETUP(".searchlib.docsummary.documentsummary");
 
 using vespalib::getLastErrorString;
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 bool
 DocumentSummary::readDocIdLimit(const vespalib::string &dir, uint32_t &count)
@@ -63,4 +61,3 @@ DocumentSummary::writeDocIdLimit(const vespalib::string &dir, uint32_t count)
 }
 
 }
-}

searchlib/src/vespa/searchlib/common/documentsummary.h

@@ -4,19 +4,14 @@
 
 #include <vespa/vespalib/stllike/string.h>
 
-namespace search {
-namespace docsummary {
+namespace search::docsummary {
 
 class DocumentSummary
 {
 public:
-    static bool
-    readDocIdLimit(const vespalib::string &dir, uint32_t &docIdLimit);
-
-    static bool
-    writeDocIdLimit(const vespalib::string &dir, uint32_t docIdLimit);
+    static bool readDocIdLimit(const vespalib::string &dir, uint32_t &docIdLimit);
+    static bool writeDocIdLimit(const vespalib::string &dir, uint32_t docIdLimit);
 };
 
 }
-}
 

searchlib/src/vespa/searchlib/common/fslimits.h

@@ -2,34 +2,5 @@
 
 #pragma once
 
-// define min/max number of bits that may be used to
-// encode partid/rowid into the partition path field.
-// NB: MIN_ROWBITS == 0
-// Constraint: MIN_PARTBITS >= 1
-// Constraint: MIN_PARTBITS <= 6 <= MAX_PARTBITS
-
-#define MIN_PARTBITS 1
-#define MAX_PARTBITS 8
-
-#define MAX_ROWBITS 8
-
-// Currently, max word length and max number of indexes are limited by
-// the layout of binary dictionaries; see class FastS_Pagedict.
-
-#define MAX_WORD_LEN 1000
-#define MAX_INDEXES    64
-
-// max number of tiers in a multi-tier dataset.
-// may currently not be greater than 16, due to the
-// partition path encoding algorithm used.
-
-#define MAX_TIERS 16
-
-// max number of explicitly defined term rank limits
-#define MAX_TERMRANKLIMITS 32
-
-// Max number of fallthrough classes in Multi-tier fallthrough selector, just set a limit..
-#define MAX_FALLTHROUGH_SELECTORS 32
-
 #define SEARCHLIB_FEF_UNKNOWN_FIELD_LENGTH 1000000u
 

searchlib/src/vespa/searchlib/common/serialnumfileheadercontext.h

@@ -4,9 +4,7 @@
 #include "fileheadercontext.h"
 #include "serialnum.h"
 
-namespace search {
-
-namespace common {
+namespace search::common {
 
 class SerialNumFileHeaderContext : public FileHeaderContext
 {
@@ -21,7 +19,4 @@ class SerialNumFileHeaderContext : public FileHeaderContext
     void addTags(vespalib::GenericHeader &header, const vespalib::string &name) const override;
 };
 
-} // namespace common
-
-} // namespace search
-
+}

searchlib/src/vespa/searchlib/common/sortspec.cpp

@@ -5,13 +5,13 @@
 #include <vespa/vespalib/text/utf8.h>
 #include <stdexcept>
 
-namespace search {
-namespace common {
+namespace search::common {
 
 using vespalib::ConstBufferRef;
 using vespalib::make_string;
 
-ConstBufferRef PassThroughConverter::onConvert(const ConstBufferRef & src) const
+ConstBufferRef
+PassThroughConverter::onConvert(const ConstBufferRef & src) const
 {
     return src;
 }
@@ -21,7 +21,8 @@ LowercaseConverter::LowercaseConverter() :
 {
 }
 
-ConstBufferRef LowercaseConverter::onConvert(const ConstBufferRef & src) const
+ConstBufferRef
+LowercaseConverter::onConvert(const ConstBufferRef & src) const
 {
     _buffer.clear();
     vespalib::stringref input((const char *)src.data(), src.size());
@@ -32,13 +33,13 @@ ConstBufferRef LowercaseConverter::onConvert(const ConstBufferRef & src) const
         c = Fast_NormalizeWordFolder::ToFold(c);
         w.putChar(c);
     }
-    return ConstBufferRef(_buffer.begin(), _buffer.size());
+    return {_buffer.begin(), _buffer.size()};
 }
 
 SortInfo::SortInfo(const vespalib::string & field, bool ascending, const BlobConverter::SP & converter)
     : _field(field), _ascending(ascending), _converter(converter)
 { }
-SortInfo::~SortInfo() {}
+SortInfo::~SortInfo() = default;
 
 SortSpec::SortSpec(const vespalib::string & spec, const ConverterFactory & ucaFactory) :
     _spec(spec)
@@ -98,13 +99,12 @@ SortSpec::SortSpec(const vespalib::string & spec, const ConverterFactory & ucaFa
                     throw std::runtime_error("Unknown func " + vespalib::string(func, p-func));
                 }
             } else {
-                push_back(SortInfo(funcSpec, ascending, BlobConverter::SP(NULL)));
+                push_back(SortInfo(funcSpec, ascending, BlobConverter::SP()));
             }
         }
     }
 }
 
-SortSpec::~SortSpec() {}
+SortSpec::~SortSpec() = default;
 
 }
-}

searchlib/src/vespa/searchlib/query/base.h

@@ -1,50 +1,19 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/vespalib/stllike/string.h>
-#include <vespa/fastlib/text/unicodeutil.h>
-#include <vector>
-
 namespace search {
 
 /// Type of general unsigned 8 bit data.
 typedef unsigned char byte;
-/// A simple container for the raw querystack.
-typedef vespalib::stringref QueryPacketT;
 /// The type of the local documentId.
 typedef unsigned DocumentIdT;
-/// This is the type of the CollectionId used in the StorageAPI.
-typedef uint64_t CollectionIdT;
-/// The type to identify a query.
-typedef unsigned QueryIdT;
-/// The rank type.
-typedef unsigned RankT;
 /// How time type. Used to represent seconds since 1970.
 typedef unsigned TimeT;
-/// Type to identify performance counters.
-typedef uint64_t CounterT;
-/// Type to identify performance values.
-typedef int ValueT;
 /// This is a 16 byte vector used in SSE2 integer operations.
 typedef char v16qi __attribute__ ((__vector_size__(16)));
 /// This is a 2 element uint64_t vector used in SSE2 integer operations.
 typedef long long v2di  __attribute__ ((__vector_size__(16)));
-/// A type to represent a list of strings.
-typedef std::vector<vespalib::string> StringListT;
-/// A type to represent a vector of 32 bit signed integers.
-typedef std::vector<int32_t> Int32ListT;
-/// A type to represent a list of document ids.
-typedef std::vector<DocumentIdT> DocumentIdList;
 
-/// A debug macro the does "a" when l & the mask is true. The mask is set per file.
-#define DEBUG(l, a) { if (l&DEBUGMASK) {a;} }
-#ifdef __USE_RAWDEBUG__
-  #define RAWDEBUG(a) a
-#else
-  #define RAWDEBUG(a)
-#endif
-/// A macro avoid warnings for unused parameters.
-#define UNUSED_PARAM(p)
 /// A macro that gives you number of elements in an array.
 #define NELEMS(a)    (sizeof(a)/sizeof(a[0]))