std::make_shared

1 files changed, 25 insertions, 25 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index eb1cc7f0256..7c4e8834104 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -99,11 +99,11 @@ createAttribute(const vespalib::string & name, const document::FieldValue & fv)
     AttributeVector::SP attr;
 
     if (fv.inherits(document::ByteFieldValue::classId) || fv.inherits(document::IntFieldValue::classId) || fv.inherits(document::LongFieldValue::classId)) {
-        attr.reset(new search::SingleIntegerExtAttribute(name));
+        return std::make_shared<search::SingleIntegerExtAttribute>(name);
     } else if (fv.inherits(document::DoubleFieldValue::classId) || fv.inherits(document::FloatFieldValue::classId)) {
-        attr.reset(new search::SingleFloatExtAttribute(name));
+        return std::make_shared<search::SingleFloatExtAttribute>(name);
     } else if (fv.inherits(document::StringFieldValue::classId)) {
-        attr.reset(new search::SingleStringExtAttribute(name));
+        return std::make_shared<search::SingleStringExtAttribute>(name);
     } else {
         LOG(debug, "Can not make an attribute out of %s of type '%s'.", name.c_str(), fv.getClass().name());
     }
@@ -120,7 +120,7 @@ SearchVisitor::SummaryGenerator::SummaryGenerator() :
 {
 }
 
-SearchVisitor::SummaryGenerator::~SummaryGenerator() { }
+SearchVisitor::SummaryGenerator::~SummaryGenerator() = default;
 
 
 vespalib::ConstBufferRef
@@ -137,7 +137,7 @@ SearchVisitor::SummaryGenerator::fillSummary(AttributeVector::DocId lid, const H
 
 void SearchVisitor::HitsResultPreparator::execute(vespalib::Identifiable & obj)
 {
-    HitsAggregationResult & hitsAggr(static_cast<HitsAggregationResult &>(obj));
+    auto & hitsAggr(static_cast<HitsAggregationResult &>(obj));
     hitsAggr.setSummaryGenerator(_summaryGenerator);
     _numHitsAggregators++;
 }
@@ -154,7 +154,7 @@ SearchVisitor::GroupingEntry::GroupingEntry(Grouping * grouping) :
 {
 }
 
-SearchVisitor::GroupingEntry::~GroupingEntry() { }
+SearchVisitor::GroupingEntry::~GroupingEntry() = default;
 
 void SearchVisitor::GroupingEntry::aggregate(const document::Document & doc, search::HitRank rank)
 {
@@ -175,7 +175,7 @@ SearchVisitor::SearchVisitor(StorageComponent& component,
                              VisitorEnvironment& vEnv,
                              const Parameters& params) :
     Visitor(component),
-    _env(static_cast<SearchEnvironment &>(vEnv)),
+    _env(dynamic_cast<SearchEnvironment &>(vEnv)),
     _params(params),
     _vsmAdapter(nullptr),
     _docSearchedCount(0),
@@ -240,9 +240,9 @@ void SearchVisitor::init(const Parameters & params)
         LOG(debug, "QFLAG_DUMP_FEATURES: %s", _rankController.getDumpFeatures() ? "true" : "false");
     }
 
-    if (params.lookup("rankproperties", valueRef) && valueRef.size() > 0) {
+    if (params.lookup("rankproperties", valueRef) && ! valueRef.empty()) {
         LOG(spam, "Received rank properties of %zd bytes", valueRef.size());
-        uint32_t len = static_cast<uint32_t>(valueRef.size());
+        uint32_t len = uint32_t(valueRef.size());
         char * data = const_cast<char *>(valueRef.data());
         FNET_DataBuffer src(data, len);
         uint32_t cnt = src.ReadInt32();
@@ -403,7 +403,7 @@ SearchVisitor::PositionInserter::PositionInserter(AttributeVector & attribute, A
 {
 }
 
-SearchVisitor::PositionInserter::~PositionInserter() {}
+SearchVisitor::PositionInserter::~PositionInserter() = default;
 
 void
 SearchVisitor::PositionInserter::onPrimitive(uint32_t, const Content & c)
@@ -414,7 +414,7 @@ SearchVisitor::PositionInserter::onPrimitive(uint32_t, const Content & c)
 void
 SearchVisitor::PositionInserter::onStructStart(const Content & c)
 {
-    const document::StructuredFieldValue & value = static_cast<const document::StructuredFieldValue &>(c.getValue());
+    const auto & value = static_cast<const document::StructuredFieldValue &>(c.getValue());
     LOG(debug, "PositionInserter: Adding value '%s'(%d) to attribute '%s' for docid '%d'",
         value.toString().c_str(), c.getWeight(), _attribute.getName().c_str(), _docId);
 
@@ -445,7 +445,7 @@ SearchVisitor::RankController::processHintedAttributes(const IndexEnvironment &
                 AttributeGuard::UP attr(attrMan.getAttribute(name));
                 if (attr->valid()) {
                     LOG(debug, "Add attribute '%s' with field id '%u' to the list of needed attributes", name.c_str(), fid);
-                    attributeFields.push_back(AttrInfo(fid, std::move(attr)));
+                    attributeFields.emplace_back(fid, std::move(attr));
                 } else {
                     LOG(warning, "Cannot locate attribute '%s' in the attribute manager. "
                         "Ignore access hint about this attribute", name.c_str());
@@ -470,7 +470,7 @@ SearchVisitor::RankController::RankController() :
 {
 }
 
-SearchVisitor::RankController::~RankController() {}
+SearchVisitor::RankController::~RankController() = default;
 
 void
 SearchVisitor::RankController::setupRankProcessors(Query & query,
@@ -485,7 +485,7 @@ SearchVisitor::RankController::setupRankProcessors(Query & query,
     const IndexEnvironment & indexEnv = _rankManagerSnapshot->getIndexEnvironment(_rankProfile);
     processHintedAttributes(indexEnv, true, attrMan, attributeFields);
 
-    _rankProcessor.reset(new RankProcessor(_rankManagerSnapshot, _rankProfile, query, location, _queryProperties, &attrMan));
+    _rankProcessor = std::make_unique<RankProcessor>(_rankManagerSnapshot, _rankProfile, query, location, _queryProperties, &attrMan);
     LOG(debug, "Initialize rank processor");
     _rankProcessor->initForRanking(wantedHitCount);
 
@@ -493,7 +493,7 @@ SearchVisitor::RankController::setupRankProcessors(Query & query,
         // register attribute vectors needed for dumping
         processHintedAttributes(indexEnv, false, attrMan, attributeFields);
 
-        _dumpProcessor.reset(new RankProcessor(_rankManagerSnapshot, _rankProfile, query, location, _queryProperties, &attrMan));
+        _dumpProcessor = std::make_unique<RankProcessor>(_rankManagerSnapshot, _rankProfile, query, location, _queryProperties, &attrMan);
         LOG(debug, "Initialize dump processor");
         _dumpProcessor->initForDumping(wantedHitCount);
     }
@@ -620,14 +620,14 @@ SearchVisitor::registerAdditionalFields(const std::vector<vsm::DocsumTools::Fiel
         for (size_t j = 0; j < inputNames.size(); ++j) {
             fieldList.push_back(inputNames[j]);
             if (PositionDataType::isZCurveFieldName(inputNames[j])) {
-                fieldList.push_back(PositionDataType::cutZCurveFieldName(inputNames[j]));
+                fieldList.emplace_back(PositionDataType::cutZCurveFieldName(inputNames[j]));
             }
         }
     }
     // fields used during sorting
-    fieldList.push_back("[docid]");
-    fieldList.push_back("[rank]");
-    fieldList.push_back("documentid");
+    fieldList.emplace_back("[docid]");
+    fieldList.emplace_back("[rank]");
+    fieldList.emplace_back("documentid");
 }
 
 void
@@ -710,7 +710,7 @@ SearchVisitor::setupDocsumObjects()
                            }
                         }
                         if (index == _attributeFields.size()) {
-                            _attributeFields.push_back(AttrInfo(fid, std::move(attr)));
+                            _attributeFields.emplace_back(fid, std::move(attr));
                         }
                    } else {
                        LOG(warning, "Attribute '%s' is not valid", name.c_str());
@@ -764,7 +764,7 @@ void SearchVisitor::setupAttributeVector(const FieldPath &fieldPath) {
         attr = createAttribute(attrName, fv);
     }
 
-    if (attr.get()) {
+    if (attr) {
         LOG(debug, "Adding attribute '%s' for field '%s' with data type '%s' (%s)",
             attr->getName().c_str(), attrName.c_str(), fv.getDataType()->getName().c_str(), fv.getClass().name());
         if ( ! _attrMan.add(attr) ) {
@@ -796,7 +796,7 @@ SearchVisitor::setupAttributeVectorsForSorting(const search::common::SortSpec &
                             }
                         }
                         if (index == _attributeFields.size()) {
-                            _attributeFields.push_back(AttrInfo(fid, std::move(attr), sInfo._ascending, sInfo._converter.get()));
+                            _attributeFields.emplace_back(fid, std::move(attr), sInfo._ascending, sInfo._converter.get());
                         }
                         _sortList.push_back(index);
                     } else {
@@ -849,8 +849,8 @@ SearchVisitor::setupGrouping(const std::vector<char> & groupingBlob)
 class SingleDocumentStore : public vsm::IDocSumCache
 {
 public:
-    SingleDocumentStore(const StorageDocument & doc) : _doc(doc) { }
-    virtual const vsm::Document & getDocSum(const search::DocumentIdT & docId) const override {
+    explicit SingleDocumentStore(const StorageDocument & doc) : _doc(doc) { }
+    const vsm::Document & getDocSum(const search::DocumentIdT & docId) const override {
         (void) docId;
         return _doc;
     }
@@ -1001,7 +1001,7 @@ SearchVisitor::fillAttributeVectors(const vespalib::string & documentId, const S
             fieldId = _fieldsUnion.find(org)->second;
         }
         const StorageDocument::SubDocument & subDoc = document.getComplexField(fieldId);
-        AttributeVector & attrV = const_cast<AttributeVector & >(*finfoGuard);
+        auto & attrV = const_cast<AttributeVector & >(*finfoGuard);
         AttributeVector::DocId docId(0);
         attrV.addDoc(docId);
         if (subDoc.getFieldValue() != nullptr) {