refactor: apply modernize-use-override across codebase (#442)

- Remove redundant `virtual` keyword from methods already marked `override`
- Replace `virtual ~Derived()` with `~Derived() override` for derived class destructors
- Add missing `override` on methods that override base class virtuals
This commit is contained in:
egolearner
2026-06-02 13:49:39 +08:00
committed by GitHub
parent df447a54e2
commit 3d6906ca20
56 changed files with 540 additions and 576 deletions
+21 -22
View File
@@ -28,7 +28,7 @@ class IVFBuilder : public IndexBuilder {
IVFBuilder();
//! Destructor
~IVFBuilder();
~IVFBuilder() override;
//! Disable them
IVFBuilder(const IVFBuilder &) = delete;
@@ -36,28 +36,27 @@ class IVFBuilder : public IndexBuilder {
public:
//! Initialize the builder
virtual int init(const IndexMeta &meta,
const ailego::Params &params) override;
int init(const IndexMeta &meta, const ailego::Params &params) override;
//! Cleanup the builder
virtual int cleanup(void) override;
int cleanup(void) override;
//! Train the data
virtual int train(IndexThreads::Pointer threads,
IndexHolder::Pointer holder) override;
int train(IndexThreads::Pointer threads,
IndexHolder::Pointer holder) override;
//! Train the data
virtual int train(const IndexTrainer::Pointer &trainer) override;
int train(const IndexTrainer::Pointer &trainer) override;
//! Build the index
virtual int build(IndexThreads::Pointer threads,
IndexHolder::Pointer holder) override;
int build(IndexThreads::Pointer threads,
IndexHolder::Pointer holder) override;
//! Dump index into file system
virtual int dump(const IndexDumper::Pointer &dumper) override;
int dump(const IndexDumper::Pointer &dumper) override;
//! Retrieve statistics
virtual const Stats &stats(void) const override {
const Stats &stats(void) const override {
return stats_;
}
@@ -84,25 +83,25 @@ class IVFBuilder : public IndexBuilder {
Iterator(RandomAccessIndexHolder *owner) : holder_(owner) {}
//! Destructor
virtual ~Iterator(void) {}
~Iterator(void) override {}
//! Retrieve pointer of data
virtual const void *data(void) const override {
const void *data(void) const override {
return holder_->element(id_);
}
//! Test if the iterator is valid
virtual bool is_valid(void) const override {
bool is_valid(void) const override {
return id_ < holder_->count();
}
//! Retrieve primary key
virtual uint64_t key(void) const override {
uint64_t key(void) const override {
return holder_->key(id_);
}
//! Next iterator
virtual void next(void) override {
void next(void) override {
++id_;
}
@@ -117,32 +116,32 @@ class IVFBuilder : public IndexBuilder {
: features_(std::make_shared<CompactIndexFeatures>(meta)) {}
//! Retrieve count of elements in holder (-1 indicates unknown)
virtual size_t count(void) const override {
size_t count(void) const override {
return features_->count();
}
//! Retrieve dimension
virtual size_t dimension(void) const override {
size_t dimension(void) const override {
return features_->dimension();
}
//! Retrieve type information
virtual IndexMeta::DataType data_type(void) const override {
IndexMeta::DataType data_type(void) const override {
return features_->data_type();
}
//! Retrieve element size in bytes
virtual size_t element_size(void) const override {
size_t element_size(void) const override {
return features_->element_size();
}
//! Retrieve if it can multi-pass
virtual bool multipass(void) const override {
bool multipass(void) const override {
return true;
}
//! Create a new iterator
virtual IndexHolder::Iterator::Pointer create_iterator(void) override {
IndexHolder::Iterator::Pointer create_iterator(void) override {
return IndexHolder::Iterator::Pointer(
new RandomAccessIndexHolder::Iterator(this));
}
+11 -11
View File
@@ -114,25 +114,25 @@ class IVFCentroidIndex {
Iterator(std::vector<const void *> *features) : features_(features) {}
//! Destructor
virtual ~Iterator(void) {}
~Iterator(void) override {}
//! Retrieve pointer of data
virtual const void *data(void) const override {
const void *data(void) const override {
return (*features_)[id_];
}
//! Test if the iterator is valid
virtual bool is_valid(void) const override {
bool is_valid(void) const override {
return id_ < features_->size();
}
//! Retrieve primary key
virtual uint64_t key(void) const override {
uint64_t key(void) const override {
return id_;
}
//! Next iterator
virtual void next(void) override {
void next(void) override {
++id_;
}
@@ -168,32 +168,32 @@ class IVFCentroidIndex {
}
//! Retrieve count of elements in holder (-1 indicates unknown)
virtual size_t count(void) const override {
size_t count(void) const override {
return features_.size();
}
//! Retrieve dimension
virtual size_t dimension(void) const override {
size_t dimension(void) const override {
return dimension_;
}
//! Retrieve type information
virtual IndexMeta::DataType data_type(void) const override {
IndexMeta::DataType data_type(void) const override {
return data_type_;
}
//! Retrieve element size in bytes
virtual size_t element_size(void) const override {
size_t element_size(void) const override {
return element_size_;
}
//! Retrieve if it can multi-pass
virtual bool multipass(void) const override {
bool multipass(void) const override {
return true;
}
//! Create a new iterator
virtual IndexHolder::Iterator::Pointer create_iterator(void) override {
IndexHolder::Iterator::Pointer create_iterator(void) override {
return IndexHolder::Iterator::Pointer(
new CentroidsIndexHolder::Iterator(&features_));
}
+15 -15
View File
@@ -35,37 +35,37 @@ class IVFIndexProvider : public IndexProvider {
public:
//! Create a new iterator
virtual Iterator::Pointer create_iterator(void) override {
Iterator::Pointer create_iterator(void) override {
return Iterator::Pointer(new (std::nothrow) SortedIterator(entity_));
}
//! Retrieve count of vectors
virtual size_t count(void) const override {
size_t count(void) const override {
return entity_->vector_count();
}
//! Retrieve dimension of vector
virtual size_t dimension(void) const override {
size_t dimension(void) const override {
return meta_.dimension();
}
//! Retrieve type of vector
virtual IndexMeta::DataType data_type(void) const override {
IndexMeta::DataType data_type(void) const override {
return meta_.data_type();
}
//! Retrieve vector size in bytes
virtual size_t element_size(void) const override {
size_t element_size(void) const override {
return meta_.element_size();
}
//! Retrieve a vector using a primary key
virtual const void *get_vector(uint64_t key) const override {
const void *get_vector(uint64_t key) const override {
return entity_->get_vector_by_key(key);
}
//! Retrieve the owner class
virtual const std::string &owner_class(void) const override {
const std::string &owner_class(void) const override {
return owner_class_;
}
@@ -88,22 +88,22 @@ class IVFIndexProvider : public IndexProvider {
//! Retrieve pointer of data
//! NOTICE: the vec feature will be changed after iterating to next, so
//! the caller need to keep a copy of it before iterator to next vector
virtual const void *data(void) const override {
const void *data(void) const override {
return entity_->get_vector(current_local_id());
}
//! Test if the iterator is valid
virtual bool is_valid(void) const override {
bool is_valid(void) const override {
return pos_ < count_;
}
//! Retrieve primary key
virtual uint64_t key(void) const override {
uint64_t key(void) const override {
return entity_->get_key(current_local_id());
}
//! Next iterator
virtual void next(void) override {
void next(void) override {
++pos_;
}
@@ -126,22 +126,22 @@ class IVFIndexProvider : public IndexProvider {
Iterator(const IVFEntity::Pointer &entity) : entity_(entity) {}
//! Retrieve pointer of data
virtual const void *data(void) const override {
const void *data(void) const override {
return entity_->get_vector(index_);
}
//! Test if the iterator is valid
virtual bool is_valid(void) const override {
bool is_valid(void) const override {
return index_ < entity_->vector_count();
}
//! Retrieve primary key
virtual uint64_t key(void) const override {
uint64_t key(void) const override {
return entity_->get_key(index_);
}
//! Next iterator
virtual void next(void) override {
void next(void) override {
++index_;
}
+18 -20
View File
@@ -26,52 +26,50 @@ namespace core {
class IVFSearcher : public IndexSearcher {
public:
//! Initialize Searcher
virtual int init(const ailego::Params &parameters) override;
int init(const ailego::Params &parameters) override;
//! Cleanup Searcher
virtual int cleanup(void) override;
int cleanup(void) override;
//! Load index from container
virtual int load(IndexStorage::Pointer container,
IndexMetric::Pointer metric) override;
int load(IndexStorage::Pointer container,
IndexMetric::Pointer metric) override;
//! Unload index
virtual int unload(void) override;
int unload(void) override;
//! Similarity brute force search
virtual int search_bf_impl(const void *query, const IndexQueryMeta &qmeta,
Context::Pointer &context) const override;
int search_bf_impl(const void *query, const IndexQueryMeta &qmeta,
Context::Pointer &context) const override;
//! Similarity brute force search
virtual int search_bf_impl(const void *query, const IndexQueryMeta &qmeta,
uint32_t count,
Context::Pointer &context) const override;
int search_bf_impl(const void *query, const IndexQueryMeta &qmeta,
uint32_t count, Context::Pointer &context) const override;
//! Similarity search
virtual int search_impl(const void *query, const IndexQueryMeta &qmeta,
Context::Pointer &context) const override;
int search_impl(const void *query, const IndexQueryMeta &qmeta,
Context::Pointer &context) const override;
//! Similarity search
virtual int search_impl(const void *query, const IndexQueryMeta &qmeta,
uint32_t count,
Context::Pointer &context) const override;
int search_impl(const void *query, const IndexQueryMeta &qmeta,
uint32_t count, Context::Pointer &context) const override;
//! Retrieve statistics
virtual const Stats &stats(void) const override;
const Stats &stats(void) const override;
//! Create a searcher context
virtual Context::Pointer create_context(void) const override;
Context::Pointer create_context(void) const override;
//! Create a new iterator
virtual IndexProvider::Pointer create_provider(void) const override;
IndexProvider::Pointer create_provider(void) const override;
//! Retrieve meta of index
virtual const IndexMeta &meta(void) const override {
const IndexMeta &meta(void) const override {
return meta_;
}
//! Retrieve params of index
virtual const ailego::Params &params(void) const override {
const ailego::Params &params(void) const override {
return params_;
}
@@ -30,25 +30,25 @@ class IVFSearcherContext : public IndexSearcher::Context {
public:
//! Set topk of search result
virtual void set_topk(uint32_t k) override {
void set_topk(uint32_t k) override {
topk_ = k;
result_heap_.limit(topk_);
result_heap_.set_threshold(this->threshold());
}
//! Retrieve search result
virtual const IndexDocumentList &result(void) const override {
const IndexDocumentList &result(void) const override {
return results_[0];
}
//! Retrieve search result with index
virtual const IndexDocumentList &result(size_t idx) const override {
const IndexDocumentList &result(size_t idx) const override {
ailego_assert_with(results_.size() > idx, "invalid index");
return results_[idx];
}
//! Retrieve mutable result with index
virtual IndexDocumentList *mutable_result(size_t idx) override {
IndexDocumentList *mutable_result(size_t idx) override {
ailego_assert_with(idx < results_.size(), "invalid idx");
return &results_[idx];
}
@@ -58,7 +58,7 @@ class IVFSearcherContext : public IndexSearcher::Context {
}
//! Update the parameters of context
virtual int update(const ailego::Params &params) override {
int update(const ailego::Params &params) override {
params.get(PARAM_IVF_SEARCHER_BRUTE_FORCE_THRESHOLD,
&bruteforce_threshold_);
params.get(PARAM_IVF_SEARCHER_SCAN_RATIO, &scan_ratio_);
@@ -79,7 +79,7 @@ class IVFSearcherContext : public IndexSearcher::Context {
}
//! Retrieve magic number
virtual uint32_t magic(void) const override {
uint32_t magic(void) const override {
return magic_;
}
+21 -23
View File
@@ -27,59 +27,57 @@ namespace core {
class IVFStreamer : public IndexStreamer {
public:
//! Initialize Searcher
virtual int init(const IndexMeta & /*meta*/,
const ailego::Params & /*params*/) override;
int init(const IndexMeta & /*meta*/,
const ailego::Params & /*params*/) override;
//! Cleanup Searcher
virtual int cleanup(void) override;
int cleanup(void) override;
//! Load index from container
virtual int open(IndexStorage::Pointer storage) override;
int open(IndexStorage::Pointer storage) override;
virtual int flush(uint64_t /*check_point*/) override {
int flush(uint64_t /*check_point*/) override {
return 0;
}
virtual int close(void) override {
int close(void) override {
return this->unload();
}
//! Unload index
virtual int unload(void) override;
int unload(void) override;
//! Similarity brute force search
virtual int search_bf_impl(const void *query, const IndexQueryMeta &qmeta,
Context::Pointer &context) const override;
int search_bf_impl(const void *query, const IndexQueryMeta &qmeta,
Context::Pointer &context) const override;
//! Similarity brute force search
virtual int search_bf_impl(const void *query, const IndexQueryMeta &qmeta,
uint32_t count,
Context::Pointer &context) const override;
int search_bf_impl(const void *query, const IndexQueryMeta &qmeta,
uint32_t count, Context::Pointer &context) const override;
//! Similarity search
virtual int search_impl(const void *query, const IndexQueryMeta &qmeta,
Context::Pointer &context) const override;
int search_impl(const void *query, const IndexQueryMeta &qmeta,
Context::Pointer &context) const override;
//! Similarity search
virtual int search_impl(const void *query, const IndexQueryMeta &qmeta,
uint32_t count,
Context::Pointer &context) const override;
int search_impl(const void *query, const IndexQueryMeta &qmeta,
uint32_t count, Context::Pointer &context) const override;
//! Retrieve statistics
virtual const Stats &stats(void) const override;
const Stats &stats(void) const override;
//! Create a searcher context
virtual Context::Pointer create_context(void) const override;
Context::Pointer create_context(void) const override;
//! Create a new iterator
virtual IndexProvider::Pointer create_provider(void) const override;
IndexProvider::Pointer create_provider(void) const override;
//! Retrieve meta of index
virtual const IndexMeta &meta(void) const override {
const IndexMeta &meta(void) const override {
return meta_;
}
virtual int get_vector_by_id(
const uint32_t id, IndexStorage::MemoryBlock &block) const override {
int get_vector_by_id(const uint32_t id,
IndexStorage::MemoryBlock &block) const override {
return entity_->get_vector_by_key(id, block);
}