summaryrefslogtreecommitdiffstats
path: root/searchcorespi
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-12 11:52:52 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-12 12:35:29 +0200
commit209472f6181b51c920b50d81e4ec76007a9a5118 (patch)
treebcf0309df294e335e0ec1b8f7deb6a0041366e3f /searchcorespi
parentce41fe189e8628551a9e61571952ed683f09f667 (diff)
add override in searchcorespi module
Diffstat (limited to 'searchcorespi')
-rw-r--r--searchcorespi/src/tests/plugin/factoryregistry_test.cpp4
-rw-r--r--searchcorespi/src/tests/plugin/plugin.cpp16
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp44
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h14
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp4
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h16
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp4
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h2
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h2
9 files changed, 53 insertions, 53 deletions
diff --git a/searchcorespi/src/tests/plugin/factoryregistry_test.cpp b/searchcorespi/src/tests/plugin/factoryregistry_test.cpp
index 3c0214576c8..cc71f1c2005 100644
--- a/searchcorespi/src/tests/plugin/factoryregistry_test.cpp
+++ b/searchcorespi/src/tests/plugin/factoryregistry_test.cpp
@@ -15,13 +15,13 @@ struct MyFactory : IIndexManagerFactory {
virtual IIndexManager::UP createIndexManager(const IndexManagerConfig &,
const index::IndexMaintainerConfig &,
- const index::IndexMaintainerContext &) {
+ const index::IndexMaintainerContext &) override {
return IIndexManager::UP();
}
virtual config::ConfigKeySet getConfigKeys(
const string &,
const search::index::Schema &,
- const config::ConfigInstance &) {
+ const config::ConfigInstance &) override {
return config::ConfigKeySet();
}
};
diff --git a/searchcorespi/src/tests/plugin/plugin.cpp b/searchcorespi/src/tests/plugin/plugin.cpp
index eff33e69464..839c026607c 100644
--- a/searchcorespi/src/tests/plugin/plugin.cpp
+++ b/searchcorespi/src/tests/plugin/plugin.cpp
@@ -19,18 +19,18 @@ public:
virtual void putDocument(uint32_t, const Document &, SerialNum) override { }
virtual void removeDocument(uint32_t, SerialNum) override { }
virtual void commit(SerialNum, OnWriteDoneType) override { }
- virtual void heartBeat(SerialNum ) {}
- virtual SerialNum getCurrentSerialNum() const { return 0; }
- virtual SerialNum getFlushedSerialNum() const { return 0; }
- virtual IndexSearchable::SP getSearchable() const {
+ virtual void heartBeat(SerialNum ) override {}
+ virtual SerialNum getCurrentSerialNum() const override { return 0; }
+ virtual SerialNum getFlushedSerialNum() const override { return 0; }
+ virtual IndexSearchable::SP getSearchable() const override {
IndexSearchable::SP s;
return s;
}
- virtual SearchableStats getSearchableStats() const {
+ virtual SearchableStats getSearchableStats() const override {
SearchableStats s;
return s;
}
- virtual searchcorespi::IFlushTarget::List getFlushTargets() {
+ virtual searchcorespi::IFlushTarget::List getFlushTargets() override {
searchcorespi::IFlushTarget::List l;
return l;
}
@@ -43,11 +43,11 @@ class IndexManagerFactory : public searchcorespi::IIndexManagerFactory
public:
virtual IIndexManager::UP createIndexManager(const IndexManagerConfig &managerCfg,
const index::IndexMaintainerConfig &maintainerConfig,
- const index::IndexMaintainerContext &maintainerContext);
+ const index::IndexMaintainerContext &maintainerContext) override;
virtual ConfigKeySet getConfigKeys(const string &configId,
const Schema &schema,
- const ConfigInstance &rootConfig);
+ const ConfigInstance &rootConfig) override;
};
IIndexManager::UP
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp
index 9bc5e547462..85cf1efe4fe 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp
@@ -177,28 +177,28 @@ private:
_result = mixer.mix();
}
- virtual void visit(And &) { }
- virtual void visit(AndNot &) { }
- virtual void visit(Or &) { }
- virtual void visit(WeakAnd &) { }
- virtual void visit(Equiv &) { }
- virtual void visit(Rank &) { }
- virtual void visit(Near &) { }
- virtual void visit(ONear &) { }
-
- virtual void visit(WeightedSetTerm &n) { visitTerm(n); }
- virtual void visit(DotProduct &n) { visitTerm(n); }
- virtual void visit(WandTerm &n) { visitTerm(n); }
- virtual void visit(Phrase &n) { visitTerm(n); }
- virtual void visit(NumberTerm &n) { visitTerm(n); }
- virtual void visit(LocationTerm &n) { visitTerm(n); }
- virtual void visit(PrefixTerm &n) { visitTerm(n); }
- virtual void visit(RangeTerm &n) { visitTerm(n); }
- virtual void visit(StringTerm &n) { visitTerm(n); }
- virtual void visit(SubstringTerm &n) { visitTerm(n); }
- virtual void visit(SuffixTerm &n) { visitTerm(n); }
- virtual void visit(PredicateQuery &n) { visitTerm(n); }
- virtual void visit(RegExpTerm &n) { visitTerm(n); }
+ virtual void visit(And &) override { }
+ virtual void visit(AndNot &) override { }
+ virtual void visit(Or &) override { }
+ virtual void visit(WeakAnd &) override { }
+ virtual void visit(Equiv &) override { }
+ virtual void visit(Rank &) override { }
+ virtual void visit(Near &) override { }
+ virtual void visit(ONear &) override { }
+
+ virtual void visit(WeightedSetTerm &n) override { visitTerm(n); }
+ virtual void visit(DotProduct &n) override { visitTerm(n); }
+ virtual void visit(WandTerm &n) override { visitTerm(n); }
+ virtual void visit(Phrase &n) override { visitTerm(n); }
+ virtual void visit(NumberTerm &n) override { visitTerm(n); }
+ virtual void visit(LocationTerm &n) override { visitTerm(n); }
+ virtual void visit(PrefixTerm &n) override { visitTerm(n); }
+ virtual void visit(RangeTerm &n) override { visitTerm(n); }
+ virtual void visit(StringTerm &n) override { visitTerm(n); }
+ virtual void visit(SubstringTerm &n) override { visitTerm(n); }
+ virtual void visit(SuffixTerm &n) override { visitTerm(n); }
+ virtual void visit(PredicateQuery &n) override { visitTerm(n); }
+ virtual void visit(RegExpTerm &n) override { visitTerm(n); }
public:
CreateBlueprintVisitor(const IIndexCollection &indexes,
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h b/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h
index fa4b2ad85fb..3919265272c 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h
@@ -22,16 +22,16 @@ public:
IndexFlushTarget(IndexMaintainer &indexMaintainer);
// Implements IFlushTarget
- virtual MemoryGain getApproxMemoryGain() const;
- virtual DiskGain getApproxDiskGain() const;
- virtual SerialNum getFlushedSerialNum() const;
- virtual Time getLastFlushTime() const;
+ virtual MemoryGain getApproxMemoryGain() const override;
+ virtual DiskGain getApproxDiskGain() const override;
+ virtual SerialNum getFlushedSerialNum() const override;
+ virtual Time getLastFlushTime() const override;
virtual bool
- needUrgentFlush() const;
+ needUrgentFlush() const override;
- virtual Task::UP initFlush(SerialNum currentSerial);
- virtual FlushStats getLastFlushStats() const { return _lastStats; }
+ virtual Task::UP initFlush(SerialNum currentSerial) override;
+ virtual FlushStats getLastFlushStats() const override { return _lastStats; }
virtual uint64_t getApproxBytesToWriteToDisk() const override;
};
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp
index 412c5b8c4a2..62308100b7e 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp
@@ -20,14 +20,14 @@ private:
public:
Fusioner(IndexMaintainer &indexMaintainer, FlushStats &stats, SerialNum serialNum) :
_indexMaintainer(indexMaintainer), _stats(stats), _serialNum(serialNum) {}
- virtual void run() {
+ virtual void run() override {
vespalib::string outputFusionDir = _indexMaintainer.doFusion(_serialNum);
// the target must live until this task is done (handled by flush engine).
_stats.setPath(outputFusionDir);
}
virtual SerialNum
- getFlushSerial(void) const
+ getFlushSerial(void) const override
{
return 0u; // Zero means that no tls syncing is needed
}
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h b/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h
index 6b67a150cec..b9dd7b48d54 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h
@@ -20,14 +20,14 @@ public:
IndexFusionTarget(IndexMaintainer &indexMaintainer);
// Implements IFlushTarget
- virtual MemoryGain getApproxMemoryGain() const;
- virtual DiskGain getApproxDiskGain() const;
- virtual SerialNum getFlushedSerialNum() const;
- virtual Time getLastFlushTime() const;
- virtual bool needUrgentFlush() const;
-
- virtual Task::UP initFlush(SerialNum currentSerial);
- virtual FlushStats getLastFlushStats() const { return _lastStats; }
+ virtual MemoryGain getApproxMemoryGain() const override;
+ virtual DiskGain getApproxDiskGain() const override;
+ virtual SerialNum getFlushedSerialNum() const override;
+ virtual Time getLastFlushTime() const override;
+ virtual bool needUrgentFlush() const override;
+
+ virtual Task::UP initFlush(SerialNum currentSerial) override;
+ virtual FlushStats getLastFlushStats() const override { return _lastStats; }
virtual uint64_t getApproxBytesToWriteToDisk() const override;
};
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
index c075e98e1fc..795bf67f48e 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
@@ -59,7 +59,7 @@ public:
_closure(std::move(closure))
{ }
- virtual void run() {
+ virtual void run() override {
_result = _reconfigurer.reconfigure(std::move(_closure));
}
};
@@ -73,7 +73,7 @@ public:
_reconfigurer(reconfigurer),
_closure(std::move(closure))
{ }
- virtual void run() {
+ virtual void run() override {
_reconfigurer.reconfigure(std::move(_closure));
}
};
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
index 34c25632012..b8f5e668701 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
@@ -283,7 +283,7 @@ class IndexMaintainer : public IIndexManager,
* result.
*/
bool reconfigure(vespalib::Closure0<bool>::UP closure);
- virtual void warmupDone(ISearchableIndexCollection::SP current);
+ virtual void warmupDone(ISearchableIndexCollection::SP current) override;
bool makeSureAllRemainingWarmupIsDone(ISearchableIndexCollection::SP keepAlive);
void scheduleCommit();
void commit();
diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h
index 7f96b401268..376cdca4f40 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h
@@ -47,7 +47,7 @@ public:
Blueprint::UP
createBlueprint(const IRequestContext & requestContext,
const FieldSpecList &fields,
- const Node &term);
+ const Node &term) override;
search::SearchableStats getSearchableStats() const override;
search::SerialNum getSerialNum() const override;
void accept(IndexSearchableVisitor &visitor) const override;