diff options
author | Henning Baldersheim <balder@oath.com> | 2018-07-23 09:46:23 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-07-23 09:46:23 +0200 |
commit | 4d887689f9afc4fc74873b6362211d1db252e0b9 (patch) | |
tree | d6566d1e60cd7cf1819446ee93959c7ebf9764fa | |
parent | a2b96031d9dd0df98169ad3d2ad6ce3b1710eefc (diff) |
- = default for destructors.
- nested namespace
- std::make_unique
4 files changed, 15 insertions, 23 deletions
diff --git a/searchcore/src/vespa/searchcore/grouping/groupingmanager.cpp b/searchcore/src/vespa/searchcore/grouping/groupingmanager.cpp index 48baba329ca..3ef5a0f63b1 100644 --- a/searchcore/src/vespa/searchcore/grouping/groupingmanager.cpp +++ b/searchcore/src/vespa/searchcore/grouping/groupingmanager.cpp @@ -21,9 +21,7 @@ GroupingManager::GroupingManager(GroupingContext & groupingContext) { } -GroupingManager::~GroupingManager() -{ -} +GroupingManager::~GroupingManager() = default; using search::expression::ExpressionNode; using search::expression::AttributeNode; diff --git a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp index 325803d5aa6..dedda1504a5 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp @@ -24,7 +24,7 @@ ResultProcessor::Result::Result(std::unique_ptr<search::engine::SearchReply> rep _numFs4Hits(numFs4Hits) { } -ResultProcessor::Result::~Result() { } +ResultProcessor::Result::~Result() = default; ResultProcessor::Sort::Sort(uint32_t partitionId, const vespalib::Doom & doom, IAttributeContext &ac, const vespalib::string &ss) : sorter(FastS_DefaultResultSorter::instance()), @@ -43,7 +43,7 @@ ResultProcessor::Context::Context(Sort::UP s, PartialResult::UP r, GroupingConte groupingSource(grouping.get()) { } -ResultProcessor::Context::~Context() { } +ResultProcessor::Context::~Context() = default; void ResultProcessor::GroupingSource::merge(Source &s) { @@ -75,11 +75,11 @@ ResultProcessor::ResultProcessor(IAttributeContext &attrContext, _wasMerged(false) { if (!_groupingContext.empty()) { - _groupingSession.reset(new GroupingSession(sessionId, _groupingContext, attrContext)); + _groupingSession = std::make_unique<GroupingSession>(sessionId, _groupingContext, attrContext); } } -ResultProcessor::~ResultProcessor() { } +ResultProcessor::~ResultProcessor() = default; void ResultProcessor::prepareThreadContextCreation(size_t num_threads) @@ -95,19 +95,19 @@ ResultProcessor::prepareThreadContextCreation(size_t num_threads) ResultProcessor::Context::UP ResultProcessor::createThreadContext(const vespalib::Doom & hardDoom, size_t thread_id, uint32_t distributionKey) { - Sort::UP sort(new Sort(distributionKey, hardDoom, _attrContext, _sortSpec)); - PartialResult::UP result(new PartialResult((_offset + _hits), sort->hasSortData())); + auto sort = std::make_unique<Sort>(distributionKey, hardDoom, _attrContext, _sortSpec); + auto result = std::make_unique<PartialResult>((_offset + _hits), sort->hasSortData()); search::grouping::GroupingContext::UP groupingContext; - if (_groupingSession.get() != 0) { + if (_groupingSession) { groupingContext = _groupingSession->createThreadContext(thread_id, _attrContext); } - return Context::UP(new Context(std::move(sort), std::move(result), std::move(groupingContext))); + return std::make_unique<Context>(std::move(sort), std::move(result), std::move(groupingContext)); } ResultProcessor::Result::UP ResultProcessor::makeReply(PartialResultUP full_result) { - search::engine::SearchReply::UP reply(new search::engine::SearchReply()); + auto reply = std::make_unique<search::engine::SearchReply>(); const search::IDocumentMetaStore &metaStore = _metaStore; search::engine::SearchReply &r = *reply; PartialResult &result = *full_result; @@ -158,7 +158,7 @@ ResultProcessor::makeReply(PartialResultUP full_result) assert(sortOffset == sortDataSize); } numFs4Hits += reply->hits.size(); - return Result::UP(new Result(std::move(reply), numFs4Hits)); + return std::make_unique<Result>(std::move(reply), numFs4Hits); } } diff --git a/searchlib/src/vespa/searchlib/queryeval/andnotsearch.cpp b/searchlib/src/vespa/searchlib/queryeval/andnotsearch.cpp index 77f8e454035..5646af9e677 100644 --- a/searchlib/src/vespa/searchlib/queryeval/andnotsearch.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/andnotsearch.cpp @@ -4,8 +4,7 @@ #include "termwise_helper.h" #include <vespa/searchlib/common/bitvector.h> -namespace search { -namespace queryeval { +namespace search::queryeval { void AndNotSearch::doSeek(uint32_t docid) @@ -160,5 +159,4 @@ AndNotSearch::or_hits_into(BitVector &result, uint32_t begin_id) { result.orWith(*get_hits(begin_id)); } -} // namespace queryeval -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/queryeval/andnotsearch.h b/searchlib/src/vespa/searchlib/queryeval/andnotsearch.h index e805448ef98..c29ef9407ad 100644 --- a/searchlib/src/vespa/searchlib/queryeval/andnotsearch.h +++ b/searchlib/src/vespa/searchlib/queryeval/andnotsearch.h @@ -2,13 +2,11 @@ #pragma once -#include <vector> #include "multisearch.h" #include <vespa/searchlib/attribute/attributeiterators.h> #include <vespa/searchlib/attribute/singlesmallnumericattribute.h> -namespace search { -namespace queryeval { +namespace search::queryeval { /** * A simple implementation of the AndNot search operation. @@ -97,6 +95,4 @@ private: void doUnpack(uint32_t docid) override; }; -} // namespace queryeval -} // namespace search - +} |