summaryrefslogtreecommitdiffstats
path: root/searchlib/src/tests/predicate
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-12 11:52:50 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-12 12:35:27 +0200
commitdf577b2c1a7da715f46be30e475ac9260531db00 (patch)
tree77af2455aae67fd6a6cd2b496d4b78c5aa7082e6 /searchlib/src/tests/predicate
parent883ba0bd1f6fbbcc4e56a35038ac4c75e969e780 (diff)
add override in searchlib module
Diffstat (limited to 'searchlib/src/tests/predicate')
-rw-r--r--searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp4
-rw-r--r--searchlib/src/tests/predicate/predicate_index_test.cpp6
-rw-r--r--searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp4
-rw-r--r--searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp4
-rw-r--r--searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp4
-rw-r--r--searchlib/src/tests/predicate/simple_index_test.cpp11
6 files changed, 17 insertions, 16 deletions
diff --git a/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp
index 0f7802d63b0..26d4050f440 100644
--- a/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp
@@ -15,8 +15,8 @@ using namespace search::predicate;
namespace {
struct DummyDocIdLimitProvider : public DocIdLimitProvider {
- virtual uint32_t getDocIdLimit() const { return 10000; }
- virtual uint32_t getCommittedDocIdLimit() const { return 10000; }
+ virtual uint32_t getDocIdLimit() const override { return 10000; }
+ virtual uint32_t getCommittedDocIdLimit() const override { return 10000; }
};
vespalib::GenerationHandler generation_handler;
diff --git a/searchlib/src/tests/predicate/predicate_index_test.cpp b/searchlib/src/tests/predicate/predicate_index_test.cpp
index 5a6b6240e65..cf5c1d6bfb5 100644
--- a/searchlib/src/tests/predicate/predicate_index_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_index_test.cpp
@@ -19,8 +19,8 @@ using std::vector;
namespace {
struct DummyDocIdLimitProvider : public DocIdLimitProvider {
- virtual uint32_t getDocIdLimit() const { return 10000; }
- virtual uint32_t getCommittedDocIdLimit() const { return 10000; }
+ virtual uint32_t getDocIdLimit() const override { return 10000; }
+ virtual uint32_t getCommittedDocIdLimit() const override { return 10000; }
};
vespalib::GenerationHandler generation_handler;
@@ -256,7 +256,7 @@ struct DocIdLimitFinder : SimpleIndexDeserializeObserver<> {
{
doc_id_limit = 0u;
}
- void notifyInsert(uint64_t, uint32_t doc_id, uint32_t) {
+ void notifyInsert(uint64_t, uint32_t doc_id, uint32_t) override {
_doc_id_limit = std::max(_doc_id_limit, doc_id);
}
};
diff --git a/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp
index 18feb30106f..831e24026ec 100644
--- a/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp
@@ -14,8 +14,8 @@ using namespace search::predicate;
namespace {
struct DummyDocIdLimitProvider : public DocIdLimitProvider {
- virtual uint32_t getDocIdLimit() const { return 10000; }
- virtual uint32_t getCommittedDocIdLimit() const { return 10000; }
+ virtual uint32_t getDocIdLimit() const override { return 10000; }
+ virtual uint32_t getCommittedDocIdLimit() const override { return 10000; }
};
vespalib::GenerationHandler generation_handler;
diff --git a/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp
index 1751c725044..90e34c804e7 100644
--- a/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp
@@ -14,8 +14,8 @@ using namespace search::predicate;
namespace {
struct DummyDocIdLimitProvider : public DocIdLimitProvider {
- virtual uint32_t getDocIdLimit() const { return 10000; }
- virtual uint32_t getCommittedDocIdLimit() const { return 10000; }
+ virtual uint32_t getDocIdLimit() const override { return 10000; }
+ virtual uint32_t getCommittedDocIdLimit() const override { return 10000; }
};
vespalib::GenerationHandler generation_handler;
diff --git a/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp
index 5946bc926d0..dfa75d48019 100644
--- a/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp
@@ -16,8 +16,8 @@ using std::vector;
namespace {
struct DummyDocIdLimitProvider : public DocIdLimitProvider {
- virtual uint32_t getDocIdLimit() const { return 10000; }
- virtual uint32_t getCommittedDocIdLimit() const { return 10000; }
+ virtual uint32_t getDocIdLimit() const override { return 10000; }
+ virtual uint32_t getCommittedDocIdLimit() const override { return 10000; }
};
vespalib::GenerationHandler generation_handler;
diff --git a/searchlib/src/tests/predicate/simple_index_test.cpp b/searchlib/src/tests/predicate/simple_index_test.cpp
index f8a1d3f1366..933f21ebf3c 100644
--- a/searchlib/src/tests/predicate/simple_index_test.cpp
+++ b/searchlib/src/tests/predicate/simple_index_test.cpp
@@ -24,21 +24,22 @@ struct MyData {
};
struct MyDataSerializer : PostingSerializer<MyData> {
- void serialize(const MyData &data, vespalib::DataBuffer& buffer) const {
+ void serialize(const MyData &data, vespalib::DataBuffer& buffer) const override {
buffer.writeInt32(data.data);
}
};
struct MyDataDeserializer : PostingDeserializer<MyData> {
- MyData deserialize(vespalib::DataBuffer& buffer) { return {buffer.readInt32()};
+ MyData deserialize(vespalib::DataBuffer& buffer) override {
+ return {buffer.readInt32()};
}
};
struct SimpleDocIdLimitProvider : public DocIdLimitProvider {
uint32_t _doc_id_limit = 1;
uint32_t _committed_doc_id_limit = 1;
- virtual uint32_t getDocIdLimit() const { return _doc_id_limit; }
- virtual uint32_t getCommittedDocIdLimit() const { return _committed_doc_id_limit; }
+ virtual uint32_t getDocIdLimit() const override { return _doc_id_limit; }
+ virtual uint32_t getCommittedDocIdLimit() const override { return _committed_doc_id_limit; }
};
constexpr uint64_t key = 0x123456;
@@ -153,7 +154,7 @@ TEST_F("require that SimpleIndex can insert and remove many values.", Fixture) {
struct MyObserver : SimpleIndexDeserializeObserver<> {
std::map<uint32_t, uint64_t> features;
- void notifyInsert(uint64_t my_key, uint32_t my_doc_id, uint32_t) {
+ void notifyInsert(uint64_t my_key, uint32_t my_doc_id, uint32_t) override {
features[my_doc_id] = my_key;
}
bool hasSeenDoc(uint32_t doc) {