diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-16 10:54:02 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-16 10:54:02 +0200 |
commit | df6f93103bc3764bc8c66a03216d84f45ddbbe91 (patch) | |
tree | 7290bc890d57f58ea4c6bceb9461d25afb3b688b /searchsummary | |
parent | f765fef143a2000fc5e79c4eaaa407c61563e327 (diff) |
Use nested namespace and clean up some unused code.
Diffstat (limited to 'searchsummary')
23 files changed, 36 insertions, 132 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp index 90053406d9e..7b463352155 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp @@ -3,7 +3,6 @@ #include "docsumfieldwriter.h" #include "idocsumenvironment.h" #include "docsumstate.h" -#include <vespa/searchlib/attribute/iattributemanager.h> #include <vespa/searchlib/common/documentlocations.h> #include <vespa/searchlib/common/location.h> #include <vespa/searchlib/parsequery/stackdumpiterator.h> @@ -136,8 +135,7 @@ CopyDFW::insertField(uint32_t /*docid*/, uint32_t len; const char *spt; // resolve field - entry->_resolve_field(&spt, &len, - &state->_docSumFieldSpace); + entry->_resolve_field(&spt, &len, &state->_docSumFieldSpace); vespalib::Memory value(spt, len); target.insertString(value); break; } @@ -148,8 +146,7 @@ CopyDFW::insertField(uint32_t /*docid*/, uint32_t len; const char *dpt; // resolve field - entry->_resolve_field(&dpt, &len, - &state->_docSumFieldSpace); + entry->_resolve_field(&dpt, &len, &state->_docSumFieldSpace); vespalib::Memory value(dpt, len); target.insertData(value); break; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp index fbcc5cc88d7..e535eef660c 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp @@ -4,9 +4,7 @@ #include "docsumwriter.h" #include "docsumstate.h" #include <vespa/searchlib/parsequery/stackdumpiterator.h> -#include <vespa/searchlib/util/rawbuf.h> #include <vespa/searchlib/queryeval/split_float.h> -#include <vespa/searchlib/fef/properties.h> #include <vespa/vespalib/objects/hexdump.h> #include <vespa/juniper/config.h> #include <sstream> @@ -16,7 +14,6 @@ LOG_SETUP(".searchlib.docsummary.dynamicteaserdfw"); namespace juniper { - struct ExplicitItemData { const char *_index; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp index 1152e1524bb..5856797831a 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp @@ -3,8 +3,7 @@ #include "getdocsumargs.h" #include "resultconfig.h" -namespace search { -namespace docsummary { +namespace search::docsummary { GetDocsumArgs::GetDocsumArgs() : _ranking(), @@ -87,4 +86,3 @@ GetDocsumArgs::SetStackDump(uint32_t stackItems, uint32_t stackDumpLen, const ch } } -} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h index 68358bed589..beca4134946 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h @@ -8,8 +8,7 @@ #include <vespa/searchlib/engine/docsumrequest.h> #include <vespa/searchlib/engine/propertiesmap.h> -namespace search { -namespace docsummary { +namespace search::docsummary { class GetDocsumArgs { @@ -86,5 +85,3 @@ public: }; } -} - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h b/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h index 516b9e24e2d..88f8e4f6c5d 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h @@ -5,8 +5,7 @@ #include <vespa/searchlib/attribute/iattributemanager.h> namespace juniper { class Juniper; } -namespace search { -namespace docsummary { +namespace search::docsummary { /** * Abstract view of information available to rewriters for generating docsum fields. @@ -20,5 +19,3 @@ public: }; } -} - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.cpp b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.cpp index 3bf2cdbc928..7f3a31f86c5 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.cpp @@ -7,8 +7,7 @@ using vespa::config::search::summary::JuniperrcConfig; using vespalib::make_string; -namespace search { -namespace docsummary { +namespace search::docsummary { JuniperProperties::JuniperProperties() : _properties() @@ -102,12 +101,4 @@ JuniperProperties::GetProperty(const char *name, const char *def) return it != _properties.end() ? it->second.c_str() : def; } -void -JuniperProperties::SetProperty(const vespalib::string &key, const vespalib::string &val) -{ - _properties[key] = val; } - -} // namespace docsummary -} // namespace search - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h index cf4eca6b6a7..c313b917271 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h @@ -52,15 +52,6 @@ public: // Inherit doc from IJuniperProperties. const char *GetProperty(const char *name, const char *def = NULL) override; - - /** - * Sets the value of a given named property. If the property already exists, it is overwritten. If it does not - * exist, it is added. - * - * @param key The name of the property to set. - * @param val The value to set for the property. - */ - void SetProperty(const vespalib::string &key, const vespalib::string &val); }; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp index d8f6f2c3820..e153a898f6a 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp @@ -4,18 +4,15 @@ #include "keywordextractor.h" #include "idocsumenvironment.h" #include <vespa/searchlib/parsequery/stackdumpiterator.h> -#include <vespa/searchlib/util/rawbuf.h> /** Tell us what parts of the query we are interested in */ -namespace search { -namespace docsummary { +namespace search::docsummary { bool useful(search::ParseItem::ItemCreator creator) { - switch (creator) - { + switch (creator) { case search::ParseItem::CREA_ORIG: return true; default: @@ -245,4 +242,3 @@ KeywordExtractor::ExtractKeywords(vespalib::stringref buf) const } } -} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/linguisticsannotation.cpp b/searchsummary/src/vespa/searchsummary/docsummary/linguisticsannotation.cpp index 36527b0eb24..b4a03e8c9a1 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/linguisticsannotation.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/linguisticsannotation.cpp @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "linguisticsannotation.h" -#include <vespa/document/datatype/datatype.h> #include <vespa/document/datatype/primitivedatatype.h> using document::AnnotationType; @@ -9,8 +8,7 @@ using document::DataType; using document::PrimitiveDataType; using vespalib::string; -namespace search { -namespace linguistics { +namespace search::linguistics { namespace { AnnotationType makeType(int id, string name, const DataType &type) { @@ -26,5 +24,4 @@ AnnotationType TERM_OBJ(makeType(1, "term", STRING_OBJ)); const string SPANTREE_NAME("linguistics"); const AnnotationType *const TERM(&TERM_OBJ); -} // namespace search::linguistics -} // namespace search +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/linguisticsannotation.h b/searchsummary/src/vespa/searchsummary/docsummary/linguisticsannotation.h index a643df3d6cd..1ffa000c74e 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/linguisticsannotation.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/linguisticsannotation.h @@ -3,13 +3,10 @@ #pragma once #include <vespa/document/datatype/annotationtype.h> -#include <vespa/vespalib/stllike/string.h> -namespace search { -namespace linguistics { +namespace search::linguistics { extern const vespalib::string SPANTREE_NAME; extern const document::AnnotationType *const TERM; -} // namespace search::linguistics -} // namespace search +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp index 89d7a80255e..fdc38d8d6f9 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp @@ -2,8 +2,6 @@ #include "rankfeaturesdfw.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> diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp index a87af85f099..507ec7b3866 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp @@ -5,8 +5,7 @@ #include <cassert> #include <zlib.h> -namespace search { -namespace docsummary { +namespace search::docsummary { ResultClass::ResultClass(const char *name, uint32_t id, util::StringEnum & fieldEnum) : _name(name), @@ -101,4 +100,3 @@ ResEntry::_extract_field(search::RawBuf *target) const } } -} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp index cd4cceb849e..1c42709826f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp @@ -7,8 +7,7 @@ #include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.resultconfig"); -namespace search { -namespace docsummary { +namespace search::docsummary { void ResultConfig::Clean() @@ -242,5 +241,4 @@ ResultConfig::Unpack(uint32_t partition, return (ret != NULL) ? ret : new badurlresult(partition, docid, metric); } -} // namespace docsummary -} // namespace search +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp index 147c0bf6559..178e1a90667 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp @@ -6,8 +6,7 @@ #include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.resultpacker"); -namespace search { -namespace docsummary { +namespace search::docsummary { void ResultPacker::WarnType(ResType type) const @@ -282,12 +281,4 @@ ResultPacker::GetDocsumBlob(const char **buf, uint32_t *buflen) } } -void -ResultPacker::GetDocsumBlobForce(const char **buf, uint32_t *buflen) -{ - *buf = _buf.GetDrainPos(); - *buflen = _buf.GetUsedLen(); -} - -} } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.h b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.h index d2959f25c5a..3dd643406d7 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.h @@ -4,10 +4,9 @@ #pragma once -#include <vespa/searchsummary/docsummary/resultconfig.h> +#include "resultconfig.h" -namespace search { -namespace docsummary { +namespace search::docsummary { /** * An Object of this class may be used to create docsum blobs. A * single blob is created by first indicating what result class the @@ -252,10 +251,6 @@ public: **/ bool GetDocsumBlob(const char **buf, uint32_t *buflen); - void GetDocsumBlobForce(const char **buf, uint32_t *buflen); }; } -} - - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.cpp b/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.cpp index c3f62d71de6..7d8bd2a7c22 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.cpp @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "searchdatatype.h" -#include <vespa/document/base/field.h> #include <vespa/document/datatype/primitivedatatype.h> #include <vespa/document/datatype/structdatatype.h> @@ -10,8 +9,7 @@ using document::Field; using document::PrimitiveDataType; using document::StructDataType; -namespace search { -namespace docsummary { +namespace search::docsummary { namespace { @@ -32,5 +30,4 @@ const StructDataType *setUpUriType() { const DataType *SearchDataType::URI(setUpUriType()); -} // namespace search::docsummary -} // namespace search +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.h b/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.h index 7cb30136dee..cf1a08a50df 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.h @@ -4,12 +4,10 @@ #include <vespa/document/datatype/datatype.h> -namespace search { -namespace docsummary { +namespace search::docsummary { struct SearchDataType { static const document::DataType *URI; }; -} // namespace search::docsummary -} // namespace search +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp index b91365c9f58..c21d6c40066 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp @@ -68,8 +68,7 @@ SummaryFeaturesDFW::insertField(uint32_t docid, GeneralResult *, GetDocsumsState json.appendDouble(0.0); } json.endObject(); - vespalib::Memory value(json.toString().c_str(), - json.toString().size()); + vespalib::Memory value(json.toString().c_str(), json.toString().size()); if (type == RES_STRING || type == RES_LONG_STRING) { target.insertString(value); } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp index cee3455b957..290cc45648a 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp @@ -5,20 +5,13 @@ #include "searchdatatype.h" #include <vespa/document/annotation/alternatespanlist.h> #include <vespa/document/annotation/annotation.h> -#include <vespa/document/annotation/span.h> -#include <vespa/document/annotation/spanlist.h> -#include <vespa/document/annotation/spannode.h> #include <vespa/document/annotation/spantree.h> #include <vespa/document/annotation/spantreevisitor.h> -#include <vespa/document/datatype/arraydatatype.h> -#include <vespa/document/datatype/datatype.h> #include <vespa/document/datatype/documenttype.h> -#include <vespa/document/datatype/weightedsetdatatype.h> #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/bytefieldvalue.h> #include <vespa/document/fieldvalue/document.h> #include <vespa/document/fieldvalue/doublefieldvalue.h> -#include <vespa/document/fieldvalue/fieldvaluevisitor.h> #include <vespa/document/fieldvalue/floatfieldvalue.h> #include <vespa/document/fieldvalue/intfieldvalue.h> #include <vespa/document/fieldvalue/longfieldvalue.h> @@ -35,11 +28,8 @@ #include <vespa/vespalib/encoding/base64.h> #include <vespa/vespalib/geo/zcurve.h> #include <vespa/vespalib/stllike/asciistream.h> -#include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/data/slime/slime.h> -#include <vespa/vespalib/data/slime/convenience.h> -#include <vespa/vespalib/data/slime/binary_format.h> #include <vespa/eval/tensor/serialization/slime_binary_format.h> #include <vespa/eval/tensor/serialization/typed_binary_format.h> #include <vespa/vespalib/objects/nbostream.h> @@ -90,8 +80,7 @@ using vespalib::make_string; using vespalib::string; using vespalib::stringref; -namespace search { -namespace docsummary { +namespace search::docsummary { namespace { string getSpanString(const string &s, const Span &span) { @@ -522,5 +511,4 @@ SummaryFieldConverter::convertSummaryField(bool markup, } -} // namespace search::docsummary -} // namespace search +} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp index 4f309c36f74..121520c4d03 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp @@ -1,14 +1,13 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "tokenizer.h" #include "textextractordfw.h" +#include "tokenizer.h" #include "docsumstate.h" #include <vespa/log/log.h> LOG_SETUP(".searchlib.docsummary.textextractordfw"); -namespace search { -namespace docsummary { +namespace search::docsummary { TextExtractorDFW::TextExtractorDFW() : _inputFieldEnum(-1) @@ -53,5 +52,3 @@ TextExtractorDFW::insertField(uint32_t, } } -} - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.h b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.h index ad611c129de..e30941bf8f9 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.h @@ -2,10 +2,9 @@ #pragma once -#include <vespa/searchsummary/docsummary/docsumfieldwriter.h> +#include "docsumfieldwriter.h" -namespace search { -namespace docsummary { +namespace search::docsummary { /** * This is the docsum field writer used to extract the original text from a disk summary on the juniper format. @@ -20,18 +19,11 @@ private: public: TextExtractorDFW(); - virtual ~TextExtractorDFW() {} + ~TextExtractorDFW() {} bool init(const vespalib::string & fieldName, const vespalib::string & inputField, const ResultConfig & config); - // Inherit doc - virtual bool IsGenerated() const override { return false; } - // Inherit doc - virtual void insertField(uint32_t docid, - GeneralResult *gres, - GetDocsumsState *state, - ResType type, - vespalib::slime::Inserter &target) override; + bool IsGenerated() const override { return false; } + void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state, + ResType type, vespalib::slime::Inserter &target) override; }; } -} - diff --git a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.cpp b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.cpp index 5a807e564ef..003b9920068 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.cpp @@ -3,8 +3,7 @@ #include "tokenizer.h" #include <cassert> -namespace search { -namespace docsummary { +namespace search::docsummary { Tokenizer::Token::Type Tokenizer::getTokenType(ucs4_t ch) const @@ -107,4 +106,3 @@ Tokenizer::getNextToken() } } -} diff --git a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h index 59762ec2d95..e7d6916d452 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h @@ -2,11 +2,10 @@ #pragma once -#include <vespa/fastlib/text/unicodeutil.h> #include "itokenizer.h" +#include <vespa/fastlib/text/unicodeutil.h> -namespace search { -namespace docsummary { +namespace search::docsummary { /** * This class is used to tokenize an utf-8 text buffer into tokens of type @@ -43,5 +42,3 @@ public: }; } -} - |