diff options
Diffstat (limited to 'searchsummary/src')
15 files changed, 37 insertions, 38 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/annotation_converter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/annotation_converter.cpp index ec7740b371d..b36a2f8383e 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/annotation_converter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/annotation_converter.cpp @@ -13,8 +13,8 @@ #include <vespa/vespalib/util/exceptions.h> #include <utility> -using document::Annotation; using document::AlternateSpanList; +using document::Annotation; using document::FieldValue; using document::SimpleSpanList; using document::Span; @@ -125,8 +125,8 @@ AnnotationConverter::handleIndexingTerms(const StringFieldValue& value) { StringFieldValue::SpanTrees trees = value.getSpanTrees(); const SpanTree *tree = StringFieldValue::findTree(trees, linguistics::SPANTREE_NAME); - typedef std::pair<Span, const FieldValue *> SpanTerm; - typedef std::vector<SpanTerm> SpanTermVector; + using SpanTerm = std::pair<Span, const FieldValue *>; + using SpanTermVector = std::vector<SpanTerm>; if (!tree) { // Treat a string without annotations as a single span. SpanTerm str(Span(0, _text.size()), @@ -137,7 +137,7 @@ AnnotationConverter::handleIndexingTerms(const StringFieldValue& value) SpanTermVector terms; for (const Annotation& annotation : *tree) { // For now, skip any composite spans. - const Span *span = dynamic_cast<const Span*>(annotation.getSpanNode()); + const auto *span = dynamic_cast<const Span*>(annotation.getSpanNode()); if ((span != nullptr) && annotation.valid() && (annotation.getType() == *linguistics::TERM)) { terms.push_back(std::make_pair(getSpan(*span), diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attribute_combiner_dfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attribute_combiner_dfw.cpp index 1ec95a58c00..889169f8888 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attribute_combiner_dfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attribute_combiner_dfw.cpp @@ -41,7 +41,7 @@ AttributeCombinerDFW::create(const vespalib::string &fieldName, IAttributeContex { StructFieldsResolver structFields(fieldName, attrCtx, true); if (structFields.has_error()) { - return std::unique_ptr<DocsumFieldWriter>(); + return {}; } else if (structFields.is_map_of_struct()) { return std::make_unique<StructMapAttributeCombinerDFW>(fieldName, structFields, filter_elements, std::move(matching_elems_fields)); } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp index 1dff340666e..74d67aabe88 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp @@ -25,12 +25,12 @@ using search::attribute::IAttributeContext; using search::attribute::IAttributeVector; using search::attribute::IMultiValueAttribute; using search::attribute::IMultiValueReadView; +using vespalib::Issue; using vespalib::Memory; +using vespalib::eval::Value; using vespalib::slime::Cursor; using vespalib::slime::Inserter; using vespalib::slime::Symbol; -using vespalib::eval::Value; -using vespalib::Issue; namespace search::docsummary { @@ -347,7 +347,7 @@ AttributeDFWFactory::create(const IAttributeManager& attr_mgr, const auto* attr = ctx->getAttribute(attr_name); if (attr == nullptr) { Issue::report("No valid attribute vector found: '%s'", attr_name.c_str()); - return std::unique_ptr<DocsumFieldWriter>(); + return {}; } if (attr->hasMultiValue()) { return create_multi_writer(*attr, filter_elements, std::move(matching_elems_fields)); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstore.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumstore.h index b112b7ab0bf..7f3a88b05eb 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstore.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstore.h @@ -15,10 +15,7 @@ class IDocsumStoreDocument; class IDocsumStore { public: - /** - * Convenience typedef. - */ - typedef std::unique_ptr<IDocsumStore> UP; + using UP = std::unique_ptr<IDocsumStore>; /** * Destructor. No cleanup needed for base class. diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp index bf35d6131e5..b4b663718bd 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp @@ -14,8 +14,8 @@ LOG_SETUP(".searchlib.docsummary.docsumwriter"); using vespalib::Issue; -using vespalib::slime::ObjectInserter; using vespalib::Memory; +using vespalib::slime::ObjectInserter; namespace search::docsummary { @@ -77,7 +77,9 @@ DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, uint32_t docid, vespalib::slime::Cursor & docsum = topInserter.insertObject(); for (uint32_t i = 0; i < rci.outputClass->GetNumEntries(); ++i) { const ResConfigEntry *outCfg = rci.outputClass->GetEntry(i); - if ( ! state._args.needField(outCfg->_name)) continue; + if (!state._args.needField(outCfg->_name)) { + continue; + } const DocsumFieldWriter *writer = outCfg->_docsum_field_writer.get(); const Memory field_name(outCfg->_name.data(), outCfg->_name.size()); ObjectInserter inserter(docsum, field_name); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp index 4cd79bd8351..6d668561651 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp @@ -104,21 +104,20 @@ GeoPositionDFW::create(const char *attribute_name, const IAttributeManager *attribute_manager, bool useV8geoPositions) { - GeoPositionDFW::UP ret; if (attribute_manager != nullptr) { if (!attribute_name) { LOG(warning, "create: missing attribute name '%p'", attribute_name); - return ret; + return {}; } IAttributeContext::UP context = attribute_manager->createContext(); if (!context.get()) { LOG(warning, "create: could not create context from attribute manager"); - return ret; + return {}; } const IAttributeVector *attribute = context->getAttribute(attribute_name); if (!attribute) { Issue::report("GeoPositionDFW::create: could not get attribute '%s' from context", attribute_name); - return ret; + return {}; } } return std::make_unique<GeoPositionDFW>(attribute_name, useV8geoPositions); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.h index 31dfc9ceef4..6e470d479ff 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.h @@ -14,7 +14,7 @@ class GeoPositionDFW : public AttrDFW private: bool _useV8geoPositions; public: - typedef std::unique_ptr<GeoPositionDFW> UP; + using UP = std::unique_ptr<GeoPositionDFW>; GeoPositionDFW(const vespalib::string & attrName, bool useV8geoPositions); void insertField(uint32_t docid, GetDocsumsState& state, vespalib::slime::Inserter &target) const override; static UP create(const char *attribute_name, const IAttributeManager *attribute_manager, bool useV8geoPositions); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp index 814fe0aafe4..a13f65db5ce 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp @@ -27,8 +27,9 @@ JuniperQueryAdapter::SkipItem(search::SimpleQueryStackDumpIterator *iterator) co uint32_t skipCount = iterator->getArity(); while (skipCount > 0) { - if (!iterator->next()) + if (!iterator->next()) { return false; // stack too small + } skipCount = skipCount - 1 + iterator->getArity(); } return true; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp index 0256965e7f4..e8ff3068a4c 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp @@ -100,8 +100,9 @@ KeywordExtractor::GetLegalIndexSpec() } for (const auto & index : _legalIndexes) { - if (!spec.empty()) + if (!spec.empty()) { spec.append(';'); + } spec.append(index); } return spec; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h index 5f87de762f9..9d46f0c8d89 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h @@ -23,7 +23,7 @@ public: }; private: - typedef vespalib::hash_set<vespalib::string> Set; + using Set = vespalib::hash_set<vespalib::string>; const IDocsumEnvironment *_env; std::vector<IndexPrefix> _legalPrefixes; Set _legalIndexes; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/matched_elements_filter_dfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/matched_elements_filter_dfw.cpp index 4d381f940ae..1a029cfd16f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/matched_elements_filter_dfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/matched_elements_filter_dfw.cpp @@ -54,7 +54,7 @@ MatchedElementsFilterDFW::create(const std::string& input_field_name, { StructFieldsResolver resolver(input_field_name, attr_ctx, false); if (resolver.has_error()) { - return std::unique_ptr<DocsumFieldWriter>(); + return {}; } resolver.apply_to(*matching_elems_fields); return std::make_unique<MatchedElementsFilterDFW>(input_field_name, std::move(matching_elems_fields)); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp index 02696c7b27a..5aba321b540 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp @@ -26,12 +26,12 @@ double to_degrees(int32_t microDegrees) { } +using search::attribute::BasicType; using search::attribute::IAttributeContext; using search::attribute::IAttributeVector; -using search::attribute::BasicType; using search::attribute::IntegerContent; -using search::common::Location; using search::common::GeoGcd; +using search::common::Location; LocationAttrDFW::AllLocations LocationAttrDFW::getAllLocations(GetDocsumsState& state) const @@ -232,21 +232,20 @@ PositionsDFW::insertField(uint32_t docid, GetDocsumsState& dsState, vespalib::sl //-------------------------------------------------------------------------- PositionsDFW::UP PositionsDFW::create(const char *attribute_name, const IAttributeManager *attribute_manager, bool useV8geoPositions) { - PositionsDFW::UP ret; if (attribute_manager != nullptr) { if (!attribute_name) { LOG(debug, "createPositionsDFW: missing attribute name '%p'", attribute_name); - return ret; + return {}; } IAttributeContext::UP context = attribute_manager->createContext(); if (!context.get()) { LOG(debug, "createPositionsDFW: could not create context from attribute manager"); - return ret; + return {}; } const IAttributeVector *attribute = context->getAttribute(attribute_name); if (!attribute) { LOG(debug, "createPositionsDFW: could not get attribute '%s' from context", attribute_name); - return ret; + return {}; } } return std::make_unique<PositionsDFW>(attribute_name, useV8geoPositions); @@ -254,21 +253,20 @@ PositionsDFW::UP PositionsDFW::create(const char *attribute_name, const IAttribu std::unique_ptr<DocsumFieldWriter> AbsDistanceDFW::create(const char *attribute_name, const IAttributeManager *attribute_manager) { - std::unique_ptr<DocsumFieldWriter> ret; if (attribute_manager != nullptr) { if (!attribute_name) { LOG(debug, "createAbsDistanceDFW: missing attribute name '%p'", attribute_name); - return ret; + return {}; } IAttributeContext::UP context = attribute_manager->createContext(); if (!context.get()) { LOG(debug, "createAbsDistanceDFW: could not create context from attribute manager"); - return ret; + return {}; } const IAttributeVector *attribute = context->getAttribute(attribute_name); if (!attribute) { LOG(debug, "createAbsDistanceDFW: could not get attribute '%s' from context", attribute_name); - return ret; + return {}; } } return std::make_unique<AbsDistanceDFW>(attribute_name); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h index d388b4d545f..5ac5f0fe051 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h @@ -57,7 +57,7 @@ class PositionsDFW : public AttrDFW private: bool _useV8geoPositions; public: - typedef std::unique_ptr<PositionsDFW> UP; + using UP = std::unique_ptr<PositionsDFW>; PositionsDFW(const vespalib::string & attrName, bool useV8geoPositions); bool IsGenerated() const override { return true; } void insertField(uint32_t docid, GetDocsumsState& state, vespalib::slime::Inserter &target) const override; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp index 781cd62a818..d19a111080f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp @@ -23,15 +23,16 @@ ResultClass::~ResultClass() = default; int ResultClass::GetIndexFromName(const char* name) const { - NameIdMap::const_iterator found(_nameMap.find(name)); + auto found = _nameMap.find(name); return (found != _nameMap.end()) ? found->second : -1; } bool ResultClass::AddConfigEntry(const char *name, ResType type, std::unique_ptr<DocsumFieldWriter> docsum_field_writer) { - if (_nameMap.find(name) != _nameMap.end()) + if (_nameMap.find(name) != _nameMap.end()) { return false; + } _nameMap[name] = _entries.size(); ResConfigEntry e; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp index 77714ddd98f..65b11a2b66f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp @@ -70,14 +70,14 @@ ResultConfig::set_default_result_class_id(uint32_t id) const ResultClass* ResultConfig::LookupResultClass(uint32_t id) const { - IdMap::const_iterator it(_classLookup.find(id)); + auto it = _classLookup.find(id); return (it != _classLookup.end()) ? it->second.get() : nullptr; } uint32_t ResultConfig::LookupResultClassId(const vespalib::string &name) const { - NameMap::const_iterator found(_nameLookup.find(name)); + auto found = _nameLookup.find(name); return (found != _nameLookup.end()) ? found->second : ((name.empty() || (name == "default")) ? _defaultSummaryId : NoClassID()); } |