diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-03 14:31:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-03 14:31:47 +0200 |
commit | 0747d866d28f1f45332609ad1e0255f1e973bf08 (patch) | |
tree | 1131250e9f020d1782050b3b606f1d427bbcac4b /searchcorespi | |
parent | 807ee67b92a1ae1333d761cf6f58f6d0d8c2c23e (diff) | |
parent | 00114804d2eb23cada0b95d94fdf0b58635942aa (diff) |
Merge pull request #2365 from yahoo/balder/normal-include-searchcorespi
Fix warnings hidden earlier due to including application headers as s…
Diffstat (limited to 'searchcorespi')
7 files changed, 25 insertions, 29 deletions
diff --git a/searchcorespi/src/vespa/searchcorespi/flush/closureflushtask.h b/searchcorespi/src/vespa/searchcorespi/flush/closureflushtask.h index 0cd653770fb..be2bc390fe5 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/closureflushtask.h +++ b/searchcorespi/src/vespa/searchcorespi/flush/closureflushtask.h @@ -19,15 +19,11 @@ public: { } - virtual search::SerialNum - getFlushSerial() const - { + search::SerialNum getFlushSerial() const override { return _flushSerial; } - virtual void - run() - { + void run() override { _closure->call(); } }; @@ -39,9 +35,7 @@ static inline FlushTask::UP makeFlushTask(std::unique_ptr<vespalib::Closure> closure, search::SerialNum flushSerial) { - return FlushTask::UP(new ClosureFlushTask(std::move(closure), - flushSerial)); + return FlushTask::UP(new ClosureFlushTask(std::move(closure), flushSerial)); } } // namespace searchcorespi - diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp index 85cf1efe4fe..f86e7e85c7b 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp +++ b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp @@ -33,6 +33,8 @@ IndexCollection::IndexCollection(const ISourceSelector::SP & selector, setCurrentIndex(sources.getCurrentIndex()); } +IndexCollection::~IndexCollection() {} + void IndexCollection::setSource(uint32_t docId) { diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h index 730c0376ec7..f9246c60fda 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h +++ b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h @@ -31,6 +31,7 @@ class IndexCollection : public ISearchableIndexCollection public: IndexCollection(const ISourceSelectorSP & selector); IndexCollection(const ISourceSelectorSP & selector, const ISearchableIndexCollection &sources); + ~IndexCollection(); void append(uint32_t id, const IndexSearchable::SP &source) override; void replace(uint32_t id, const IndexSearchable::SP &source) override; diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.cpp index 7b2088aeffe..114ee6feaf8 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.cpp +++ b/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.cpp @@ -1,11 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".searchcorespi.index.indexflushtarget"); #include "indexflushtarget.h" #include <vespa/vespalib/util/closuretask.h> +#include <vespa/log/log.h> +LOG_SETUP(".searchcorespi.index.indexflushtarget"); + using vespalib::makeClosure; namespace searchcorespi { @@ -22,6 +22,8 @@ IndexFlushTarget::IndexFlushTarget(IndexMaintainer &indexMaintainer) _lastStats.setPathElementsToLog(7); } +IndexFlushTarget::~IndexFlushTarget() {} + IFlushTarget::MemoryGain IndexFlushTarget::getApproxMemoryGain() const { diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h b/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h index 3919265272c..6a4a4ec1ef6 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h +++ b/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/searchcorespi/flush/iflushtarget.h> #include "indexmaintainer.h" +#include <vespa/searchcorespi/flush/iflushtarget.h> namespace searchcorespi { namespace index { @@ -20,6 +20,7 @@ private: public: IndexFlushTarget(IndexMaintainer &indexMaintainer); + ~IndexFlushTarget(); // Implements IFlushTarget virtual MemoryGain getApproxMemoryGain() const override; @@ -27,8 +28,7 @@ public: virtual SerialNum getFlushedSerialNum() const override; virtual Time getLastFlushTime() const override; - virtual bool - needUrgentFlush() const override; + virtual bool needUrgentFlush() const override; virtual Task::UP initFlush(SerialNum currentSerial) override; virtual FlushStats getLastFlushStats() const override { return _lastStats; } diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp index 62308100b7e..ba03ab90393 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp +++ b/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp @@ -1,13 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".searchcorespi.index.indexfusiontarget"); #include "indexfusiontarget.h" -#include "fusionspec.h" -namespace searchcorespi { -namespace index { +#include <vespa/log/log.h> +LOG_SETUP(".searchcorespi.index.indexfusiontarget"); + +namespace searchcorespi::index { using search::SerialNum; namespace { @@ -44,6 +42,8 @@ IndexFusionTarget::IndexFusionTarget(IndexMaintainer &indexMaintainer) LOG(debug, "New target, Num flushed: %d, Disk usage: %" PRIu64, _fusionStats.numUnfused, _fusionStats.diskUsage); } +IndexFusionTarget::~IndexFusionTarget() {} + IFlushTarget::MemoryGain IndexFusionTarget::getApproxMemoryGain() const { @@ -103,5 +103,4 @@ IndexFusionTarget::getApproxBytesToWriteToDisk() const } -} // namespace index -} // namespace searchcorespi +} diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h b/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h index b9dd7b48d54..3554d426315 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h +++ b/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h @@ -1,11 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/searchcorespi/flush/iflushtarget.h> #include "indexmaintainer.h" +#include <vespa/searchcorespi/flush/iflushtarget.h> -namespace searchcorespi { -namespace index { +namespace searchcorespi::index { /** * Flush target for doing fusion on disk indexes in an IndexMaintainer. @@ -18,6 +17,7 @@ private: public: IndexFusionTarget(IndexMaintainer &indexMaintainer); + ~IndexFusionTarget(); // Implements IFlushTarget virtual MemoryGain getApproxMemoryGain() const override; @@ -31,6 +31,4 @@ public: virtual uint64_t getApproxBytesToWriteToDisk() const override; }; -} // namespace index -} // namespace searchcorespi - +} |