mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-33746 Supply missing override markings
Find and fix missing virtual override markings. Updates cmake maintainer flags to include -Wsuggest-override and -Winconsistent-missing-override.
This commit is contained in:
committed by
Dave Gosselin
parent
ab448d4b34
commit
db0c28eff8
@@ -37,15 +37,15 @@ class ha_heap final : public handler
|
||||
public:
|
||||
ha_heap(handlerton *hton, TABLE_SHARE *table);
|
||||
~ha_heap() = default;
|
||||
handler *clone(const char *name, MEM_ROOT *mem_root);
|
||||
const char *index_type(uint inx)
|
||||
handler *clone(const char *name, MEM_ROOT *mem_root) override;
|
||||
const char *index_type(uint inx) override
|
||||
{
|
||||
return ((table_share->key_info[inx].algorithm == HA_KEY_ALG_BTREE) ?
|
||||
"BTREE" : "HASH");
|
||||
}
|
||||
/* Rows also use a fixed-size format */
|
||||
enum row_type get_row_type() const { return ROW_TYPE_FIXED; }
|
||||
ulonglong table_flags() const
|
||||
enum row_type get_row_type() const override { return ROW_TYPE_FIXED; }
|
||||
ulonglong table_flags() const override
|
||||
{
|
||||
return (HA_FAST_KEY_READ | HA_NO_BLOBS | HA_NULL_IN_KEY |
|
||||
HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE |
|
||||
@@ -53,73 +53,73 @@ public:
|
||||
HA_REC_NOT_IN_SEQ | HA_CAN_INSERT_DELAYED | HA_NO_TRANSACTIONS |
|
||||
HA_HAS_RECORDS | HA_STATS_RECORDS_IS_EXACT | HA_CAN_HASH_KEYS);
|
||||
}
|
||||
ulong index_flags(uint inx, uint part, bool all_parts) const
|
||||
ulong index_flags(uint inx, uint part, bool all_parts) const override
|
||||
{
|
||||
return ((table_share->key_info[inx].algorithm == HA_KEY_ALG_BTREE) ?
|
||||
HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER | HA_READ_RANGE :
|
||||
HA_ONLY_WHOLE_INDEX | HA_KEY_SCAN_NOT_ROR);
|
||||
}
|
||||
const key_map *keys_to_use_for_scanning() { return &btree_keys; }
|
||||
uint max_supported_keys() const { return MAX_KEY; }
|
||||
uint max_supported_key_part_length() const { return MAX_KEY_LENGTH; }
|
||||
double scan_time()
|
||||
const key_map *keys_to_use_for_scanning() override { return &btree_keys; }
|
||||
uint max_supported_keys() const override { return MAX_KEY; }
|
||||
uint max_supported_key_part_length() const override { return MAX_KEY_LENGTH; }
|
||||
double scan_time() override
|
||||
{ return (double) (stats.records+stats.deleted) / 20.0+10; }
|
||||
double read_time(uint index, uint ranges, ha_rows rows)
|
||||
double read_time(uint index, uint ranges, ha_rows rows) override
|
||||
{ return (double) (rows +1)/ 20.0; }
|
||||
double keyread_time(uint index, uint ranges, ha_rows rows)
|
||||
double keyread_time(uint index, uint ranges, ha_rows rows) override
|
||||
{ return (double) (rows + ranges) / 20.0 ; }
|
||||
double avg_io_cost()
|
||||
double avg_io_cost() override
|
||||
{ return 0.05; } /* 1/20 */
|
||||
int open(const char *name, int mode, uint test_if_locked);
|
||||
int close(void);
|
||||
int open(const char *name, int mode, uint test_if_locked) override;
|
||||
int close(void) override;
|
||||
void set_keys_for_scanning(void);
|
||||
int write_row(const uchar * buf);
|
||||
int update_row(const uchar * old_data, const uchar * new_data);
|
||||
int delete_row(const uchar * buf);
|
||||
virtual void get_auto_increment(ulonglong offset, ulonglong increment,
|
||||
ulonglong nb_desired_values,
|
||||
ulonglong *first_value,
|
||||
ulonglong *nb_reserved_values);
|
||||
int write_row(const uchar * buf) override;
|
||||
int update_row(const uchar * old_data, const uchar * new_data) override;
|
||||
int delete_row(const uchar * buf) override;
|
||||
void get_auto_increment(ulonglong offset, ulonglong increment,
|
||||
ulonglong nb_desired_values,
|
||||
ulonglong *first_value,
|
||||
ulonglong *nb_reserved_values) override;
|
||||
int index_read_map(uchar * buf, const uchar * key, key_part_map keypart_map,
|
||||
enum ha_rkey_function find_flag);
|
||||
int index_read_last_map(uchar *buf, const uchar *key, key_part_map keypart_map);
|
||||
enum ha_rkey_function find_flag) override;
|
||||
int index_read_last_map(uchar *buf, const uchar *key, key_part_map keypart_map) override;
|
||||
int index_read_idx_map(uchar * buf, uint index, const uchar * key,
|
||||
key_part_map keypart_map,
|
||||
enum ha_rkey_function find_flag);
|
||||
int index_next(uchar * buf);
|
||||
int index_prev(uchar * buf);
|
||||
int index_first(uchar * buf);
|
||||
int index_last(uchar * buf);
|
||||
int rnd_init(bool scan);
|
||||
int rnd_next(uchar *buf);
|
||||
int rnd_pos(uchar * buf, uchar *pos);
|
||||
void position(const uchar *record);
|
||||
int can_continue_handler_scan();
|
||||
int info(uint);
|
||||
int extra(enum ha_extra_function operation);
|
||||
int reset();
|
||||
int external_lock(THD *thd, int lock_type);
|
||||
int delete_all_rows(void);
|
||||
int reset_auto_increment(ulonglong value);
|
||||
int disable_indexes(key_map map, bool persist);
|
||||
int enable_indexes(key_map map, bool persist);
|
||||
int indexes_are_disabled(void);
|
||||
enum ha_rkey_function find_flag) override;
|
||||
int index_next(uchar * buf) override;
|
||||
int index_prev(uchar * buf) override;
|
||||
int index_first(uchar * buf) override;
|
||||
int index_last(uchar * buf) override;
|
||||
int rnd_init(bool scan) override;
|
||||
int rnd_next(uchar *buf) override;
|
||||
int rnd_pos(uchar * buf, uchar *pos) override;
|
||||
void position(const uchar *record) override;
|
||||
int can_continue_handler_scan() override;
|
||||
int info(uint) override;
|
||||
int extra(enum ha_extra_function operation) override;
|
||||
int reset() override;
|
||||
int external_lock(THD *thd, int lock_type) override;
|
||||
int delete_all_rows(void) override;
|
||||
int reset_auto_increment(ulonglong value) override;
|
||||
int disable_indexes(key_map map, bool persist) override;
|
||||
int enable_indexes(key_map map, bool persist) override;
|
||||
int indexes_are_disabled(void) override;
|
||||
ha_rows records_in_range(uint inx, const key_range *start_key,
|
||||
const key_range *end_key, page_range *pages);
|
||||
int delete_table(const char *from);
|
||||
void drop_table(const char *name);
|
||||
int rename_table(const char * from, const char * to);
|
||||
int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info);
|
||||
void update_create_info(HA_CREATE_INFO *create_info);
|
||||
const key_range *end_key, page_range *pages) override;
|
||||
int delete_table(const char *from) override;
|
||||
void drop_table(const char *name) override;
|
||||
int rename_table(const char * from, const char * to) override;
|
||||
int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info) override;
|
||||
void update_create_info(HA_CREATE_INFO *create_info) override;
|
||||
|
||||
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
|
||||
enum thr_lock_type lock_type);
|
||||
int cmp_ref(const uchar *ref1, const uchar *ref2)
|
||||
enum thr_lock_type lock_type) override;
|
||||
int cmp_ref(const uchar *ref1, const uchar *ref2) override
|
||||
{
|
||||
return memcmp(ref1, ref2, sizeof(HEAP_PTR));
|
||||
}
|
||||
bool check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes);
|
||||
int find_unique_row(uchar *record, uint unique_idx);
|
||||
bool check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes) override;
|
||||
int find_unique_row(uchar *record, uint unique_idx) override;
|
||||
private:
|
||||
void update_key_stats();
|
||||
};
|
||||
|
Reference in New Issue
Block a user