diff options
author | Henning Baldersheim <balder@oath.com> | 2018-05-09 14:57:40 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-05-09 14:57:40 +0200 |
commit | c111cd92365432d3792f22882b26a02d7f23b6d1 (patch) | |
tree | 68110b1d589835786df1f2c1df30170dc2f0a35e /searchsummary | |
parent | a188014e726bcb5aaf9519ed95d440cf311596bc (diff) |
Code health
Diffstat (limited to 'searchsummary')
17 files changed, 72 insertions, 95 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp index 2feca5fc0c7..198f2525244 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp @@ -6,7 +6,9 @@ #include <vespa/searchlib/attribute/stringbase.h> #include <vespa/searchlib/attribute/integerbase.h> #include <vespa/searchlib/attribute/floatbase.h> +#include <vespa/searchlib/attribute/iattributemanager.h> #include <vespa/searchlib/tensor/i_tensor_attribute.h> +#include <vespa/searchcommon/attribute/iattributecontext.h> #include <vespa/eval/tensor/tensor.h> #include <vespa/eval/tensor/serialization/typed_binary_format.h> #include <vespa/vespalib/objects/nbostream.h> @@ -20,8 +22,7 @@ using search::attribute::IAttributeContext; using search::attribute::IAttributeVector; using search::attribute::BasicType; -namespace search { -namespace docsummary { +namespace search::docsummary { ResType inferType(const IAttributeVector & vec) { ResType retval; @@ -155,13 +156,13 @@ SingleAttrDFW::insertField(uint32_t docid, case RES_FEATUREDATA: case RES_LONG_STRING: case RES_STRING: { - s = v.getString(docid, NULL, 0); // no need to pass in a buffer, this attribute has a string storage. + s = v.getString(docid, nullptr, 0); // no need to pass in a buffer, this attribute has a string storage. target.insertString(vespalib::Memory(s)); break; } case RES_LONG_DATA: case RES_DATA: { - s = v.getString(docid, NULL, 0); // no need to pass in a buffer, this attribute has a string storage. + s = v.getString(docid, nullptr, 0); // no need to pass in a buffer, this attribute has a string storage. target.insertData(vespalib::Memory(s)); break; } @@ -265,9 +266,9 @@ AttributeDFWFactory::create(IAttributeManager & vecMan, const char *vecName) { IAttributeContext::UP ctx = vecMan.createContext(); const IAttributeVector * vec = ctx->getAttribute(vecName); - if (vec == NULL) { + if (vec == nullptr) { LOG(warning, "No valid attribute vector found: %s", vecName); - return NULL; + return nullptr; } if (vec->hasMultiValue()) { return new MultiAttrDFW(vec->getName()); @@ -277,4 +278,3 @@ AttributeDFWFactory::create(IAttributeManager & vecMan, const char *vecName) } } -} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h index c661be635c8..643170663b8 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h @@ -2,11 +2,11 @@ #pragma once -#include <vespa/searchlib/attribute/iattributemanager.h> #include "docsumfieldwriter.h" -namespace search { -namespace docsummary { +namespace search::attribute { class IAttributeVector; } + +namespace search::docsummary { class AttrDFW : public IDocsumFieldWriter { @@ -14,12 +14,11 @@ private: vespalib::string _attrName; protected: const attribute::IAttributeVector & vec(const GetDocsumsState & s) const; - virtual const vespalib::string & getAttributeName() const override { return _attrName; } + const vespalib::string & getAttributeName() const override { return _attrName; } public: AttrDFW(const vespalib::string & attrName); - virtual bool IsGenerated() const override { return true; } + bool IsGenerated() const override { return true; } }; } -} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp index d8b059b31ac..83637bfc7cc 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.cpp @@ -11,8 +11,7 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> -namespace search { -namespace docsummary { +namespace search::docsummary { using vespalib::IllegalArgumentException; using vespalib::make_string; @@ -119,6 +118,4 @@ DynamicDocsumConfig::configure(const vespa::config::search::SummarymapConfig &cf } } - -} } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.h index 57c82c97a93..21015e21459 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumconfig.h @@ -4,8 +4,7 @@ #include <vespa/config-summarymap.h> -namespace search { -namespace docsummary { +namespace search::docsummary { class IDocsumEnvironment; class DynamicDocsumWriter; @@ -36,5 +35,4 @@ private: }; } -} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h index 5e01d698fb6..4ffed79043e 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h @@ -13,13 +13,12 @@ namespace juniper { class Result; } -namespace search { -namespace common { class Location; } -namespace attribute { +namespace search::common { class Location; } +namespace search::attribute { class IAttributeContext; class IAttributeVector; } -namespace docsummary { +namespace search::docsummary { class GetDocsumsState; class IDocsumEnvironment; @@ -90,5 +89,4 @@ public: }; } -} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp index 5798636b1a8..b05f80b5db1 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp @@ -44,7 +44,7 @@ DynamicDocsumWriter::resolveOutputClass(vespalib::stringref summaryClass) const if (id != ResultConfig::NoClassID()) { const ResultClass *oC = _resultConfig->LookupResultClass(id); - if (oC == NULL) { + if (oC == nullptr) { LOG(warning, "Illegal docsum class requested: %d, using empty docsum for documents", id); result.mustSkip = true; } else { @@ -65,11 +65,11 @@ void DynamicDocsumWriter::resolveInputClass(ResolveClassInfo &rci, uint32_t id) const { rci.inputClass = _resultConfig->LookupResultClass(id); - if (rci.inputClass == NULL) { + if (rci.inputClass == nullptr) { rci.mustSkip = true; return; } - if (rci.outputClass == NULL) { + if (rci.outputClass == nullptr) { LOG_ASSERT(rci.outputClassId == ResultConfig::NoClassID()); rci.outputClassId = id; rci.outputClass = rci.inputClass; @@ -147,7 +147,7 @@ DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, const Memory field_name(resCfg->_bindname.data(), resCfg->_bindname.size()); ObjectInserter inserter(docsum, field_name); - writer->insertField(docid, NULL, state, resCfg->_type, inserter); + writer->insertField(docid, nullptr, state, resCfg->_type, inserter); } } } else { @@ -166,7 +166,7 @@ DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, IDocsumFieldWriter *writer = _overrideTable[outCfg->_enumValue]; const Memory field_name(outCfg->_bindname.data(), outCfg->_bindname.size()); ObjectInserter inserter(docsum, field_name); - if (writer != NULL) { + if (writer != nullptr) { writer->insertField(docid, &gres, state, outCfg->_type, inserter); } else { if (rci.inputClass == rci.outputClass) { @@ -174,10 +174,10 @@ DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, } else { int inIdx = rci.inputClass->GetIndexFromEnumValue(outCfg->_enumValue); const ResConfigEntry *inCfg = rci.inputClass->GetEntry(inIdx); - if (inCfg != NULL && inCfg->_type == outCfg->_type) { + if (inCfg != nullptr && inCfg->_type == outCfg->_type) { // copy field const ResEntry *entry = gres.GetEntry(inIdx); - LOG_ASSERT(entry != NULL); + LOG_ASSERT(entry != nullptr); convertEntry(state, outCfg, entry, inserter, slime); } } @@ -193,10 +193,10 @@ DynamicDocsumWriter::DynamicDocsumWriter( ResultConfig *config, KeywordExtractor _defaultOutputClass(ResultConfig::NoClassID()), _numClasses(config->GetNumResultClasses()), _numEnumValues(config->GetFieldNameEnum().GetNumEntries()), - _classInfoTable(NULL), - _overrideTable(NULL) + _classInfoTable(nullptr), + _overrideTable(nullptr) { - LOG_ASSERT(config != NULL); + LOG_ASSERT(config != nullptr); _classInfoTable = new ResultClass::DynamicInfo[_numClasses]; _overrideTable = new IDocsumFieldWriter*[_numEnumValues]; @@ -209,7 +209,7 @@ DynamicDocsumWriter::DynamicDocsumWriter( ResultConfig *config, KeywordExtractor LOG_ASSERT(i == _numClasses); for (i = 0; i < _numEnumValues; i++) - _overrideTable[i] = NULL; + _overrideTable[i] = nullptr; } @@ -231,10 +231,10 @@ DynamicDocsumWriter::SetDefaultOutputClass(uint32_t classID) { const ResultClass *resClass = _resultConfig->LookupResultClass(classID); - if (resClass == NULL || + if (resClass == nullptr || _defaultOutputClass != ResultConfig::NoClassID()) { - if (resClass == NULL) { + if (resClass == nullptr) { LOG(warning, "cannot set default output docsum class to %d; class not defined", classID); } else if (_defaultOutputClass != ResultConfig::NoClassID()) { LOG(warning, "cannot set default output docsum class to %d; value already set", classID); @@ -252,12 +252,12 @@ DynamicDocsumWriter::Override(const char *fieldName, IDocsumFieldWriter *writer) uint32_t fieldEnumValue = _resultConfig->GetFieldNameEnum().Lookup(fieldName); if (fieldEnumValue >= _numEnumValues || - _overrideTable[fieldEnumValue] != NULL) + _overrideTable[fieldEnumValue] != nullptr) { if (fieldEnumValue >= _numEnumValues) { LOG(warning, "cannot override docsum field '%s'; undefined field name", fieldName); - } else if (_overrideTable[fieldEnumValue] != NULL) { + } else if (_overrideTable[fieldEnumValue] != nullptr) { LOG(warning, "cannot override docsum field '%s'; already overridden", fieldName); } delete writer; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h index 46caa26e60b..45094cdc056 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h @@ -29,7 +29,7 @@ public: ResolveClassInfo() : mustSkip(false), allGenerated(false), outputClassId(ResultConfig::NoClassID()), - outputClass(NULL), outputClassInfo(NULL), inputClass(NULL) + outputClass(nullptr), outputClassInfo(nullptr), inputClass(nullptr) { } }; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp index fdb5d436a73..bf010172fa9 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp @@ -2,6 +2,7 @@ #include "geoposdfw.h" #include <vespa/searchlib/common/documentlocations.h> +#include <vespa/searchlib/attribute/iattributemanager.h> #include <vespa/searchlib/common/location.h> #include <vespa/vespalib/util/jsonwriter.h> #include <vespa/vespalib/data/slime/cursor.h> @@ -88,7 +89,7 @@ GeoPositionDFW::create(const char *attribute_name, IAttributeManager *attribute_manager) { GeoPositionDFW::UP ret; - if (attribute_manager != NULL) { + if (attribute_manager != nullptr) { if (!attribute_name) { LOG(warning, "create: missing attribute name '%p'", attribute_name); return ret; @@ -108,5 +109,4 @@ GeoPositionDFW::create(const char *attribute_name, return ret; } - } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.h index b85f916e384..8f630cde3af 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.h @@ -2,10 +2,9 @@ #pragma once -#include <vespa/searchsummary/docsummary/attributedfw.h> +#include "attributedfw.h" -namespace search { -namespace docsummary { +namespace search::docsummary { /** * This is the docsum field writer used to extract the position (as a string) from a zcurve attribute @@ -21,5 +20,4 @@ public: }; } -} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/itokenizer.h b/searchsummary/src/vespa/searchsummary/docsummary/itokenizer.h index 33004093025..62f2510c17b 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/itokenizer.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/itokenizer.h @@ -4,8 +4,7 @@ #include <vespa/vespalib/stllike/string.h> -namespace search { -namespace docsummary { +namespace search::docsummary { /** * Interface for a tokenizer. @@ -66,4 +65,4 @@ public: }; } -} + diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h index 3c08132b02a..f6218d563ed 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h @@ -2,15 +2,14 @@ #pragma once +#include "urlresult.h" +#include "resultconfig.h" +#include "docsumfieldwriter.h" #include <vespa/searchlib/util/rawbuf.h> -#include <vespa/searchsummary/docsummary/urlresult.h> -#include <vespa/searchsummary/docsummary/resultconfig.h> #include <vespa/vespalib/data/slime/inserter.h> -#include "docsumfieldwriter.h" #include <vespa/juniper/rpinterface.h> -namespace search { -namespace docsummary { +namespace search::docsummary { class JuniperDFW : public IDocsumFieldWriter { @@ -29,7 +28,7 @@ protected: uint32_t _langFieldEnumValue; juniper::Juniper *_juniper; private: - virtual bool IsGenerated() const override { return false; } + bool IsGenerated() const override { return false; } JuniperDFW(const JuniperDFW &); JuniperDFW & operator=(const JuniperDFW &); }; @@ -38,11 +37,8 @@ private: class JuniperTeaserDFW : public JuniperDFW { public: - virtual bool Init( - const char *fieldName, - const char *langFieldName, - const ResultConfig & config, - const char *inputField) override; + bool Init(const char *fieldName, const char *langFieldName, + const ResultConfig & config, const char *inputField) override; protected: JuniperTeaserDFW(juniper::Juniper * juniper) : JuniperDFW(juniper) { } }; @@ -57,13 +53,9 @@ public: GeneralResult *gres, GetDocsumsState *state); - virtual void insertField(uint32_t docid, - GeneralResult *gres, - GetDocsumsState *state, - ResType type, - vespalib::slime::Inserter &target) override; + void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state, + ResType type, vespalib::slime::Inserter &target) override; }; -} // namespace docsummary -} // namespace search +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp index c3352830fd6..48e79a5e34c 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp @@ -2,6 +2,7 @@ #include "positionsdfw.h" #include "docsumstate.h" +#include <vespa/searchlib/attribute/iattributemanager.h> #include <vespa/searchlib/common/location.h> #include <vespa/vespalib/stllike/asciistream.h> #include <cmath> @@ -72,11 +73,11 @@ AbsDistanceDFW::insertField(uint32_t docid, GeneralResult *, GetDocsumsState *st const vespalib::string &locationStr = state->_args.getLocation(); if (locationStr.size() > 0) { - if (state->_parsedLocation.get() == NULL) { + if (!state->_parsedLocation) { state->_callback.ParseLocation(state); } - assert(state->_parsedLocation.get() != NULL); - if (state->_parsedLocation->getParseError() == NULL) { + assert(state->_parsedLocation); + if (state->_parsedLocation->getParseError() == nullptr) { forceEmpty = false; } } @@ -178,7 +179,7 @@ PositionsDFW::UP createPositionsDFW(const char *attribute_name, IAttributeManager *attribute_manager) { PositionsDFW::UP ret; - if (attribute_manager != NULL) { + if (attribute_manager != nullptr) { if (!attribute_name) { LOG(debug, "createPositionsDFW: missing attribute name '%p'", attribute_name); return ret; @@ -202,7 +203,7 @@ AbsDistanceDFW::UP createAbsDistanceDFW(const char *attribute_name, IAttributeManager *attribute_manager) { AbsDistanceDFW::UP ret; - if (attribute_manager != NULL) { + if (attribute_manager != nullptr) { if (!attribute_name) { LOG(debug, "createAbsDistanceDFW: missing attribute name '%p'", attribute_name); return ret; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h index b26eb139686..69a7ba3f58f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h @@ -2,10 +2,9 @@ #pragma once -#include <vespa/searchsummary/docsummary/attributedfw.h> +#include "attributedfw.h" -namespace search { -namespace docsummary { +namespace search::docsummary { class AbsDistanceDFW : public AttrDFW { @@ -36,6 +35,4 @@ public: PositionsDFW::UP createPositionsDFW(const char *attribute_name, IAttributeManager *index_man); AbsDistanceDFW::UP createAbsDistanceDFW(const char *attribute_name, IAttributeManager *index_man); -} // namespace docsummary -} // namespace search - +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h index c406a9f9dee..5229e26475b 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h @@ -26,7 +26,7 @@ private: public: SummaryFeaturesDFW(); - ~SummaryFeaturesDFW(); + ~SummaryFeaturesDFW() override; void init(IDocsumEnvironment * env); bool IsGenerated() const override { return true; } void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state, diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.h b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.h index fdb4d3cc2e7..96db6026e88 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.h @@ -4,8 +4,7 @@ #include <vespa/document/fieldvalue/fieldvalue.h> -namespace search { -namespace docsummary { +namespace search::docsummary { /** * This class converts a summary field for docsum fetching. @@ -17,5 +16,5 @@ public: convertSummaryField(bool markup, const document::FieldValue &value); }; -} // namespace search::docsummary -} // namespace search +} + diff --git a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h index e7d6916d452..cd18c503058 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h @@ -34,11 +34,10 @@ public: */ Tokenizer(const char * buf, size_t len); - // Inherit doc - virtual void reset(const char * buf, size_t len) override; - virtual size_t getBufferSize() const override { return _end - _begin; } - virtual bool hasMoreTokens() override; - virtual Token getNextToken() override; + void reset(const char * buf, size_t len) override; + size_t getBufferSize() const override { return _end - _begin; } + bool hasMoreTokens() override; + Token getNextToken() override; }; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h index 97e31e47996..4d1fca0992d 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h @@ -31,9 +31,9 @@ class badurlresult : public urlresult public: badurlresult(); badurlresult(uint32_t partition, uint32_t docid, HitRank metric); - virtual ~badurlresult(); + ~badurlresult() override; - virtual int unpack(const char *buf, const size_t buflen) override; + int unpack(const char *buf, const size_t buflen) override; }; @@ -49,8 +49,7 @@ private: char *_buf; // allocated in same chunk as _entries char *_bufEnd; // first byte after _buf - bool InBuf(void *pt) - { + bool InBuf(void *pt) { return ((char *)pt >= _buf && (char *)pt < _bufEnd); } @@ -69,8 +68,8 @@ public: ResEntry *GetEntry(uint32_t idx); ResEntry *GetEntry(const char *name); ResEntry *GetEntryFromEnumValue(uint32_t val); - virtual bool IsGeneral() const override { return true; } - virtual int unpack(const char *buf, const size_t buflen) override; + bool IsGeneral() const override { return true; } + int unpack(const char *buf, const size_t buflen) override; bool inplaceUnpack(const DocsumStoreValue &value) { if (value.valid()) { @@ -82,3 +81,4 @@ public: }; } + |